From 99f596e2712b7de626d00d3e9a7c902b73cdd855 Mon Sep 17 00:00:00 2001 From: tongtongstudio Date: Wed, 24 Sep 2025 18:36:21 +0800 Subject: [PATCH] =?UTF-8?q?version:2.0.9=20bugfixes:=20update:=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0iplay50p=E5=B9=B3=E5=8F=B0=EF=BC=8C=E9=80=80=E5=87=BA?= =?UTF-8?q?=E6=94=BE=E5=9C=A8=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FlycoTabLayoutZ_Lib/build.gradle | 2 + PhotoPreview/build.gradle | 2 + app/build.gradle | 33 +++++++++++++++- app/keystore/iPlay50P.jks | Bin 0 -> 2345 bytes .../uiui/zyos/activity/main/MainActivity.java | 11 +----- .../uiui/zyos/activity/user/UserActivity.java | 15 ++++++++ .../com/uiui/zyos/adapter/AppAdapter.java | 7 +++- .../uiui/zyos/fragment/app/AppViewModel.java | 1 + .../com/uiui/zyos/manager/AppManager.java | 31 ++++++++++++++- .../res/drawable-hdpi/com_jxw_usagedate.png | Bin 0 -> 13461 bytes app/src/main/res/drawable-hdpi/icon_souti.png | Bin 0 -> 6122 bytes app/src/main/res/layout/activity_main.xml | 4 +- app/src/main/res/layout/activity_user.xml | 36 +++++++++++++----- app/src/main/res/values/strings.xml | 2 +- niceimageview/build.gradle | 2 + verification-view/build.gradle | 2 + 16 files changed, 121 insertions(+), 27 deletions(-) create mode 100644 app/keystore/iPlay50P.jks create mode 100644 app/src/main/res/drawable-hdpi/com_jxw_usagedate.png create mode 100644 app/src/main/res/drawable-hdpi/icon_souti.png 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 0000000000000000000000000000000000000000..496ef8d80bc7720e71f5d5f878f6e136640cd101 GIT binary patch literal 2345 zcmd5-`8(8W8=vpY7{-h(qP%v=44V0lwURBQ>`Y{-$=GHn62rkb#mJT|6*00#M3Hb( z$i8(D*=5ZXY8(`WFt57a^IqqN_YZh~xbN%weD3?XpXd5qpX+{hmv)yR5D0WHfM3Dm z<#(AJq5=Bt5%JFbwZ;$#7XUKgJ0L%TR~Z4o0VSvq0B}Lz4ESQ$(N5Jhl8IJrb_HEP zreU|p;a<=Nweyv^!h-FYq~j|}iz+rS&8D&2cuM72rHN42h{~1}xm{XY(xviOpSV>G zQ^ugq8&Tm{evAAxZg=Sp*a}Jy;7GpZq-}^>^wX&K0y3E+9kT9-? z9y5@18D`K;6xg9Wfk*d0>8%VrhTx&Z%}(14=u)_H#Vn=yvM?*dVW(~1eG}WhQ55b4 zY^uxndHLrp?pUoq-T2YmyuVO3EhlP;HG18Z`|A~-n$&RMn z7loP&D7#-=-v?CpcxR}CO4DTX-G+~SI!e!+E@@^Xt2&VyNM@B?Q^TP_7V?nAG)B_$ zc06~T`}U7oI+NC>ojF&o)E-{7d9744A|!%pC^&#qn=|?*r&!OscKA~?`6CP)vuM*a6*oN2;Y^UQ3{urqPOgM7ul%pB;R(g?5 zxguf0zn|yrmQnDOD+4rOQvO*AojWQknxhp0L2D-Sf}{RDx6_-SA`V~WT>TW}n(h7c zl}dG~gpq`dvQCq<`d^!nV?)N#9Jis19K}Vo)%N=}wq*Ulll}Tl5O{otyT=%#xH)w) zWJJ&17c>ig#Eg5QaVoXlUHxn1%2`3rvtPP+lFnmyM=(R5?-k9um0B>03)w-%x{JZ| z>gpGrGaK8eNimm0c{Mgu@k=YP%kz1^PgD6OnC+PyYz*IHn>t3HLw7N0=I2hl z6IQWQwq9KRjx>G_6Wcx-m@Z+v)q&>uLaa#;XAu{|rFXIhG$lxK&A})u3D5Jz^)g*k zrLoG(*WoEz9u709fyJ+?IH_aA2m2I@Jm%0Q7A(hr?ptO?5jXU5*toaMcl3vHA|tOy zb<4c(O8vPK7TyQxT$peV;axrPK*qHH#TTZV%ftmO`!~UPP01zMyxVM_bH+^*o0z63 zJ+u>{#YH|DE^8vKGwk#>iwgrMt00d>MJQN3yoNI>(6Qml3wYG|gL=1G51U)4H6SUp zf9bp1YbjKB<#JgO+0cQ3>QbD%SwCRC(;(+=*+a^HBy#VXu#~n$pkYiBU+&}i^pIks z%9QpV$!NSw-JEixg27{b)_BDYN4zZdJMG11I#`~1lAqM|auC;|(Ulf&4;(q7@Sy&7 zzoks@#?Pe2?s9*un?L*#HibUZ42&qsG$t+>kBGAMeEiLSs#ZW}SYmMlJ`O z26zktflY%9*gKE`ZOMf}0Vos+S+%`^2~rPr1Njh0rRdYq-}wLl#RUN)A_*uEiGbO` z5yDVIOM(z6@DuQ$d5Bc9FNI3>BJhLgpAhURi7hf=)=GN9CdFGT{PLcdu3Ul|ub#ku){Qeu3n1n?+93)E8AP*rmh z<5NEd5#JVlf-wH;^VE~tInZ@vIA3` znInXDV~dXY2hY>2%GDDarN4!!;;%Ki-4UbQxCn&-5a59|XbDR08AOsFE(#ZE#jn)) zNhx`s(6+th(^kX58f?7;rGJ*?;Ris`@c-TL({Pf)a4rxA0GxknzGvAz%>jtn;MW5_ ztpV@oF*6@*j<6#RA{I`Wi=*$d1QIK71s^XC&B=`4-#s8J&~KmP(G%LLq)+Zl)Qmz2 zuV?z3B{V;c>vti2a7VptG_UVt3$>1h(LI8jHu&5#wboAb8a6xJz(GrSaHor!9gM8ji+Lz3jvp+W4>r}( zAkY%>1Fld}>zbdGBiyi;ltsn)E7*e6T<TTA^n?FY|2>($0~iCh>wJGRW5pXK^! zy`T=kd7IKTw#lirB6+Ke6bbLIveuT}P#Tw3KD{QZ)I;0ySYhuh3+f5>N;{t@Y#Rqk PI`FO=KK_l#3%dUXR`2&| literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..df7da0d696de649e7846d61edbad72d9381edab6 GIT binary patch literal 13461 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

#&M!b;Jujd?W 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 literal 0 HcmV?d00001 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 {}