diff --git a/app/build.gradle b/app/build.gradle index 919afe4..f96dd46 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,8 +16,8 @@ android { minSdkVersion 24 targetSdkVersion 29 - versionCode 5 - versionName "1.0.4" + versionCode 6 + versionName "1.0.5" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/java/com/xwad/os/activity/home/HomeActivity.java b/app/src/main/java/com/xwad/os/activity/home/HomeActivity.java index 07cfad6..7378d9f 100644 --- a/app/src/main/java/com/xwad/os/activity/home/HomeActivity.java +++ b/app/src/main/java/com/xwad/os/activity/home/HomeActivity.java @@ -17,6 +17,7 @@ import android.view.KeyEvent; import android.view.View; import android.view.animation.Animation; import android.view.animation.TranslateAnimation; +import android.widget.RelativeLayout; import android.widget.Toast; import androidx.annotation.NonNull; @@ -52,6 +53,7 @@ import com.xwad.os.jxw.JxwPackageConfig; import com.xwad.os.jxw.SPUtils; import com.xwad.os.jxw.StudyRecordAPKInfo; import com.xwad.os.jxw.TabAdapter; +import com.xwad.os.jxw.event.UpdateColorEvent; import com.xwad.os.jxw.util.Util; import com.xwad.os.jxw.event.UpdateGradeEvent; import com.xwad.os.jxw.fragment.SztzFragment; @@ -109,6 +111,8 @@ public class HomeActivity extends BaseMvvmActivity arrayList = new ArrayList() {{ +// this.add(R.drawable.icon_bz_0); +// this.add(R.drawable.icon_bz_1); +// this.add(R.drawable.icon_bz_2); +// this.add(R.drawable.icon_bz_3); +// this.add(R.drawable.icon_bz_4); +// this.add(R.drawable.icon_bz_5); +// this.add(R.drawable.icon_bz_6); +// this.add(R.drawable.icon_bz_7); +// this.add(R.drawable.icon_bz_8); +// }}; + mViewDataBinding.llMain.setBackgroundResource(getResources().getIdentifier("img_home_bg_" + SPUtils.getInt(this, "themenBg", 0), "drawable", getPackageName())); + + } + private void initDatas() { Log.e(TAG, "initDatas: "); mViewDataBinding.tvTime.setText(DataUtil.formatDateHour()); @@ -210,7 +235,7 @@ public class HomeActivity extends BaseMvvmActivity { + if (b) setJuniorHighSchool(compoundButton); + }); + mViewDataBinding.radioButton7.setOnCheckedChangeListener((compoundButton, b) -> { if (b) setJuniorHighSchool(compoundButton); }); diff --git a/app/src/main/java/com/xwad/os/fragment/mine/MineFragment.java b/app/src/main/java/com/xwad/os/fragment/mine/MineFragment.java index 4248ac1..8fcb049 100644 --- a/app/src/main/java/com/xwad/os/fragment/mine/MineFragment.java +++ b/app/src/main/java/com/xwad/os/fragment/mine/MineFragment.java @@ -1,12 +1,16 @@ package com.xwad.os.fragment.mine; import android.app.Activity; +import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; +import android.content.pm.ResolveInfo; +import android.os.Build; import android.os.Bundle; import android.os.Handler; +import android.provider.Settings; import android.text.TextUtils; import android.util.Log; import android.view.View; @@ -15,6 +19,7 @@ import androidx.fragment.app.Fragment; import androidx.recyclerview.widget.GridLayoutManager; import com.chad.library.adapter.base.BaseQuickAdapter; +import com.xwad.os.BuildConfig; import com.xwad.os.R; import com.xwad.os.activity.activation.ActivationActivity; import com.xwad.os.activity.home.HomeActivity; @@ -44,6 +49,9 @@ import java.io.FileReader; import java.io.IOException; import java.util.ArrayList; import java.util.List; +import java.util.function.Function; +import java.util.function.Predicate; +import java.util.stream.Collectors; /** * A simple {@link Fragment} subclass. @@ -326,6 +334,30 @@ public class MineFragment extends BaseMvvmFragment getAllLauncherApps(Context context) { + PackageManager packageManager = context.getPackageManager(); + + // 构建用于查询桌面应用的Intent + Intent intent = new Intent(Intent.ACTION_MAIN); + intent.addCategory(Intent.CATEGORY_HOME); + + // 查询所有可以处理该Intent的Activity + List resolveInfoList = packageManager.queryIntentActivities(intent, PackageManager.MATCH_ALL); + + List launcherPackageList = resolveInfoList.stream().filter(new Predicate() { + @Override + public boolean test(ResolveInfo resolveInfo) { + return !BuildConfig.APPLICATION_ID.equals(resolveInfo.activityInfo.packageName); + } + }).map(new Function() { + @Override + public ComponentName apply(ResolveInfo resolveInfo) { + return resolveInfo.getComponentInfo().getComponentName(); + } + }).collect(Collectors.toList()); + + return launcherPackageList; + } public class BtnClick { public void toLigin(View view) { @@ -342,5 +374,24 @@ public class MineFragment extends BaseMvvmFragment= Build.VERSION_CODES.LOLLIPOP) { + mContext.finishAndRemoveTask(); + } else { + mContext.finishAffinity(); + } + android.os.Process.killProcess(android.os.Process.myPid()); + System.exit(0); + +// OpenApkUtils.getInstance().openJxwApp(mContext, "com.hihonor.android.launcher,com.hihonor.android.launcher.unihome.UniHomeLauncher,,,退出桌面"); + } } } diff --git a/app/src/main/java/com/xwad/os/fragment/read/ReadFragment.java b/app/src/main/java/com/xwad/os/fragment/read/ReadFragment.java index 2d0326a..8990f48 100644 --- a/app/src/main/java/com/xwad/os/fragment/read/ReadFragment.java +++ b/app/src/main/java/com/xwad/os/fragment/read/ReadFragment.java @@ -108,7 +108,7 @@ public class ReadFragment extends BaseMvvmFragment appList = new ArrayList(); + List appList = new ArrayList<>(); @Override public void initListener() { diff --git a/app/src/main/java/com/xwad/os/utils/OpenApkUtils.java b/app/src/main/java/com/xwad/os/utils/OpenApkUtils.java index af6c643..06e3680 100644 --- a/app/src/main/java/com/xwad/os/utils/OpenApkUtils.java +++ b/app/src/main/java/com/xwad/os/utils/OpenApkUtils.java @@ -653,7 +653,7 @@ public class OpenApkUtils { * * @param paramStr 参数字符串(格式:包名,类名,extra参数,第四项,第五项) */ - public void openJxwApp(Activity context, String paramStr) { + public void openJxwApp(Activity activity, String paramStr) { if (TextUtils.isEmpty(paramStr)) { Log.e(TAG, "context为空或参数字符串为空"); return; @@ -677,7 +677,7 @@ public class OpenApkUtils { + "\n第四项:" + fourthParam + "\n应用名:" + appName); if (!ApkUtils.isAvailable(mContext, packageName)) { - showDownloadDialog(context, packageName, appName); + showDownloadDialog(activity, packageName, appName); return; } @@ -711,10 +711,11 @@ public class OpenApkUtils { // 4. 启动Activity(处理异常) try { - context.startActivity(intent); + activity.startActivity(intent); } catch (Exception e) { if (e instanceof android.content.ActivityNotFoundException) { Log.e(TAG, "未找到目标Activity:" + packageName + "/" + className); + Toaster.show("打开失败,请升级应用到最新版本"); } else if (e instanceof SecurityException) { Log.e(TAG, "启动Activity权限不足"); } else { @@ -773,7 +774,7 @@ public class OpenApkUtils { public void showDownloadDialog(Activity context, String pkg, String appName) { Dialog dialog = new Dialog(context, R.style.ActionSheet); Window window = dialog.getWindow(); - View inflate = ((LayoutInflater) context.getSystemService("layout_inflater")).inflate(R.layout.download_dialog, (ViewGroup) null); + View inflate = ((LayoutInflater) context.getSystemService("layout_inflater")).inflate(R.layout.download_dialog, null); TextView textView = inflate.findViewById(R.id.download_cancel); TextView textView2 = inflate.findViewById(R.id.tag_title); if (!TextUtils.isEmpty(appName)) { diff --git a/app/src/main/res/drawable-hdpi/applet_qrcode.png b/app/src/main/res/drawable-hdpi/applet_qrcode.png index d8d6b29..e65df6c 100644 Binary files a/app/src/main/res/drawable-hdpi/applet_qrcode.png and b/app/src/main/res/drawable-hdpi/applet_qrcode.png differ diff --git a/app/src/main/res/drawable-hdpi/wechat_bind_process.png b/app/src/main/res/drawable-hdpi/wechat_bind_process.png index c66c396..c070c0b 100644 Binary files a/app/src/main/res/drawable-hdpi/wechat_bind_process.png and b/app/src/main/res/drawable-hdpi/wechat_bind_process.png differ diff --git a/app/src/main/res/drawable-nodpi/icon_ai_aizjx.png b/app/src/main/res/drawable-nodpi/icon_ai_aizjx.png index 60768f9..a7b8daf 100644 Binary files a/app/src/main/res/drawable-nodpi/icon_ai_aizjx.png and b/app/src/main/res/drawable-nodpi/icon_ai_aizjx.png differ diff --git a/app/src/main/res/drawable-nodpi/icon_bbx_arzd.png b/app/src/main/res/drawable-nodpi/icon_bbx_arzd.png new file mode 100644 index 0000000..bb3953d Binary files /dev/null and b/app/src/main/res/drawable-nodpi/icon_bbx_arzd.png differ diff --git a/app/src/main/res/drawable-nodpi/icon_bbx_jzgk_home.png b/app/src/main/res/drawable-nodpi/icon_bbx_jzgk_home.png new file mode 100644 index 0000000..52b4628 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/icon_bbx_jzgk_home.png differ diff --git a/app/src/main/res/drawable-nodpi/icon_ddyfz_jpkc.png b/app/src/main/res/drawable-nodpi/icon_ddyfz_jpkc.png index f4d6425..2e94913 100644 Binary files a/app/src/main/res/drawable-nodpi/icon_ddyfz_jpkc.png and b/app/src/main/res/drawable-nodpi/icon_ddyfz_jpkc.png differ diff --git a/app/src/main/res/drawable-nodpi/icon_ds_yxzq.png b/app/src/main/res/drawable-nodpi/icon_ds_yxzq.png index f487b71..f8862f4 100644 Binary files a/app/src/main/res/drawable-nodpi/icon_ds_yxzq.png and b/app/src/main/res/drawable-nodpi/icon_ds_yxzq.png differ diff --git a/app/src/main/res/drawable-nodpi/icon_hx_jpkc.png b/app/src/main/res/drawable-nodpi/icon_hx_jpkc.png index c325b05..e158763 100644 Binary files a/app/src/main/res/drawable-nodpi/icon_hx_jpkc.png and b/app/src/main/res/drawable-nodpi/icon_hx_jpkc.png differ diff --git a/app/src/main/res/drawable-nodpi/icon_hx_zxts.png b/app/src/main/res/drawable-nodpi/icon_hx_zxts.png index 7c7f8a4..07805c4 100644 Binary files a/app/src/main/res/drawable-nodpi/icon_hx_zxts.png and b/app/src/main/res/drawable-nodpi/icon_hx_zxts.png differ diff --git a/app/src/main/res/drawable-nodpi/icon_kx_jpkc.png b/app/src/main/res/drawable-nodpi/icon_kx_jpkc.png index 2335e49..1bb6305 100644 Binary files a/app/src/main/res/drawable-nodpi/icon_kx_jpkc.png and b/app/src/main/res/drawable-nodpi/icon_kx_jpkc.png differ diff --git a/app/src/main/res/drawable-nodpi/icon_ls_jpkc.png b/app/src/main/res/drawable-nodpi/icon_ls_jpkc.png index 4305239..e170eee 100644 Binary files a/app/src/main/res/drawable-nodpi/icon_ls_jpkc.png and b/app/src/main/res/drawable-nodpi/icon_ls_jpkc.png differ diff --git a/app/src/main/res/drawable-nodpi/icon_read_suhb.png b/app/src/main/res/drawable-nodpi/icon_read_suhb.png new file mode 100644 index 0000000..25003bf Binary files /dev/null and b/app/src/main/res/drawable-nodpi/icon_read_suhb.png differ diff --git a/app/src/main/res/drawable-nodpi/icon_sw_jpkc.png b/app/src/main/res/drawable-nodpi/icon_sw_jpkc.png index 765b08b..0fc9738 100644 Binary files a/app/src/main/res/drawable-nodpi/icon_sw_jpkc.png and b/app/src/main/res/drawable-nodpi/icon_sw_jpkc.png differ diff --git a/app/src/main/res/drawable-nodpi/icon_sw_zxts.png b/app/src/main/res/drawable-nodpi/icon_sw_zxts.png index 9694637..47afba7 100644 Binary files a/app/src/main/res/drawable-nodpi/icon_sw_zxts.png and b/app/src/main/res/drawable-nodpi/icon_sw_zxts.png differ diff --git a/app/src/main/res/drawable-nodpi/icon_sx_jpkc.png b/app/src/main/res/drawable-nodpi/icon_sx_jpkc.png index ad614a1..c64a881 100644 Binary files a/app/src/main/res/drawable-nodpi/icon_sx_jpkc.png and b/app/src/main/res/drawable-nodpi/icon_sx_jpkc.png differ diff --git a/app/src/main/res/drawable-nodpi/icon_sx_tbfd_bg.png b/app/src/main/res/drawable-nodpi/icon_sx_tbfd_bg.png index f595f78..501feb2 100644 Binary files a/app/src/main/res/drawable-nodpi/icon_sx_tbfd_bg.png and b/app/src/main/res/drawable-nodpi/icon_sx_tbfd_bg.png differ diff --git a/app/src/main/res/drawable-nodpi/icon_sx_zxts.png b/app/src/main/res/drawable-nodpi/icon_sx_zxts.png index f5cbcdd..140221e 100644 Binary files a/app/src/main/res/drawable-nodpi/icon_sx_zxts.png and b/app/src/main/res/drawable-nodpi/icon_sx_zxts.png differ diff --git a/app/src/main/res/drawable-nodpi/icon_syk_hbdh.png b/app/src/main/res/drawable-nodpi/icon_syk_hbdh.png index c20789d..61579d1 100644 Binary files a/app/src/main/res/drawable-nodpi/icon_syk_hbdh.png and b/app/src/main/res/drawable-nodpi/icon_syk_hbdh.png differ diff --git a/app/src/main/res/drawable-nodpi/icon_syk_kpbk.png b/app/src/main/res/drawable-nodpi/icon_syk_kpbk.png index ae9e02c..ef278a6 100644 Binary files a/app/src/main/res/drawable-nodpi/icon_syk_kpbk.png and b/app/src/main/res/drawable-nodpi/icon_syk_kpbk.png differ diff --git a/app/src/main/res/drawable-nodpi/icon_syk_kxsys.png b/app/src/main/res/drawable-nodpi/icon_syk_kxsys.png index 7edfee6..c65e903 100644 Binary files a/app/src/main/res/drawable-nodpi/icon_syk_kxsys.png and b/app/src/main/res/drawable-nodpi/icon_syk_kxsys.png differ diff --git a/app/src/main/res/drawable-nodpi/icon_syk_lswh.png b/app/src/main/res/drawable-nodpi/icon_syk_lswh.png index a5f0a5e..e81215f 100644 Binary files a/app/src/main/res/drawable-nodpi/icon_syk_lswh.png and b/app/src/main/res/drawable-nodpi/icon_syk_lswh.png differ diff --git a/app/src/main/res/drawable-nodpi/icon_syk_ms.png b/app/src/main/res/drawable-nodpi/icon_syk_ms.png index 1e455e6..04582e8 100644 Binary files a/app/src/main/res/drawable-nodpi/icon_syk_ms.png and b/app/src/main/res/drawable-nodpi/icon_syk_ms.png differ diff --git a/app/src/main/res/drawable-nodpi/icon_syk_sf.png b/app/src/main/res/drawable-nodpi/icon_syk_sf.png index 3869768..7fe5df0 100644 Binary files a/app/src/main/res/drawable-nodpi/icon_syk_sf.png and b/app/src/main/res/drawable-nodpi/icon_syk_sf.png differ diff --git a/app/src/main/res/drawable-nodpi/icon_tab_app.png b/app/src/main/res/drawable-nodpi/icon_tab_app.png new file mode 100644 index 0000000..14841f3 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/icon_tab_app.png differ diff --git a/app/src/main/res/drawable-nodpi/icon_wd_cr.png b/app/src/main/res/drawable-nodpi/icon_wd_cr.png new file mode 100644 index 0000000..e6fd538 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/icon_wd_cr.png differ diff --git a/app/src/main/res/drawable-nodpi/icon_wl_aijdc.png b/app/src/main/res/drawable-nodpi/icon_wl_aijdc.png index bb3dcd9..007909a 100644 Binary files a/app/src/main/res/drawable-nodpi/icon_wl_aijdc.png and b/app/src/main/res/drawable-nodpi/icon_wl_aijdc.png differ diff --git a/app/src/main/res/drawable-nodpi/icon_wl_jpkc.png b/app/src/main/res/drawable-nodpi/icon_wl_jpkc.png index d318f4f..9b1a5ef 100644 Binary files a/app/src/main/res/drawable-nodpi/icon_wl_jpkc.png and b/app/src/main/res/drawable-nodpi/icon_wl_jpkc.png differ diff --git a/app/src/main/res/drawable-nodpi/icon_wl_zxts.png b/app/src/main/res/drawable-nodpi/icon_wl_zxts.png index 30e88c7..036fadd 100644 Binary files a/app/src/main/res/drawable-nodpi/icon_wl_zxts.png and b/app/src/main/res/drawable-nodpi/icon_wl_zxts.png differ diff --git a/app/src/main/res/drawable-nodpi/icon_xk_ddyfz_bg.png b/app/src/main/res/drawable-nodpi/icon_xk_ddyfz_bg.png index 280bee0..9e2828e 100644 Binary files a/app/src/main/res/drawable-nodpi/icon_xk_ddyfz_bg.png and b/app/src/main/res/drawable-nodpi/icon_xk_ddyfz_bg.png differ diff --git a/app/src/main/res/drawable-nodpi/icon_xk_ddyfz_tbfd.png b/app/src/main/res/drawable-nodpi/icon_xk_ddyfz_tbfd.png index 9a232a9..c31a7d6 100644 Binary files a/app/src/main/res/drawable-nodpi/icon_xk_ddyfz_tbfd.png and b/app/src/main/res/drawable-nodpi/icon_xk_ddyfz_tbfd.png differ diff --git a/app/src/main/res/drawable-nodpi/icon_xk_ddyfz_tbsp.png b/app/src/main/res/drawable-nodpi/icon_xk_ddyfz_tbsp.png index ed9a541..bbd804f 100644 Binary files a/app/src/main/res/drawable-nodpi/icon_xk_ddyfz_tbsp.png and b/app/src/main/res/drawable-nodpi/icon_xk_ddyfz_tbsp.png differ diff --git a/app/src/main/res/drawable-nodpi/icon_xk_hx_tbfd.png b/app/src/main/res/drawable-nodpi/icon_xk_hx_tbfd.png index 6d2bdca..98b1f75 100644 Binary files a/app/src/main/res/drawable-nodpi/icon_xk_hx_tbfd.png and b/app/src/main/res/drawable-nodpi/icon_xk_hx_tbfd.png differ diff --git a/app/src/main/res/drawable-nodpi/icon_xk_kx_bg.png b/app/src/main/res/drawable-nodpi/icon_xk_kx_bg.png index bb49c79..23d430c 100644 Binary files a/app/src/main/res/drawable-nodpi/icon_xk_kx_bg.png and b/app/src/main/res/drawable-nodpi/icon_xk_kx_bg.png differ diff --git a/app/src/main/res/drawable-nodpi/icon_xk_kx_mlkxxsy.png b/app/src/main/res/drawable-nodpi/icon_xk_kx_mlkxxsy.png index 1594d16..fbbbac3 100644 Binary files a/app/src/main/res/drawable-nodpi/icon_xk_kx_mlkxxsy.png and b/app/src/main/res/drawable-nodpi/icon_xk_kx_mlkxxsy.png differ diff --git a/app/src/main/res/drawable-nodpi/icon_xk_kx_tbfd.png b/app/src/main/res/drawable-nodpi/icon_xk_kx_tbfd.png index e4522c4..04ca5df 100644 Binary files a/app/src/main/res/drawable-nodpi/icon_xk_kx_tbfd.png and b/app/src/main/res/drawable-nodpi/icon_xk_kx_tbfd.png differ diff --git a/app/src/main/res/drawable-nodpi/icon_xk_kx_tbfd_1.png b/app/src/main/res/drawable-nodpi/icon_xk_kx_tbfd_1.png index 3dae506..9cf0eec 100644 Binary files a/app/src/main/res/drawable-nodpi/icon_xk_kx_tbfd_1.png and b/app/src/main/res/drawable-nodpi/icon_xk_kx_tbfd_1.png differ diff --git a/app/src/main/res/drawable-nodpi/icon_xk_kx_tbsp.png b/app/src/main/res/drawable-nodpi/icon_xk_kx_tbsp.png index bd92d28..229a81a 100644 Binary files a/app/src/main/res/drawable-nodpi/icon_xk_kx_tbsp.png and b/app/src/main/res/drawable-nodpi/icon_xk_kx_tbsp.png differ diff --git a/app/src/main/res/drawable-nodpi/icon_xk_sw_tbfd.png b/app/src/main/res/drawable-nodpi/icon_xk_sw_tbfd.png index 8f94432..705f6af 100644 Binary files a/app/src/main/res/drawable-nodpi/icon_xk_sw_tbfd.png and b/app/src/main/res/drawable-nodpi/icon_xk_sw_tbfd.png differ diff --git a/app/src/main/res/drawable-nodpi/icon_xk_tab_bg.png b/app/src/main/res/drawable-nodpi/icon_xk_tab_bg.png index 4aae51d..4d0d030 100644 Binary files a/app/src/main/res/drawable-nodpi/icon_xk_tab_bg.png and b/app/src/main/res/drawable-nodpi/icon_xk_tab_bg.png differ diff --git a/app/src/main/res/drawable-nodpi/icon_xk_wl_khl.png b/app/src/main/res/drawable-nodpi/icon_xk_wl_khl.png index e59c329..11316d2 100644 Binary files a/app/src/main/res/drawable-nodpi/icon_xk_wl_khl.png and b/app/src/main/res/drawable-nodpi/icon_xk_wl_khl.png differ diff --git a/app/src/main/res/drawable-nodpi/icon_xk_wl_tbfd.png b/app/src/main/res/drawable-nodpi/icon_xk_wl_tbfd.png index c2e96da..a32c701 100644 Binary files a/app/src/main/res/drawable-nodpi/icon_xk_wl_tbfd.png and b/app/src/main/res/drawable-nodpi/icon_xk_wl_tbfd.png differ diff --git a/app/src/main/res/drawable-nodpi/icon_xk_zz_tbfd.png b/app/src/main/res/drawable-nodpi/icon_xk_zz_tbfd.png index 254f6bb..9ed3e3b 100644 Binary files a/app/src/main/res/drawable-nodpi/icon_xk_zz_tbfd.png and b/app/src/main/res/drawable-nodpi/icon_xk_zz_tbfd.png differ diff --git a/app/src/main/res/drawable-nodpi/icon_yw_jpkc.png b/app/src/main/res/drawable-nodpi/icon_yw_jpkc.png index a2d683c..b41ec49 100644 Binary files a/app/src/main/res/drawable-nodpi/icon_yw_jpkc.png and b/app/src/main/res/drawable-nodpi/icon_yw_jpkc.png differ diff --git a/app/src/main/res/drawable-nodpi/icon_yw_tbfd_bg.png b/app/src/main/res/drawable-nodpi/icon_yw_tbfd_bg.png index 35a2f67..ad9e1f0 100644 Binary files a/app/src/main/res/drawable-nodpi/icon_yw_tbfd_bg.png and b/app/src/main/res/drawable-nodpi/icon_yw_tbfd_bg.png differ diff --git a/app/src/main/res/drawable-nodpi/icon_yw_zxts.png b/app/src/main/res/drawable-nodpi/icon_yw_zxts.png index 336a62e..70b25b4 100644 Binary files a/app/src/main/res/drawable-nodpi/icon_yw_zxts.png and b/app/src/main/res/drawable-nodpi/icon_yw_zxts.png differ diff --git a/app/src/main/res/layout/activity_selecte_grade.xml b/app/src/main/res/layout/activity_selecte_grade.xml index affc31c..0c3a8a1 100644 --- a/app/src/main/res/layout/activity_selecte_grade.xml +++ b/app/src/main/res/layout/activity_selecte_grade.xml @@ -185,11 +185,24 @@ app:layout_constraintStart_toEndOf="@+id/tv_city" app:layout_constraintTop_toTopOf="parent"> + + + android:background="@drawable/icon_wd_cr" /> + + + + + + + + + + + + + + + + + + + + + + + + @@ -180,13 +180,25 @@ android:layout_marginTop="5dp" /> + + + android:orientation="vertical" + android:visibility="gone"> + diff --git a/app/src/main/res/values/string_jxw.xml b/app/src/main/res/values/string_jxw.xml index a213272..5bf3660 100644 --- a/app/src/main/res/values/string_jxw.xml +++ b/app/src/main/res/values/string_jxw.xml @@ -586,6 +586,7 @@ com.jxwgb.zhtsg,com.jxw.home.ui.activitys.BookDetailActivity,int:jump_type:1#int:book_id:1402,,智慧图书馆 com.jxwgb.zhtsg,com.jxw.home.ui.activitys.BookDetailActivity,int:jump_type:1#int:book_id:1416,,智慧图书馆 com.jxwgb.zhtsg,com.jxw.home.ui.activitys.BookDetailActivity,int:jump_type:1#int:book_id:810,,智慧图书馆 + com.jxw.yyhb,com.jxw.yyhb.ui.activity.MainActivity,,,双语绘本 com.jxwgb.zhtsg,com.jxw.home.ui.activitys.BookDetailActivity,int:jump_type:1#int:book_id:1410,,智慧图书馆 com.jxwgb.zhtsg,com.jxw.home.ui.MainActivity,int:home_tab:0#int:jump_type:1,,智慧图书馆 com.jxwgb.zhtsg,com.jxw.home.ui.activitys.BookDetailActivity,int:jump_type:1#int:book_id:936,,智慧图书馆 @@ -651,6 +652,7 @@ com.eduyun.app.factory.ykt,com.nd.smartcan.appfactory.demo.SplashActivity,,,国家中小学智慧教育平台 com.baidu.homework,com.baidu.homework.activity.init.InitActivity,,,作业帮 com.tech.translate,com.tech.translate.MainActivity,,,中英互译 + com.jxw.huiben,com.jxw.huiben.activity.SplashActivity,keben,,AR指读 com.jxw.souti,com.jxw.souti.ui.activity.LoadingActivity,int:searchType:2,,作业批改 com.jxw.souti,com.jxw.souti.ui.activity.LoadingActivity,int:searchType:2,,作业批改 uni.UNIEEABC32,io.dcloud.PandoraEntry,,,巧解题