From 8b98116d87d2b008ecfeed81119677edd2889ae0 Mon Sep 17 00:00:00 2001 From: Fanhuitong <981964879@qq.com> Date: Tue, 4 Apr 2023 18:17:30 +0800 Subject: [PATCH] =?UTF-8?q?version:1.1.8=20fix:=20update:=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E7=A6=81=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 6 +-- .../uiui/zyos/activity/main/MainActivity.java | 2 +- .../com/uiui/zyos/adapter/AppAdapter.java | 12 ++++- .../com/uiui/zyos/config/CommonConfig.java | 13 ++++-- .../uiui/zyos/fragment/user/UserFragment.java | 42 ++++++++++++++---- .../com/uiui/zyos/manager/RemoteManager.java | 4 +- .../java/com/uiui/zyos/utils/ApkUtils.java | 38 ++++++++++++---- .../drawable-hdpi/com_android_appstore.png | Bin 4654 -> 4387 bytes .../res/drawable-hdpi/com_android_browser.png | Bin 3736 -> 11114 bytes .../main/res/drawable-hdpi/default_avatar.png | Bin 7777 -> 7537 bytes .../main/res/layout-land/fragment_subject.xml | 2 +- .../main/res/layout-land/fragment_user.xml | 28 +++++++++--- .../main/res/layout-sw800dp/fragment_user.xml | 24 ++++++++-- app/src/main/res/values/strings.xml | 2 +- 14 files changed, 135 insertions(+), 38 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 51abacf..ac077dd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.application' apply plugin: "com.tencent.android.tpns" def appName() { - return "ZYLauncher" + return "CubeZYLauncher" } def releaseTime() { @@ -17,8 +17,8 @@ android { minSdkVersion 24 targetSdkVersion 29 - versionCode 5 - versionName "1.1.3" + versionCode 10 + versionName "1.1.8" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" 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 1689d20..bbf3644 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 @@ -254,7 +254,7 @@ public class MainActivity extends BaseActivity implements MainContact.MainView, @Override public void onConnected() { Log.e(TAG, "onConnected: "); - RemoteManager.getInstance().setDefaultDesktop(); + RemoteManager.getInstance().setDefaultDesktop(BuildConfig.APPLICATION_ID); } public static void toggleNotificationListenerService(Context context) { diff --git a/app/src/main/java/com/uiui/zyos/adapter/AppAdapter.java b/app/src/main/java/com/uiui/zyos/adapter/AppAdapter.java index bd44b7a..ac6f42c 100644 --- a/app/src/main/java/com/uiui/zyos/adapter/AppAdapter.java +++ b/app/src/main/java/com/uiui/zyos/adapter/AppAdapter.java @@ -2,6 +2,7 @@ package com.uiui.zyos.adapter; import android.content.Context; import android.graphics.drawable.Drawable; +import android.provider.Settings; import android.util.Log; import android.view.LayoutInflater; import android.view.View; @@ -15,11 +16,13 @@ import androidx.recyclerview.widget.RecyclerView; import com.uiui.zyos.R; import com.uiui.zyos.bean.DesktopIcon; +import com.uiui.zyos.config.CommonConfig; import com.uiui.zyos.utils.ApkUtils; import com.uiui.zyos.utils.AppUsedTimeUtils; import com.uiui.zyos.utils.BitmapUtils; import com.uiui.zyos.utils.IconUtils; import com.uiui.zyos.utils.OpenApkUtils; +import com.uiui.zyos.utils.ToastUtil; import java.util.ArrayList; import java.util.List; @@ -62,7 +65,14 @@ public class AppAdapter extends RecyclerView.Adapter { holder.root.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - OpenApkUtils.getInstance().openApp(desktopIcon.getPackageName(), desktopIcon.getClassName()); + int setting_other_appInstaller = Settings.Global.getInt(mContext.getContentResolver(), CommonConfig.SETTING_OTHER_APPINSTALLER_KEY, 1); + if (setting_other_appInstaller == 0 + && !ApkUtils.isSystemApp(mContext, desktopIcon.getPackageName() + )) { + ToastUtil.show("已禁止应用打开"); + } else { + OpenApkUtils.getInstance().openApp(desktopIcon.getPackageName(), desktopIcon.getClassName()); + } } }); } diff --git a/app/src/main/java/com/uiui/zyos/config/CommonConfig.java b/app/src/main/java/com/uiui/zyos/config/CommonConfig.java index 2695227..11aee35 100644 --- a/app/src/main/java/com/uiui/zyos/config/CommonConfig.java +++ b/app/src/main/java/com/uiui/zyos/config/CommonConfig.java @@ -10,17 +10,22 @@ public class CommonConfig { /*是否激活接口请求缓存*/ - public static final String ACTIVATIONBEAN_KEY = "UIUI_ACTIVATIONBEAN_KEY"; + public static final String ACTIVATIONBEAN_KEY = "IFLYTEK_UIUI_ACTIVATIONBEAN_KEY"; /*是否激活*/ - public static final String UIUI_ACTIVATION_KEY = "uiui_activation"; + public static final String UIUI_ACTIVATION_KEY = "iflytek_uiui_activation"; /*激活码类型*/ - public static final String UIUI_CODE_TYPE_KEY = "uiui_code_type"; + public static final String UIUI_CODE_TYPE_KEY = "iflytek_uiui_code_type"; /*体验到期时间戳*/ - public static final String UIUI_EXPIRE_TIME_KEY = "uiui_expire_time"; + public static final String UIUI_EXPIRE_TIME_KEY = "iflytek_uiui_expire_time"; + /*是否显示返回Android按钮*/ + public static final String UIUI_RETURN_ANDROID_KEY = "iflytek_uiui_is_return_android"; public static final String MAP_LOCATION_JSON_KEY = "MAPLOCATION_JSON_STRING"; public static final String MAP_LONGITUDE_KEY = "map_longitude_key"; public static final String MAP_LATITUDE_KEY = "map_latitude_key"; public static final String MAP_ADDRESS_KEY = "map_address_key"; public static final String MAP_ERROR_KEY = "map_error_key"; + + public static final String SETTING_OTHER_APPINSTALLER_KEY = "setting_other_appInstaller"; + } diff --git a/app/src/main/java/com/uiui/zyos/fragment/user/UserFragment.java b/app/src/main/java/com/uiui/zyos/fragment/user/UserFragment.java index 7bc12fa..430d2af 100644 --- a/app/src/main/java/com/uiui/zyos/fragment/user/UserFragment.java +++ b/app/src/main/java/com/uiui/zyos/fragment/user/UserFragment.java @@ -37,7 +37,6 @@ import com.uiui.zyos.config.CommonConfig; import com.uiui.zyos.manager.RemoteManager; import com.uiui.zyos.utils.ApkUtils; import com.uiui.zyos.utils.TimeUtils; -import com.uiui.zyos.utils.ToastUtil; import com.uiui.zyos.view.RecyclerViewSpacesItemDecoration; import java.util.ArrayList; @@ -60,6 +59,8 @@ public class UserFragment extends BaseFragment implements UserContact.UserView { TextView tv_name; @BindView(R.id.tv_grade) TextView tv_grade; + @BindView(R.id.tv_exit) + TextView tv_exit; @BindView(R.id.iv_speaker) ImageView iv_speaker; @BindView(R.id.tv_notification) @@ -188,7 +189,7 @@ public class UserFragment extends BaseFragment implements UserContact.UserView { registerOwnReceiver(); String name = mMMKV.decodeString("USERINFO_NAME", ""); if (TextUtils.isEmpty(name)) { - tv_name.setText(getString(R.string.default_name)); + tv_name.setText(getString(R.string.default_nickname)); } else { tv_name.setText(name); } @@ -205,12 +206,18 @@ public class UserFragment extends BaseFragment implements UserContact.UserView { cl_activation.setVisibility(View.GONE); cl_app.setVisibility(View.VISIBLE); } - int is_activation = Settings.Global.getInt(mContext.getContentResolver(), CommonConfig.UIUI_ACTIVATION_KEY, 0); - if (is_activation != 1) { - tv_activation.setVisibility(View.VISIBLE); - } else { - tv_activation.setVisibility(View.GONE); - } + setButtonVisibility(); + tv_exit.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + RemoteManager.getInstance().setDefaultDesktop(ApkUtils.ANDROID_LAUNCHER3_PACKAGE_NAME); + if (!ApkUtils.openPackage(mContext, ApkUtils.ANDROID_LAUNCHER3_PACKAGE_NAME)) { + ApkUtils.gotoLauncher(mContext); + } + mContext.finish(); + System.exit(0); + } + }); tv_activation.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { @@ -243,6 +250,22 @@ public class UserFragment extends BaseFragment implements UserContact.UserView { rv_app.setAdapter(mAppAdapter); } + private void setButtonVisibility(){ + int is_activation = Settings.Global.getInt(mContext.getContentResolver(), CommonConfig.UIUI_ACTIVATION_KEY, 0); + if (is_activation != 1) { + tv_exit.setVisibility(View.VISIBLE); + tv_activation.setVisibility(View.VISIBLE); + } else { + int isReturnAndroid = Settings.Global.getInt(mContext.getContentResolver(), CommonConfig.UIUI_RETURN_ANDROID_KEY, 0); + if (isReturnAndroid == 0) { + tv_exit.setVisibility(View.INVISIBLE); + } else { + tv_exit.setVisibility(View.VISIBLE); + } + tv_activation.setVisibility(View.GONE); + } + } + @Override public void setUserVisibleHint(boolean isVisibleToUser) { super.setUserVisibleHint(isVisibleToUser); @@ -277,7 +300,7 @@ public class UserFragment extends BaseFragment implements UserContact.UserView { String name = snInfo.getSn_name(); String grade = snInfo.getGrade(); if (TextUtils.isEmpty(name)) { - tv_name.setText(getString(R.string.default_name)); + tv_name.setText(getString(R.string.default_nickname)); } else { tv_name.setText(name); } @@ -417,6 +440,7 @@ public class UserFragment extends BaseFragment implements UserContact.UserView { Log.e("RefreshReceiver", "onReceive: " + action); if (ACTION_REFRESH_BINDING_STATUS.equals(action)) { mPresenter.getSnInfo(); + setButtonVisibility(); } } } diff --git a/app/src/main/java/com/uiui/zyos/manager/RemoteManager.java b/app/src/main/java/com/uiui/zyos/manager/RemoteManager.java index b97a886..6586d19 100644 --- a/app/src/main/java/com/uiui/zyos/manager/RemoteManager.java +++ b/app/src/main/java/com/uiui/zyos/manager/RemoteManager.java @@ -297,9 +297,9 @@ public class RemoteManager { } } - public void setDefaultDesktop() { + public void setDefaultDesktop(String pkg) { try { - mGetInfoInterface.setDefaultLauncher(BuildConfig.APPLICATION_ID); + mGetInfoInterface.setDefaultLauncher(pkg); } catch (RemoteException e) { Log.e(TAG, "setDefaultDesktop: " + e.getMessage()); e.printStackTrace(); diff --git a/app/src/main/java/com/uiui/zyos/utils/ApkUtils.java b/app/src/main/java/com/uiui/zyos/utils/ApkUtils.java index 386b270..67d0f4e 100644 --- a/app/src/main/java/com/uiui/zyos/utils/ApkUtils.java +++ b/app/src/main/java/com/uiui/zyos/utils/ApkUtils.java @@ -20,6 +20,7 @@ import androidx.annotation.RequiresApi; import com.uiui.zyos.BuildConfig; import com.uiui.zyos.R; import com.uiui.zyos.bean.DesktopIcon; +import com.uiui.zyos.config.CommonConfig; import com.uiui.zyos.receiver.InstallResultReceiver; import java.io.File; @@ -57,13 +58,23 @@ public class ApkUtils { this.add("com.android.uiuios"); this.add("com.uiui.os"); this.add("com.uiui.health"); - this.add("com.uiui.appstore"); this.add("com.tencent.android.qqdownloader"); this.add("com.alldocube.store"); this.add("com.joytv.live"); this.add("com.iflytek.speechcloud"); this.add("com.safe.uiui"); + this.add("com.uiuios.aios"); + this.add("com.uiuios.sn"); + this.add("com.uiuios.appstore"); + this.add("com.uiuios.browser"); this.add("com.uiui.aios"); + this.add("com.uiui.sn"); + this.add("com.uiui.appstore"); + this.add("com.uiui.browser"); + this.add("com.teclast.zyos"); + this.add("com.teclast.zy"); + this.add("com.teclast.zyappstore"); + this.add("com.teclast.zybrowser"); }}; private static HashSet excludeClassName = new HashSet() {{ @@ -96,6 +107,10 @@ public class ApkUtils { private static HashSet allHintPackage = new HashSet() {{ this.add("com.android.uiuios"); }}; + + public static final String ANDROID_LAUNCHER3_PACKAGE_NAME = "com.android.launcher3"; + public static final String ANDROID_LAUNCHER3_CLASS_NAME = "com.android.launcher3.Launcher"; + private static String TAG = ApkUtils.class.getSimpleName(); public static ArrayList getSystemApp(Context context) { @@ -181,7 +196,7 @@ public class ApkUtils { if (!TextUtils.isEmpty(appListString)) { packageList = new ArrayList<>(Arrays.asList(appListString.split(","))); } - int setting_other_appInstaller = Settings.Global.getInt(context.getContentResolver(), "setting_other_appInstaller", 1); + int setting_other_appInstaller = Settings.Global.getInt(context.getContentResolver(), CommonConfig.SETTING_OTHER_APPINSTALLER_KEY, 1); for (ResolveInfo resolveInfo : resolveinfoList) { String pkg = resolveInfo.activityInfo.packageName; if (appIsDisable(context, pkg)) { @@ -194,15 +209,15 @@ public class ApkUtils { // resolveInfos.add(resolveInfo); // } } else { - if (setting_other_appInstaller == 0) {//不显示自己安装的 - if (packageList.contains(pkg)) { - resolveInfos.add(resolveInfo); - } - } else { +// if (setting_other_appInstaller == 0) {//不显示自己安装的 +// if (packageList.contains(pkg)) { +// resolveInfos.add(resolveInfo); +// } +// } else { if (allowPackages.contains(pkg) && !excludePackageName.contains(pkg)) { resolveInfos.add(resolveInfo); } - } +// } } } if (Settings.Global.getInt(context.getContentResolver(), "is_activity", 0) == 0) { @@ -558,4 +573,11 @@ public class ApkUtils { public static int getUserId(int uid) { return uid / PER_USER_RANGE; } + + public static void gotoLauncher(Context context) { + Intent i = new Intent(Intent.ACTION_MAIN); + i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); //android123提示如果是服务里调用,必须加入new task标识 + i.addCategory(Intent.CATEGORY_HOME); + context.startActivity(i); + } } diff --git a/app/src/main/res/drawable-hdpi/com_android_appstore.png b/app/src/main/res/drawable-hdpi/com_android_appstore.png index 9b06c7c4069a77c17c4358bb918659ef742978a6..3e98f6ebb7961b2d0fdbe95c0413a933ca28b73a 100644 GIT binary patch delta 3689 zcmZ`*X*3iL`(?6+#+K|1(=c|8Ff)3mnX&In$eI{K2FbqEh>|5c*>?sbJ0nY!eThuA zvSzO=H7d!Hf4~2E-;clN%RT3wd(Zvwobx=lR;m3{>_`Fa1KqhYlarl(Q#zzVXs>T&+X)U5bUk_2H(C3UjEhB zAOfk)9|Mn}Q%S`s@3GRBx)Z!I2aQ1aCDz3bvNkE4qBi%kJ@V+S&{Y#;-y z0g@VV*ZBt{Edv$YL9_*?O4cAXL(sXC}O7|_zMBaxTGo$}<@v|_=2CyXpRS~L;~^Ohy-lnD^` z*_V@9c;ET1HEj!j_+Z_Z9Y}`iSH#LF{#38vlfoGl1L|xWF%g?eYXwHTO~TEk%1QEt_GzNnWEP3erL`*_?W)M~a4>+)+ptZ#z+-uGqz4wd`jC6h zGS^5{k-CY~_+cC$pL4Y1-=0?KH+8$j7bq`#*|t0D(`W!+vv+J(Pao0_cy~Y2;06$_$roP z++83lA%qCl(z=|n4!6Mu&J`H^xFt`;w_y$nJ+WtQ9UADV-m@8mHcUBRxJL$;V7bXt z1C^Ykq`P}^Q1u@a@K0dGh{CzW-rns?*S?m`ny^pCQhalqPv6Ji^tzhsallyJ9BO1C z=-q=HS7_|ed9meO5gjLYbo5Lm^l%Ajn_h9U86?8Cc{nqZF*$bQw-s# z3g+q_HcRFx%LLWh0dnO0dL=!3vuKqd{fbL|-;DKH8yIMpkh$!QT3`kV&ELk>5pk z#NnKmcad2ZC<*Aw5|OPWAW!nSL*KAlIXv`xl<`R7UGNV-imzFYz$67&$~TNAx4T(?kRWyDKBe2_HO?+IP`375MH=*-=7_*MGH>dwKv&c_tldq zLYZm+FC@CJW8&L9WJk^T_}Oz_u#fjD{(ve=n77cv)ZPzN5G^fcRmlwSfjS3oFraf_ zEA2|&#P{#^@>3p3`r%h5r@p?9Ynpbs8eb`8m%+U1A$>!`So&K>tIhi2$vniTA$Tt1 zE?nDEBQ>^+XJR+9$;+lBRLOl+aP+1YBe`44>q$`BfYINuE?A{6S) zzx}Vv6`I5IX@<7+zuS)kGfc`5Qz>VUL-)b+e;he-s^0-K6Y6_`3{cLDcv!Dc@($Xb z^O!LC$oozek&PDqbMBv%?5V*GcwcLP`Bps}1I?>BK9-6IphyL-MC4E0ji%97P zvOVkhHf9i0A52u+GL}vP4Fn4GMZ0m0t@mHU1t z5fC5F$W=|z)#8Wg1dFB6X@bHxCw^ZLrA|pS7QLg1Y{M7+a6>JePLpD~S-T_O#@&QC0Z$|%d8 zn+#H7W{>_1&pMaHhqT}8qr|tlWZ|tWDoL1Qd{JD49NLAE+AEuJw-LP~13ii2EGeyN z@cMOSG?t=hG0(yDeW>2FH^tx!^@~m5?G+3M*2#fqG02SC4Hwk_IUjscn|7_8`dMaEK=~c4S;E9|FNRI62!blK5)9dG1qkM2iqNxcpB~VMy!tuUee4Ng>%synBIu> z;*rhXt>mZA?m&24co~C3PB9QFpv#9|aS?_rPLn6W${W^`t=NYTKP#8?ZtabKb@5-_#>YCkgGOCGbH(~NSp^Ng#wC)` zC3hakjV5>ry|}60T)|b#@%cF5X{DWH89*ke`rP##rRzEM2xe^tEB^8Ek;<47R!mci z$(ACOGpYaOtGjC0Jl_F_@Vk>vT&CPnToIRqqdWMQSnm?W4o4yyFh+S{BI;m(zP{)! zDza^5@0qhurn96@_vu%=u+XH9dqpOe3-@VCAg`*n|`+nv|lri9T%;3itf7Q2eN~MY4gy^qGKg}_s zDnxx5OXA9854HD`?Z7ak!vQ^w_hR?A{IF@0O?AFEMEJFNRt#GMtf5Wz455+_fJBuylNJDvlthxcoleGKCT~;5-x`H`ki6B2n4?C3zyv!VaixRlYC&eS9V5RCPhoO zG31U1?eU-NO$hT2X5?p+y~74sm_b^Xa*G4|^VXv;&vPEIu<%4?mh~(>bE|$lz(o{6 zGW9#i-R9(45l-SW;ngnUkmN>KXrWHmMxHXDu~T|xN5JrTUEu0d6mWv^pVq}MUUX%Z zS;BZ6g&O+@6EP@tvt>{h@HPW~;@l~|Bq{Dck1qX2{5fRww>gpM8(Klpujs$U(PDw% z%oaEA^DJ99r;C64-+trF8)9BHE!fZWZ#lfBr1YMFjiqW+NIKEinKqs<7@W);kU9VW9N)~*f85}cYg@m~~)DIaEIvdB$<@@~$4osM&q4{+62V*Yl+d@Y3i z<|$Q|o-tDRvoA%lVcOv3;*Df)Vdt=f-7>0>lQcb}c|RqCBj~BkFeTDU*-qImamuI1 yupuE;P==+~U&wH>N5n;WtIkD&cyb0{r)!rw)_Zm!WyVhTcl5N3v9;)1k^cuqNW?V& delta 3959 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 V$ub8Qs--v%$IRFoTZZw7{tqTqxYGat diff --git a/app/src/main/res/drawable-hdpi/default_avatar.png b/app/src/main/res/drawable-hdpi/default_avatar.png index 2c8bb946ea751e2a420aca541040db8bfa8fd26c..681459c633382f8e549bde0956b8e9f937a069f7 100644 GIT binary patch delta 6946 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 bpcjWKS1yKz)J^-}+6zZZO;5E(*#`N4no|1U delta 7188 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 TiAMh``cTxAwZYAbHqrkFa$}&6 diff --git a/app/src/main/res/layout-land/fragment_subject.xml b/app/src/main/res/layout-land/fragment_subject.xml index eb96d5f..6145aab 100644 --- a/app/src/main/res/layout-land/fragment_subject.xml +++ b/app/src/main/res/layout-land/fragment_subject.xml @@ -12,7 +12,7 @@ + + @@ -425,8 +443,8 @@ android:layout_width="match_parent" android:layout_height="0dp" android:layout_margin="@dimen/dp_8" - android:scrollbars="vertical" android:fadeScrollbars="false" + android:scrollbars="vertical" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toBottomOf="@+id/tv_date2" /> diff --git a/app/src/main/res/layout-sw800dp/fragment_user.xml b/app/src/main/res/layout-sw800dp/fragment_user.xml index a0b3b6e..b417b8c 100644 --- a/app/src/main/res/layout-sw800dp/fragment_user.xml +++ b/app/src/main/res/layout-sw800dp/fragment_user.xml @@ -45,7 +45,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_8" android:maxLines="1" - android:text="@string/default_name" + android:text="@string/default_nickname" android:textColor="@color/white" android:textSize="@dimen/sp_10" app:layout_constraintStart_toEndOf="@+id/iv_avatar" @@ -63,14 +63,32 @@ app:layout_constraintStart_toStartOf="@+id/tv_name" /> + + 未绑定 未设置 设备未经授权 - 王小明 + 小酷 一年级