Skip to content

Commit 95b5945

Browse files
BlankjBlankj
committed
see 05/11 log
1 parent 97412bf commit 95b5945

File tree

14 files changed

+91
-90
lines changed

14 files changed

+91
-90
lines changed

‎README-CN.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ getLauncherActivity: 获取入口activity
1616
* ### App相关→[AppUtils.java][app.java]→[Demo][app.demo]
1717
```
1818
isInstallApp : 判断App是否安装
19-
installApp : 安装App（支持6.0）
19+
installApp : 安装App（支持7.0）
2020
installAppSilent : 静默安装App
2121
uninstallApp : 卸载App
2222
uninstallAppSilent : 静默卸载App
@@ -618,7 +618,7 @@ getEntries : 获取压缩文件中的文件对象
618618

619619
Gradle:
620620
``` groovy
621-
compile 'com.blankj:utilcode:1.5.0'
621+
compile 'com.blankj:utilcode:1.5.1'
622622
```
623623

624624

@@ -640,7 +640,7 @@ Utils.init(context);
640640

641641

642642

643-
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.4.1-blue.svg
643+
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.5.1-blue.svg
644644
[auc]: https://github.com/Blankj/AndroidUtilCode
645645

646646
[apisvg]: https://img.shields.io/badge/API-15+-blue.svg

‎README.md

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -501,13 +501,9 @@ Builder.create
501501
SPUtils
502502
put
503503
getString
504-
putInt
505504
getInt
506-
putLong
507505
getLong
508-
putFloat
509506
getFloat
510-
putBoolean
511507
getBoolean
512508
getAll
513509
remove
@@ -622,7 +618,7 @@ getEntries
622618

623619
Gradle:
624620
``` groovy
625-
compile 'com.blankj:utilcode:1.5.0'
621+
compile 'com.blankj:utilcode:1.5.1'
626622
```
627623

628624

@@ -644,7 +640,7 @@ Utils.init(context);
644640

645641

646642

647-
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.4.1-blue.svg
643+
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.5.1-blue.svg
648644
[auc]: https://github.com/Blankj/AndroidUtilCode
649645

650646
[apisvg]: https://img.shields.io/badge/API-15+-blue.svg

‎app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ android {
1010
applicationId "com.blankj.androidutilcode"
1111
minSdkVersion 15
1212
targetSdkVersion 16
13-
versionCode 30
14-
versionName "1.5.0"
13+
versionCode 31
14+
versionName "1.5.1"
1515
}
1616

1717
if (signPropertiesFile.exists()) {

‎app/src/main/java/com/blankj/androidutilcode/activity/AppActivity.java

Lines changed: 34 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import com.blankj.androidutilcode.Config;
99
import com.blankj.androidutilcode.R;
1010
import com.blankj.utilcode.util.AppUtils;
11+
import com.blankj.utilcode.util.SpannableStringUtils;
1112
import com.blankj.utilcode.util.ToastUtils;
1213

1314
/**
@@ -22,62 +23,62 @@
2223
public class AppActivity extends Activity
2324
implements View.OnClickListener {
2425

25-
private String appPath;
26+
private TextView tvAboutApp;
2627

2728
@Override
2829
protected void onCreate(Bundle savedInstanceState) {
2930
super.onCreate(savedInstanceState);
3031
setContentView(R.layout.activity_app);
3132

32-
appPath = AppUtils.getAppPath();
33-
34-
TextView tvAboutApp = (TextView) findViewById(R.id.tv_about_app);
35-
33+
tvAboutApp = (TextView) findViewById(R.id.tv_about_app);
3634
findViewById(R.id.btn_install_app).setOnClickListener(this);
3735
findViewById(R.id.btn_install_app_silent).setOnClickListener(this);
3836
findViewById(R.id.btn_uninstall_app).setOnClickListener(this);
3937
findViewById(R.id.btn_uninstall_app_silent).setOnClickListener(this);
4038
findViewById(R.id.btn_launch_app).setOnClickListener(this);
4139
findViewById(R.id.btn_get_app_details_settings).setOnClickListener(this);
42-
43-
tvAboutApp.setText(AppUtils.getAppInfo().toString()
44-
+ "\nisInstallTestApp: " + AppUtils.isInstallApp("com.blankj.testinstallapk")
45-
+ "\nisAppRoot: " + AppUtils.isAppRoot()
46-
+ "\nisAppDebug: " + AppUtils.isAppDebug()
47-
+ "\nisTestAppDebug: " + AppUtils.isAppDebug(Config.TEST_PKG)
48-
+ "\nAppSignatureSHA1: " + AppUtils.getAppSignatureSHA1()
49-
+ "\nisAppForeground: " + AppUtils.isAppForeground()
50-
+ "\nisTestForeground: " + AppUtils.isAppForeground(Config.TEST_PKG)
51-
);
40+
updateState();
5241
}
5342

5443
@Override
5544
public void onClick(View view) {
5645
switch (view.getId()) {
5746
case R.id.btn_install_app:
58-
AppUtils.installApp(Config.getTestApkPath(), "com.blankj.androidutilcode.provider");
47+
if (AppUtils.isInstallApp("com.blankj.testinstallapk")) {
48+
ToastUtils.showShort(R.string.app_install_tips);
49+
} else {
50+
AppUtils.installApp(this, Config.getTestApkPath(), "com.blankj.androidutilcode.provider", 0);
51+
}
5952
break;
6053
case R.id.btn_install_app_silent:
6154
new Thread(new Runnable() {
6255
@Override
6356
public void run() {
64-
AppUtils.installAppSilent(appPath);
57+
if (AppUtils.isInstallApp("com.blankj.testinstallapk")) {
58+
ToastUtils.showShortSafe(R.string.app_install_tips);
59+
} else {
60+
if (AppUtils.installAppSilent(Config.getTestApkPath())) {
61+
ToastUtils.showShortSafe(R.string.install_successfully);
62+
} else {
63+
ToastUtils.showShortSafe(R.string.install_unsuccessfully);
64+
}
65+
}
6566
}
6667
}).start();
6768
break;
6869
case R.id.btn_uninstall_app:
6970
if (AppUtils.isInstallApp("com.blankj.testinstallapk")) {
70-
AppUtils.uninstallApp(this.getPackageName());
71+
AppUtils.uninstallApp(this, Config.TEST_PKG, 0);
7172
} else {
7273
ToastUtils.showShort(R.string.app_uninstall_tips);
7374
}
7475
break;
7576
case R.id.btn_uninstall_app_silent:
7677
if (AppUtils.isInstallApp("com.blankj.testinstallapk")) {
77-
if (AppUtils.uninstallAppSilent(this.getPackageName(), false)) {
78-
ToastUtils.showShort("uninstall success");
79-
}else {
80-
ToastUtils.showShort("uninstall fail");
78+
if (AppUtils.uninstallAppSilent(Config.TEST_PKG, false)) {
79+
ToastUtils.showShort(R.string.uninstall_successfully);
80+
} else {
81+
ToastUtils.showShort(R.string.uninstall_unsuccessfully);
8182
}
8283
} else {
8384
ToastUtils.showShort(R.string.app_uninstall_tips);
@@ -90,5 +91,16 @@ public void run() {
9091
AppUtils.getAppDetailsSettings();
9192
break;
9293
}
94+
updateState();
95+
}
96+
97+
private void updateState() {
98+
tvAboutApp.setText(new SpannableStringUtils.Builder().append("app icon: ")
99+
.appendLine("").setDrawable(AppUtils.getAppIcon(), SpannableStringUtils.ALIGN_CENTER).create());
100+
tvAboutApp.append(AppUtils.getAppInfo().toString()
101+
+ "\nisAppRoot: " + AppUtils.isAppRoot()
102+
+ "\nisAppDebug: " + AppUtils.isAppDebug()
103+
+ "\nAppSignatureSHA1: " + AppUtils.getAppSignatureSHA1()
104+
+ "\nisAppForeground: " + AppUtils.isAppForeground());
93105
}
94106
}

‎app/src/main/res/layout/activity_app.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
android:padding="@dimen/spacing_16">
1313

1414
<TextView
15+
android:paddingTop="16dp"
1516
android:id="@+id/tv_about_app"
1617
style="@style/TextStyle"
1718
android:layout_width="match_parent"

‎app/src/main/res/values/strings.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,15 @@
3232

3333
<!--App相关-->
3434
<string name="app_install">Install Test App</string>
35+
<string name="app_install_tips">Test app have installed</string>
3536
<string name="app_install_silent">Install Test App Silently</string>
37+
<string name="install_successfully">Install successfully</string>
38+
<string name="install_unsuccessfully">Install unsuccessfully</string>
3639
<string name="app_uninstall">Uninstall Test App</string>
37-
<string name="app_uninstall_tips">Please install test apk first</string>
40+
<string name="app_uninstall_tips">Please install test app first</string>
3841
<string name="app_uninstall_silent">Uninstall App Silently</string>
42+
<string name="uninstall_successfully">Uninstall successfully</string>
43+
<string name="uninstall_unsuccessfully">Uninstall unsuccessfully</string>
3944
<string name="app_launch">Launch App</string>
4045
<string name="app_close">Close App</string>
4146
<string name="app_isDebug">Is Debug</string>

‎update_log.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
* 17/05/10 installApp完善7.0
1+
* 17/05/11 修复SpannableStringUtils的setDrawable的bug，发布1.5.1
2+
* 17/05/10 installApp完善7.0，完善AppActivity
23
* 17/05/09 TimeUtils完善单元测试
34
* 17/05/08 更新BarUtils，LogUtils新增配置文件，TimeUtils将pattern改为format，发布1.5.0
45
* 17/05/04 新增签名

‎utilcode/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ android {
2626

2727
defaultConfig {
2828
minSdkVersion 15
29-
versionCode 30
30-
versionName "1.5.0"
29+
versionCode 31
30+
versionName "1.5.1"
3131
}
3232

3333
buildTypes {
@@ -65,5 +65,5 @@ dependencies {
6565
testCompile "com.google.truth:truth:$TRUTH_VERSION"
6666
testCompile "org.robolectric:robolectric:$ROBOLECTRIC_VERSION"
6767
}
68-
//apply from: "https://raw.githubusercontent.com/xiaopansky/android-library-publish-to-jcenter/master/bintrayUpload.gradle"
68+
apply from: "https://raw.githubusercontent.com/xiaopansky/android-library-publish-to-jcenter/master/bintrayUpload.gradle"
6969
//gradlew bintrayUpload

‎utilcode/src/main/java/com/blankj/utilcode/util/AppUtils.java

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import android.content.pm.PackageManager;
1010
import android.content.pm.Signature;
1111
import android.graphics.drawable.Drawable;
12-
import android.support.v4.content.FileProvider;
1312

1413
import java.io.File;
1514
import java.util.ArrayList;
@@ -43,8 +42,8 @@ public static boolean isInstallApp(String packageName) {
4342
* 安装App(支持7.0)
4443
*
4544
* @param filePath 文件路径
46-
* @param authority The authority of a {@link FileProvider} defined in a
47-
* {@code <provider>} element in your app's manifest.
45+
* @param authority 7.0及以上安装需要传入清单文件中的{@code <provider>}的authorities属性
46+
* <br>参看https://developer.android.com/reference/android/support/v4/content/FileProvider.html
4847
*/
4948
public static void installApp(String filePath, String authority) {
5049
installApp(FileUtils.getFileByPath(filePath), authority);
@@ -54,7 +53,8 @@ public static void installApp(String filePath, String authority) {
5453
* 安装App（支持7.0）
5554
*
5655
* @param file 文件
57-
* @param authority
56+
* @param authority 7.0及以上安装需要传入清单文件中的{@code <provider>}的authorities属性
57+
* <br>参看https://developer.android.com/reference/android/support/v4/content/FileProvider.html
5858
*/
5959
public static void installApp(File file, String authority) {
6060
if (!FileUtils.isFileExists(file)) return;
@@ -66,6 +66,8 @@ public static void installApp(File file, String authority) {
6666
*
6767
* @param activity activity
6868
* @param filePath 文件路径
69+
* @param authority 7.0及以上安装需要传入清单文件中的{@code <provider>}的authorities属性
70+
* <br>参看https://developer.android.com/reference/android/support/v4/content/FileProvider.html
6971
* @param requestCode 请求值
7072
*/
7173
public static void installApp(Activity activity, String filePath, String authority, int requestCode) {
@@ -77,6 +79,8 @@ public static void installApp(Activity activity, String filePath, String authori
7779
*
7880
* @param activity activity
7981
* @param file 文件
82+
* @param authority 7.0及以上安装需要传入清单文件中的{@code <provider>}的authorities属性
83+
* <br>参看https://developer.android.com/reference/android/support/v4/content/FileProvider.html
8084
* @param requestCode 请求值
8185
*/
8286
public static void installApp(Activity activity, File file, String authority, int requestCode) {
@@ -186,7 +190,6 @@ public static String getAppPackageName() {
186190

187191
/**
188192
* 获取App具体设置
189-
*
190193
*/
191194
public static void getAppDetailsSettings() {
192195
getAppDetailsSettings(Utils.getContext().getPackageName());
@@ -563,13 +566,12 @@ public AppInfo(String packageName, String name, Drawable icon, String packagePat
563566

564567
@Override
565568
public String toString() {
566-
return "App包名：" + getPackageName() +
567-
"\nApp名称：" + getName() +
568-
"\nApp图标：" + getIcon() +
569-
"\nApp路径：" + getPackagePath() +
570-
"\nApp版本号：" + getVersionName() +
571-
"\nApp版本码：" + getVersionCode() +
572-
"\n是否系统App：" + isSystem();
569+
return "pkg name: " + getPackageName() +
570+
"\napp name: " + getName() +
571+
"\napp path: " + getPackagePath() +
572+
"\napp v name: " + getVersionName() +
573+
"\napp v code: " + getVersionCode() +
574+
"\nis system: " + isSystem();
573575
}
574576
}
575577

0 commit comments

Comments
 (0)