From eef000be87c0ee34113c0bc9871f21adf32b0ce3 Mon Sep 17 00:00:00 2001 From: Fanhuitong <981964879@qq.com> Date: Mon, 10 Apr 2023 14:45:24 +0800 Subject: [PATCH] =?UTF-8?q?version:1.2.3=20fix:=E4=BF=AE=E5=A4=8D=E7=BB=91?= =?UTF-8?q?=E5=AE=9A=E7=8A=B6=E6=80=81=E5=88=B7=E6=96=B0=E4=B8=8D=E5=8F=8A?= =?UTF-8?q?=E6=97=B6=20update:=E4=B8=BB=E9=A1=B5=E5=9B=BE=E6=A0=87?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FlycoTabLayoutZ_Lib/build.gradle | 8 +- app/build.gradle | 25 ++++- app/keystore/iPlay50SE.keystore | Bin 0 -> 2717 bytes .../uiui/zyos/activity/main/MainActivity.java | 7 +- .../zyos/activity/more/MoreAppActivity.java | 46 ++++++++- .../com/uiui/zyos/bean/ScreenPassword.java | 28 ++++++ .../com/uiui/zyos/config/CommonConfig.java | 3 +- .../uiui/zyos/fragment/main/MainFragment.java | 6 +- .../uiui/zyos/fragment/user/UserFragment.java | 92 ++++++++++++++++-- .../com/uiui/zyos/jxw/JxwPackageConfig.java | 9 +- .../java/com/uiui/zyos/utils/ApkUtils.java | 23 ++++- .../java/com/uiui/zyos/utils/IconUtils.java | 2 +- .../com/uiui/zyos/utils/OpenApkUtils.java | 30 +++--- .../main/res/drawable-hdpi/com_uiui_sn.png | Bin 5137 -> 5107 bytes .../main/res/layout-land/activity_main.xml | 4 +- .../main/res/layout-land/fragment_main.xml | 4 +- .../main/res/layout-sw800dp/activity_main.xml | 4 +- app/src/main/res/layout/dialog_password.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- niceimageview/build.gradle | 2 + settings.gradle | 2 +- 21 files changed, 243 insertions(+), 56 deletions(-) create mode 100644 app/keystore/iPlay50SE.keystore create mode 100644 app/src/main/java/com/uiui/zyos/bean/ScreenPassword.java diff --git a/FlycoTabLayoutZ_Lib/build.gradle b/FlycoTabLayoutZ_Lib/build.gradle index 6e50c72..7b57655 100644 --- a/FlycoTabLayoutZ_Lib/build.gradle +++ b/FlycoTabLayoutZ_Lib/build.gradle @@ -13,10 +13,10 @@ android { versionName version } buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } + iPlay50SEDebug{} + iPlay50SERelease{} + debug {} + release {} } } diff --git a/app/build.gradle b/app/build.gradle index ac077dd..f5afc6d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,8 +17,8 @@ android { minSdkVersion 24 targetSdkVersion 29 - versionCode 10 - versionName "1.1.8" + versionCode 15 + versionName "1.2.3" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -57,9 +57,30 @@ android { keyPassword "123456" v2SigningEnabled false } + + iPlay50SE { + storeFile file("keystore/iPlay50SE.keystore") + storePassword "123456" + keyAlias "iplay50se" + keyPassword "123456" + v1SigningEnabled true + v2SigningEnabled true + } } buildTypes { + iPlay50SEDebug.initWith(debug) + iPlay50SEDebug { + versionNameSuffix "-debug" + debuggable true + signingConfig signingConfigs.iPlay50SE + } + + iPlay50SERelease.initWith(release) + iPlay50SERelease { + signingConfig signingConfigs.iPlay50SE + } + debug { // 显示Log versionNameSuffix "-debug" diff --git a/app/keystore/iPlay50SE.keystore b/app/keystore/iPlay50SE.keystore new file mode 100644 index 0000000000000000000000000000000000000000..57f25214373c57f853a55218da54d97b8db56ff9 GIT binary patch literal 2717 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 Jhz=M<{s*yh`NseN 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 bbf3644..a2c0959 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 @@ -198,19 +198,20 @@ public class MainActivity extends BaseActivity implements MainContact.MainView, cl_0.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - OpenApkUtils.getInstance().openApp("com.uiui.zyappstore"); + OpenApkUtils.getInstance().openApp("com.uiui.zyappstore", "com.uiui.zyappstore.activity.MainActivity"); } }); cl_1.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - OpenApkUtils.getInstance().openApp("com.uiui.zybrowser"); + OpenApkUtils.getInstance().openApp("com.uiui.zybrowser", "com.uiui.zybrowser.activity.main.MainActivity"); } }); cl_2.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - OpenApkUtils.getInstance().openApp("com.safe.uiui"); +// OpenApkUtils.getInstance().openApp("com.android.documentsui"); + OpenApkUtils.getInstance().openApp("com.uiui.zy", "com.uiui.zy.activity.main.MainActivity"); } }); cl_3.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/uiui/zyos/activity/more/MoreAppActivity.java b/app/src/main/java/com/uiui/zyos/activity/more/MoreAppActivity.java index e908ccd..c11ae8a 100644 --- a/app/src/main/java/com/uiui/zyos/activity/more/MoreAppActivity.java +++ b/app/src/main/java/com/uiui/zyos/activity/more/MoreAppActivity.java @@ -1,7 +1,12 @@ package com.uiui.zyos.activity.more; +import android.content.BroadcastReceiver; import android.content.Context; +import android.content.Intent; +import android.content.IntentFilter; +import android.text.TextUtils; import android.util.DisplayMetrics; +import android.util.Log; import android.view.View; import android.view.WindowManager; import android.widget.ImageView; @@ -14,6 +19,7 @@ import com.uiui.zyos.R; import com.uiui.zyos.adapter.AppAdapter; import com.uiui.zyos.base.BaseActivity; import com.uiui.zyos.bean.DesktopIcon; +import com.uiui.zyos.fragment.user.UserFragment; import com.uiui.zyos.view.RecyclerViewSpacesItemDecoration; import java.util.HashMap; @@ -71,12 +77,50 @@ public class MoreAppActivity extends BaseActivity implements MoreContact.MoreVie @Override public void initData() { + registerAppChangedReceiver(); mPresenter.getInstalledApp(); } + @Override + protected void onDestroy() { + super.onDestroy(); + if (mAppChangedReceiver != null) { + unregisterReceiver(mAppChangedReceiver); + } + } + @Override public void setDesktopIcons(List desktopIcons) { mAppAdapter.setDesktopIcons(desktopIcons); - tv_appsize.setText(String.format(getString(R.string.app_size),desktopIcons.size())); + tv_appsize.setText(String.format(getString(R.string.app_size), desktopIcons.size())); + } + + private AppChangedReceiver mAppChangedReceiver; + + private void registerAppChangedReceiver() { + if (mAppChangedReceiver == null) { + mAppChangedReceiver = new AppChangedReceiver(); + } + IntentFilter filter = new IntentFilter(); + filter.setPriority(IntentFilter.SYSTEM_HIGH_PRIORITY); + filter.addAction(Intent.ACTION_PACKAGE_ADDED); + filter.addAction(Intent.ACTION_PACKAGE_CHANGED); + filter.addAction(Intent.ACTION_PACKAGE_REPLACED); + filter.addAction(Intent.ACTION_PACKAGE_REMOVED); + filter.addDataScheme("package"); + registerReceiver(mAppChangedReceiver, filter); + } + + class AppChangedReceiver extends BroadcastReceiver { + + @Override + public void onReceive(Context context, Intent intent) { + String action = intent.getAction(); + Log.e("AppChangedReceiver", "onReceive: " + action); + if (TextUtils.isEmpty(action)) { + return; + } + mPresenter.getInstalledApp(); + } } } diff --git a/app/src/main/java/com/uiui/zyos/bean/ScreenPassword.java b/app/src/main/java/com/uiui/zyos/bean/ScreenPassword.java new file mode 100644 index 0000000..0a719b2 --- /dev/null +++ b/app/src/main/java/com/uiui/zyos/bean/ScreenPassword.java @@ -0,0 +1,28 @@ +package com.uiui.zyos.bean; + +import androidx.annotation.NonNull; + +import com.google.gson.Gson; +import com.google.gson.JsonParser; + +import java.io.Serializable; + +public class ScreenPassword implements Serializable { + private static final long serialVersionUID = 4417211558962408699L; + + String pwd; + + public String getPwd() { + return pwd; + } + + public void setPwd(String pwd) { + this.pwd = pwd; + } + + @NonNull + @Override + public String toString() { + return JsonParser.parseString(new Gson().toJson(this)).getAsJsonObject().toString(); + } +} 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 11aee35..f8f2ee6 100644 --- a/app/src/main/java/com/uiui/zyos/config/CommonConfig.java +++ b/app/src/main/java/com/uiui/zyos/config/CommonConfig.java @@ -8,6 +8,8 @@ public class CommonConfig { public static final String isLogined = "isLogined"; public static final String AES_KEY = "xqdep8exnafpef3d"; + public static final String LOCK_SCREEN_PASSWORD ="Iflytek_lockScreenPasswordKey"; + public static final String DEFAULT_PASSWORD = "0728"; /*是否激活接口请求缓存*/ public static final String ACTIVATIONBEAN_KEY = "IFLYTEK_UIUI_ACTIVATIONBEAN_KEY"; @@ -27,5 +29,4 @@ public class CommonConfig { 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/main/MainFragment.java b/app/src/main/java/com/uiui/zyos/fragment/main/MainFragment.java index 2f73e7e..0ec41f9 100644 --- a/app/src/main/java/com/uiui/zyos/fragment/main/MainFragment.java +++ b/app/src/main/java/com/uiui/zyos/fragment/main/MainFragment.java @@ -231,19 +231,19 @@ public class MainFragment extends BaseFragment implements MainContact.MainView { cl_0.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - OpenApkUtils.getInstance().openApp("com.uiui.zyappstore"); + OpenApkUtils.getInstance().openApp("com.uiui.zyappstore","com.uiui.zyappstore.activity.MainActivity"); } }); cl_1.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - OpenApkUtils.getInstance().openApp("com.uiui.zybrowser"); + OpenApkUtils.getInstance().openApp("com.uiui.zybrowser","com.uiui.zybrowser.activity.main.MainActivity"); } }); cl_2.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - OpenApkUtils.getInstance().openApp("com.safe.uiui"); + OpenApkUtils.getInstance().openApp("com.android.documentsui"); } }); cl_3.setOnClickListener(new View.OnClickListener() { 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 430d2af..964897f 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 @@ -10,6 +10,7 @@ import android.provider.Settings; import android.text.TextUtils; import android.util.DisplayMetrics; import android.util.Log; +import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -34,9 +35,11 @@ import com.uiui.zyos.bean.BaseResponse; import com.uiui.zyos.bean.DesktopIcon; import com.uiui.zyos.bean.SnInfo; import com.uiui.zyos.config.CommonConfig; +import com.uiui.zyos.dialog.PasswordDialog; 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; @@ -184,8 +187,8 @@ public class UserFragment extends BaseFragment implements UserContact.UserView { private void initView() { Log.e(TAG, "initView: "); tv_notification.requestFocus(); - tv_activated.setOnClickListener(view -> ApkUtils.openPackage(mContext, RemoteManager.SN_PACKAGE_NAME)); - iv_avatar.setOnClickListener(view -> ApkUtils.openPackage(mContext, RemoteManager.SN_PACKAGE_NAME)); + tv_activated.setOnClickListener(view -> ApkUtils.openPackage(mContext, "com.uiui.zy", "com.uiui.zy.activity.main.MainActivity")); + iv_avatar.setOnClickListener(view -> ApkUtils.openPackage(mContext, "com.uiui.zy", "com.uiui.zy.activity.main.MainActivity")); registerOwnReceiver(); String name = mMMKV.decodeString("USERINFO_NAME", ""); if (TextUtils.isEmpty(name)) { @@ -210,18 +213,16 @@ public class UserFragment extends BaseFragment implements UserContact.UserView { 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); + Intent intent = new Intent("Receiver_Refresh_Password_Action"); + intent.setPackage("com.uiui.zy"); + mContext.sendBroadcast(intent); + showPassword(); } }); tv_activation.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - ApkUtils.openPackage(mContext, RemoteManager.SN_PACKAGE_NAME); + ApkUtils.openPackage(mContext, "com.uiui.zy", "com.uiui.zy.activity.main.MainActivity"); } }); String avatar = mMMKV.decodeString("USERINFO_AVATAR", ""); @@ -250,8 +251,43 @@ public class UserFragment extends BaseFragment implements UserContact.UserView { rv_app.setAdapter(mAppAdapter); } - private void setButtonVisibility(){ + private void showPassword() { + PasswordDialog passwordDialog = new PasswordDialog(mContext); + passwordDialog.setTitle("退出智慧课堂"); + passwordDialog.setOnClickBottomListener(new PasswordDialog.OnClickBottomListener() { + @Override + public void onPositiveClick() { + String password = Settings.Global.getString(mContext.getContentResolver(), CommonConfig.LOCK_SCREEN_PASSWORD); + if (TextUtils.isEmpty(password)) { + password = CommonConfig.DEFAULT_PASSWORD; + } + if (password.equals(passwordDialog.getPassword())) { + RemoteManager.getInstance().setDefaultDesktop(ApkUtils.ANDROID_LAUNCHER3_PACKAGE_NAME); + if (!ApkUtils.openPackage(mContext, ApkUtils.ANDROID_LAUNCHER3_PACKAGE_NAME)) { + ApkUtils.gotoLauncher(mContext); + } + passwordDialog.dismiss(); + mContext.finish(); + System.exit(0); + } else { + ToastUtil.show("密码错误"); + } + } + + @Override + public void onNegtiveClick() { + passwordDialog.dismiss(); + } + }); + passwordDialog.show(); + passwordDialog.getWindow().setGravity(Gravity.CENTER); + passwordDialog.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE | WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM); + passwordDialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE); + } + + private void setButtonVisibility() { int is_activation = Settings.Global.getInt(mContext.getContentResolver(), CommonConfig.UIUI_ACTIVATION_KEY, 0); + Log.e(TAG, "setButtonVisibility: " + is_activation); if (is_activation != 1) { tv_exit.setVisibility(View.VISIBLE); tv_activation.setVisibility(View.VISIBLE); @@ -273,6 +309,7 @@ public class UserFragment extends BaseFragment implements UserContact.UserView { if (isVisibleToUser && isViewInitiated) { mPresenter.getInstalledApp(); mPresenter.getSnInfo(); + setButtonVisibility(); } } @@ -280,6 +317,7 @@ public class UserFragment extends BaseFragment implements UserContact.UserView { public void onResume() { super.onResume(); Log.e(TAG, "onResume: "); + setButtonVisibility(); } @Override @@ -370,6 +408,7 @@ public class UserFragment extends BaseFragment implements UserContact.UserView { registerTimeReceiver(); registerRefreshReceiver(); registerUpdateDesktopReceiver(); + registerAppChangedReceiver(); } private void unregisterOwnReceiver() { @@ -382,6 +421,9 @@ public class UserFragment extends BaseFragment implements UserContact.UserView { if (updateDesktopReceiver != null) { mContext.unregisterReceiver(updateDesktopReceiver); } + if (mAppChangedReceiver != null) { + mContext.unregisterReceiver(mAppChangedReceiver); + } } @@ -473,4 +515,34 @@ public class UserFragment extends BaseFragment implements UserContact.UserView { } } } + + private AppChangedReceiver mAppChangedReceiver; + + private void registerAppChangedReceiver() { + if (mAppChangedReceiver == null) { + mAppChangedReceiver = new AppChangedReceiver(); + } + IntentFilter filter = new IntentFilter(); + filter.setPriority(IntentFilter.SYSTEM_HIGH_PRIORITY); + filter.addAction(Intent.ACTION_PACKAGE_ADDED); + filter.addAction(Intent.ACTION_PACKAGE_CHANGED); + filter.addAction(Intent.ACTION_PACKAGE_REPLACED); + filter.addAction(Intent.ACTION_PACKAGE_REMOVED); + filter.addDataScheme("package"); + mContext.registerReceiver(mAppChangedReceiver, filter); + } + + class AppChangedReceiver extends BroadcastReceiver { + + @Override + public void onReceive(Context context, Intent intent) { + String action = intent.getAction(); + Log.e("AppChangedReceiver", "onReceive: " + action); + if (TextUtils.isEmpty(action)) { + return; + } + mPresenter.getInstalledApp(); + } + } + } diff --git a/app/src/main/java/com/uiui/zyos/jxw/JxwPackageConfig.java b/app/src/main/java/com/uiui/zyos/jxw/JxwPackageConfig.java index 115b68f..5aad91f 100644 --- a/app/src/main/java/com/uiui/zyos/jxw/JxwPackageConfig.java +++ b/app/src/main/java/com/uiui/zyos/jxw/JxwPackageConfig.java @@ -41,7 +41,7 @@ public class JxwPackageConfig { public static final String JXW_PIANPANG_CLASS_NAME = "com.example.viewpageindicator.MainActivity"; /*笔顺规则*/ public static final String JXW_BISHUN_PACKAGE_NAME = "com.jxw.bishunguize"; - public static final String JXW_BISHUN_CLASS_NAME = "com.example.viewpageindicator.MainActivityNew"; + public static final String JXW_BISHUN_CLASS_NAME = "com.example.viewpageindicator.MainActivity"; /*四则运算*/ public static final String JXW_ARITHMETIC_PACKAGE_NAME = "com.jxw.jxwcalculator"; public static final String JXW_ARITHMETIC_CLASS_NAME = "com.jxw.jxwcalculator.LancherActivity"; @@ -60,9 +60,10 @@ public class JxwPackageConfig { public static final String JXW_ORAL_TEST_PACKAGE_NAME = "com.jxw.singsound"; public static final String JXW_ORAL_TEST_CLASS_NAME = "com.jxw.singsound.ui.SplashActivity"; /*实验室分学科调用*/ - public static final String JXW_LABORATORY_PACKAGE_NAME = "com.jxw.yuwenxiezuo"; - public static final String JXW_LABORATORY_CLASS_NAME = "com.jxw.yuwenxiezuo.SYSActivity"; - public static final String JXW_writing_CLASS_NAME = "com.jxw.yuwenxiezuo.MainActivity"; + public static final String JXW_LABORATORY_PACKAGE_NAME = "com.jxw.laboratory"; + public static final String JXW_LABORATORY_CLASS_NAME = "com.jxw.laboratory.SYSActivity"; + public static final String JXW_WRITING_PACKAGE_NAME = "com.jxw.yuwenxiezuo"; + public static final String JXW_WRITING_CLASS_NAME = "com.jxw.yuwenxiezuo.MainActivity"; /*名师风采*/ public static final String JXW_TEACHER_PACKAGE_NAME = "com.jxw.teacher.video"; public static final String JXW_TEACHER_CLASS_NAME = "com.jxw.teacher.activity.MainActivity"; 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 67d0f4e..b077b07 100644 --- a/app/src/main/java/com/uiui/zyos/utils/ApkUtils.java +++ b/app/src/main/java/com/uiui/zyos/utils/ApkUtils.java @@ -71,10 +71,20 @@ public class ApkUtils { this.add("com.uiui.sn"); this.add("com.uiui.appstore"); this.add("com.uiui.browser"); + this.add("com.uiui.videoplayer"); this.add("com.teclast.zyos"); this.add("com.teclast.zy"); this.add("com.teclast.zyappstore"); this.add("com.teclast.zybrowser"); + + this.add("com.lft.turn"); + this.add("com.huawei.wallet"); + this.add("com.huawei.music"); + this.add("com.huawei.educenter"); + this.add("com.huawei.fastapp"); + this.add("com.huawei.himovie"); + this.add("com.mainbo.homeschool"); + this.add("com.huawei.gamebox"); }}; private static HashSet excludeClassName = new HashSet() {{ @@ -214,9 +224,9 @@ public class ApkUtils { // resolveInfos.add(resolveInfo); // } // } else { - if (allowPackages.contains(pkg) && !excludePackageName.contains(pkg)) { - resolveInfos.add(resolveInfo); - } + if (allowPackages.contains(pkg) && !excludePackageName.contains(pkg)) { + resolveInfos.add(resolveInfo); + } // } } } @@ -252,6 +262,13 @@ public class ApkUtils { desktopIcons.add(DesktopIcon.creatDesktopIcon(context, applicationInfo)); } } +// DesktopIcon infoIcon = new DesktopIcon(); +// infoIcon.setIcon(context.getDrawable(R.drawable.com_uiui_sn)); +// infoIcon.setLable("我的设备"); +// infoIcon.setPackageName("com.uiui.zy"); +// infoIcon.setClassName("com.uiui.zy.activity.main.MainActivity"); +// infoIcon.setPosition(0); +// desktopIcons.add(0, infoIcon); return desktopIcons; } diff --git a/app/src/main/java/com/uiui/zyos/utils/IconUtils.java b/app/src/main/java/com/uiui/zyos/utils/IconUtils.java index c4e50d9..14ed74a 100644 --- a/app/src/main/java/com/uiui/zyos/utils/IconUtils.java +++ b/app/src/main/java/com/uiui/zyos/utils/IconUtils.java @@ -7,7 +7,7 @@ import java.util.List; public class IconUtils { public static List appClassNameList = new ArrayList() {{ - this.add("com.uiui.sn");//设别信息 + this.add("com.uiui.sn");//设备信息 this.add("com.uiui.appstore");//应用市场 this.add("com.uiui.weather");//天气 this.add("com.android.browser");//浏览器 diff --git a/app/src/main/java/com/uiui/zyos/utils/OpenApkUtils.java b/app/src/main/java/com/uiui/zyos/utils/OpenApkUtils.java index d325772..486fa7a 100644 --- a/app/src/main/java/com/uiui/zyos/utils/OpenApkUtils.java +++ b/app/src/main/java/com/uiui/zyos/utils/OpenApkUtils.java @@ -55,7 +55,7 @@ public class OpenApkUtils { private boolean checkActivation() { int is_activation = Settings.Global.getInt(mContext.getContentResolver(), CommonConfig.UIUI_ACTIVATION_KEY, 0); if (is_activation != 1) { - ApkUtils.openPackage(mContext, "com.uiui.zy"); + ApkUtils.openPackage(mContext, "com.uiui.zy", "com.uiui.zy.activity.main.MainActivity"); ToastUtil.show("请激活设备后使用"); } return is_activation == 1; @@ -137,7 +137,7 @@ public class OpenApkUtils { ApkUtils.openPackage(mContext, packageName); sendRuningApp(packageName); } else { - ToastUtil.show("网课模式只允许使用指定应用"); + ToastUtil.show("专注模式只允许使用指定应用"); } } @@ -150,7 +150,7 @@ public class OpenApkUtils { ApkUtils.openPackage(mContext, packageName, className); sendRuningApp(packageName); } else { - ToastUtil.show("网课模式只允许使用指定应用"); + ToastUtil.show("专注模式只允许使用指定应用"); } } @@ -165,7 +165,7 @@ public class OpenApkUtils { sendRuningApp(packageName); } } else { - ToastUtil.show("网课模式只允许使用指定应用"); + ToastUtil.show("专注模式只允许使用指定应用"); } } @@ -180,7 +180,7 @@ public class OpenApkUtils { sendRuningApp(packageName); } } else { - ToastUtil.show("网课模式只允许使用指定应用"); + ToastUtil.show("专注模式只允许使用指定应用"); } } @@ -195,7 +195,7 @@ public class OpenApkUtils { sendRuningApp(packageName); } } else { - ToastUtil.show("网课模式只允许使用指定应用"); + ToastUtil.show("专注模式只允许使用指定应用"); } } @@ -210,7 +210,7 @@ public class OpenApkUtils { sendRuningApp(packageName); } } else { - ToastUtil.show("网课模式只允许使用指定应用"); + ToastUtil.show("专注模式只允许使用指定应用"); } } @@ -225,7 +225,7 @@ public class OpenApkUtils { sendRuningApp(packageName); } } else { - ToastUtil.show("网课模式只允许使用指定应用"); + ToastUtil.show("专注模式只允许使用指定应用"); } } @@ -240,7 +240,7 @@ public class OpenApkUtils { sendRuningApp(packageName); } } else { - ToastUtil.show("网课模式只允许使用指定应用"); + ToastUtil.show("专注模式只允许使用指定应用"); } } @@ -251,7 +251,7 @@ public class OpenApkUtils { if (isCloudLessonMod(packageName)) { openApp(packageName, className); } else { - ToastUtil.show("网课模式只允许使用指定应用"); + ToastUtil.show("专注模式只允许使用指定应用"); } } @@ -266,7 +266,7 @@ public class OpenApkUtils { sendRuningApp(packageName); } } else { - ToastUtil.show("网课模式只允许使用指定应用"); + ToastUtil.show("专注模式只允许使用指定应用"); } } @@ -281,7 +281,7 @@ public class OpenApkUtils { sendRuningApp(packageName); } } else { - ToastUtil.show("网课模式只允许使用指定应用"); + ToastUtil.show("专注模式只允许使用指定应用"); } } @@ -311,14 +311,14 @@ public class OpenApkUtils { if (!checkActivation()) { return; } - String packageName = JxwPackageConfig.JXW_LABORATORY_PACKAGE_NAME; - String className = JxwPackageConfig.JXW_writing_CLASS_NAME; + String packageName = JxwPackageConfig.JXW_WRITING_PACKAGE_NAME; + String className = JxwPackageConfig.JXW_WRITING_CLASS_NAME; if (isCloudLessonMod(packageName)) { if (openPackageWithArgs(packageName, className, "StartArgs", "小学")) { sendRuningApp(packageName); } } else { - ToastUtil.show("网课模式只允许使用指定应用"); + ToastUtil.show("专注模式只允许使用指定应用"); } } diff --git a/app/src/main/res/drawable-hdpi/com_uiui_sn.png b/app/src/main/res/drawable-hdpi/com_uiui_sn.png index d4d1d100280f22fd73661ae517a4365bc5b46c78..31703c49b16abbc77ea3ec22b320cae2fef7b5b0 100644 GIT binary patch delta 4471 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 @@ -134,7 +134,7 @@ android:id="@+id/tv_appname2" 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_icon2" diff --git a/app/src/main/res/layout-land/fragment_main.xml b/app/src/main/res/layout-land/fragment_main.xml index 47745cc..337781a 100644 --- a/app/src/main/res/layout-land/fragment_main.xml +++ b/app/src/main/res/layout-land/fragment_main.xml @@ -125,7 +125,7 @@ android:layout_marginEnd="@dimen/dp_4" android:adjustViewBounds="true" android:scaleType="centerCrop" - android:src="@drawable/com_android_clean" + android:src="@drawable/com_mediatek_filemanager" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -134,7 +134,7 @@ android:id="@+id/tv_appname2" 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_icon2" diff --git a/app/src/main/res/layout-sw800dp/activity_main.xml b/app/src/main/res/layout-sw800dp/activity_main.xml index b676c01..99cca7a 100644 --- a/app/src/main/res/layout-sw800dp/activity_main.xml +++ b/app/src/main/res/layout-sw800dp/activity_main.xml @@ -126,7 +126,7 @@ android:layout_marginEnd="@dimen/dp_4" android:adjustViewBounds="true" android:scaleType="centerCrop" - android:src="@drawable/com_android_clean" + android:src="@drawable/com_uiui_sn" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -135,7 +135,7 @@ android:id="@+id/tv_appname2" 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_icon2" diff --git a/app/src/main/res/layout/dialog_password.xml b/app/src/main/res/layout/dialog_password.xml index 670abe2..834640f 100644 --- a/app/src/main/res/layout/dialog_password.xml +++ b/app/src/main/res/layout/dialog_password.xml @@ -51,7 +51,7 @@ android:textSize="@dimen/sp_18" android:textStyle="bold" android:visibility="visible" - tools:text="退出关怀系统" /> + tools:text="退出智慧课堂" /> - 学习桌面 + 智慧课堂 隐私协议 服务协议和隐私政策 diff --git a/niceimageview/build.gradle b/niceimageview/build.gradle index c97f41b..1c7bcc9 100644 --- a/niceimageview/build.gradle +++ b/niceimageview/build.gradle @@ -11,6 +11,8 @@ android { } buildTypes { + iPlay50SEDebug{} + iPlay50SERelease{} debug {} release {} } diff --git a/settings.gradle b/settings.gradle index 447b7c2..7aa6ccd 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,2 @@ include ':app', ':niceimageview', ':FlycoTabLayoutZ_Lib' -rootProject.name='科大讯飞学习桌面' \ No newline at end of file +rootProject.name='科大讯飞智慧课堂' \ No newline at end of file