diff --git a/FlycoTabLayoutZ_Lib/build.gradle b/FlycoTabLayoutZ_Lib/build.gradle index bc84351..6e30d02 100644 --- a/FlycoTabLayoutZ_Lib/build.gradle +++ b/FlycoTabLayoutZ_Lib/build.gradle @@ -13,6 +13,8 @@ android { versionName version } buildTypes { + iPlay50PDebug {} + iPlay50PRelease {} MTKT1102Debug {} MTKT1102Release {} U807Debug {} diff --git a/PhotoPreview/build.gradle b/PhotoPreview/build.gradle index dc83108..1f65879 100644 --- a/PhotoPreview/build.gradle +++ b/PhotoPreview/build.gradle @@ -10,6 +10,8 @@ android { } buildTypes { + iPlay50PDebug {} + iPlay50PRelease {} MTKT1102Debug {} MTKT1102Release {} U807Debug {} diff --git a/app/build.gradle b/app/build.gradle index d79e2fd..0000a81 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,8 +16,8 @@ android { minSdkVersion 24 targetSdkVersion 29 - versionCode 99 - versionName "2.0.8" + versionCode 100 + versionName "2.0.9" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true @@ -84,9 +84,38 @@ android { v1SigningEnabled true v2SigningEnabled true } + + iPlay50P { + storeFile file("keystore/iPlay50P.jks") + storePassword "123456" + keyAlias "iplay50p" + keyPassword "123456" + v1SigningEnabled true + v2SigningEnabled true + } } buildTypes { + iPlay50PDebug.initWith(debug) + iPlay50PDebug { + buildConfigField "String", "platform", '"T1102"' + versionNameSuffix "-debug" + debuggable true + signingConfig signingConfigs.iPlay50P + manifestPlaceholders = [ + AMAP_KEY: "aed54e2ec50c45151d17b512c9e4f34c" + ] + } + + iPlay50PRelease.initWith(release) + iPlay50PRelease { + buildConfigField "String", "platform", '"T1102"' + signingConfig signingConfigs.iPlay50P + manifestPlaceholders = [ + AMAP_KEY: "aed54e2ec50c45151d17b512c9e4f34c" + ] + } + MTKT1102Debug.initWith(debug) MTKT1102Debug { buildConfigField "String", "platform", '"MTKT1102"' diff --git a/app/keystore/iPlay50P.jks b/app/keystore/iPlay50P.jks new file mode 100644 index 0000000..496ef8d Binary files /dev/null and b/app/keystore/iPlay50P.jks differ diff --git a/app/src/main/java/com/uiui/zyos/activity/main/MainActivity.java b/app/src/main/java/com/uiui/zyos/activity/main/MainActivity.java index f9da81e..88e9b43 100644 --- a/app/src/main/java/com/uiui/zyos/activity/main/MainActivity.java +++ b/app/src/main/java/com/uiui/zyos/activity/main/MainActivity.java @@ -840,16 +840,7 @@ public class MainActivity extends BaseMvvmActivity { Intent intent = new Intent(); ComponentName componentName = new ComponentName("com.uiui.zy", "com.uiui.zy.activity.update.UpdateActivity"); intent.setComponent(componentName); - mContext.startActivity(intent); + try { + mContext.startActivity(intent); + } catch (Exception e) { + Toaster.show("打开失败,请检查是否安装"); + Log.e(TAG, "onClick: " + e.getMessage()); + } break; case AppManager.MANUAL_NAME: mContext.startActivity(new Intent(mContext, ManualActivity.class)); diff --git a/app/src/main/java/com/uiui/zyos/fragment/app/AppViewModel.java b/app/src/main/java/com/uiui/zyos/fragment/app/AppViewModel.java index 47e27a7..897b461 100644 --- a/app/src/main/java/com/uiui/zyos/fragment/app/AppViewModel.java +++ b/app/src/main/java/com/uiui/zyos/fragment/app/AppViewModel.java @@ -99,6 +99,7 @@ public class AppViewModel extends BaseViewModel()); + this.showPackages = mMMKV.decodeStringSet(SHOW_PACKAGE_KEY, new HashSet(){{ + this.add("com.jxw.yyhb"); + this.add("com.jxw.souti"); + }}); this.showPackages.removeIf(TextUtils::isEmpty); } @@ -124,6 +128,9 @@ public class AppManager { resolveInfos.removeIf(resolveInfo -> "com.uiui.city".equals(resolveInfo.activityInfo.packageName)); } Set desktopIcons = resolveInfos.stream().map(resolveInfo -> resolveInfo.activityInfo.packageName).collect(Collectors.toSet()); + if (showPackages.contains("com.jxw.souti")) { + desktopIcons.add("com.jxw.souti"); + } return desktopIcons; } @@ -193,6 +200,19 @@ public class AppManager { } }); ArrayList desktopIcons = new ArrayList<>(); + if (showPackages.contains("com.jxw.souti")) { + if (ApkUtils.isAvailable(mContext, "com.jxw.souti")) { + DesktopIcon desktopIcon = new DesktopIcon(); + desktopIcon.setLable("拍照搜题"); + desktopIcon.setPackageName("com.jxw.souti"); + desktopIcon.setClassName("com.jxw.souti.ui.activity.MainActivity"); + desktopIcon.setIcon(mContext.getDrawable(R.drawable.icon_souti)); + desktopIcons.add(desktopIcon); + } + } + + + for (ResolveInfo applicationInfo : resolveInfos) { if (!ApkUtils.excludeClassName.contains(applicationInfo.activityInfo.name)) { desktopIcons.add(DesktopIcon.creatDesktopIcon(mContext, applicationInfo)); @@ -253,6 +273,15 @@ public class AppManager { // } // }); ArrayList desktopIcons = new ArrayList<>(); + if (ApkUtils.isAvailable(mContext, "com.jxw.souti")) { + DesktopIcon desktopIcon = new DesktopIcon(); + desktopIcon.setLable("拍照搜题"); + desktopIcon.setPackageName("com.jxw.souti"); + desktopIcon.setClassName("com.jxw.souti.ui.activity.MainActivity"); + desktopIcon.setIcon(mContext.getDrawable(R.drawable.icon_souti)); + desktopIcons.add(desktopIcon); + } + for (ResolveInfo resolveInfo : resolveInfos) { desktopIcons.add(DesktopIcon.creatDesktopIcon(mContext, resolveInfo)); } diff --git a/app/src/main/res/drawable-hdpi/com_jxw_usagedate.png b/app/src/main/res/drawable-hdpi/com_jxw_usagedate.png new file mode 100644 index 0000000..df7da0d Binary files /dev/null and b/app/src/main/res/drawable-hdpi/com_jxw_usagedate.png differ diff --git a/app/src/main/res/drawable-hdpi/icon_souti.png b/app/src/main/res/drawable-hdpi/icon_souti.png new file mode 100644 index 0000000..aca06e2 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/icon_souti.png differ diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index f7022cb..d6df4b1 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -421,7 +421,7 @@ android:layout_marginEnd="@dimen/dp_4" android:adjustViewBounds="true" android:scaleType="centerCrop" - android:src="@drawable/exit_icon" + android:src="@drawable/com_jxw_usagedate" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -430,7 +430,7 @@ android:id="@+id/tv_appname9" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="退出系统" + android:text="学情管理" android:textColor="@color/white" android:textSize="@dimen/sp_7" app:layout_constraintEnd_toEndOf="@+id/iv_icon9" diff --git a/app/src/main/res/layout/activity_user.xml b/app/src/main/res/layout/activity_user.xml index fb0bae0..5d93fdd 100644 --- a/app/src/main/res/layout/activity_user.xml +++ b/app/src/main/res/layout/activity_user.xml @@ -58,19 +58,18 @@ app:layout_constraintTop_toTopOf="parent" /> + android:layout_height="match_parent" + android:layout_marginBottom="@dimen/dp_8"> + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3d8e5a6..e844886 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,5 @@ - 学习课堂 + 关爱守护 隐私协议 服务协议和隐私政策 \t\t\t\t请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款,包括但不限于:为了向你提供即时通讯,内容分享等服务, diff --git a/niceimageview/build.gradle b/niceimageview/build.gradle index fc984b6..2d83a3e 100644 --- a/niceimageview/build.gradle +++ b/niceimageview/build.gradle @@ -11,6 +11,8 @@ android { } buildTypes { + iPlay50PDebug {} + iPlay50PRelease {} MTKT1102Debug {} MTKT1102Release {} U807Debug {} diff --git a/verification-view/build.gradle b/verification-view/build.gradle index 29231e7..f662b9b 100644 --- a/verification-view/build.gradle +++ b/verification-view/build.gradle @@ -13,6 +13,8 @@ android { } buildTypes { + iPlay50PDebug {} + iPlay50PRelease {} MTKT1102Debug {} MTKT1102Release {} U807Debug {}