From 9cfe11cea5ff8ae4e20e7427046e36a386999ffa Mon Sep 17 00:00:00 2001 From: tongtongstudio Date: Sat, 10 Jan 2026 16:47:56 +0800 Subject: [PATCH] =?UTF-8?q?version:1.2.3=20fix:=E4=BF=AE=E5=A4=8D=E9=97=AA?= =?UTF-8?q?=E9=80=80=20update:?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PhotoPreview/build.gradle | 2 +- app/build.gradle | 6 +-- .../os/activity/login/LoginViewModel.java | 2 +- .../java/com/xwad/os/adapter/AppAdapter.java | 8 ++-- .../xwad/os/fragment/mine/MineFragment.java | 10 ++--- .../os/view/jxw/widget/DefaultAppsDialog.java | 4 +- .../main/res/layout/dialog_default_apps.xml | 2 +- app/src/main/res/layout/item_dialog_app.xml | 31 ++++---------- .../main/res/layout/item_dialog_app_force.xml | 41 +++++++++++++++++++ 9 files changed, 66 insertions(+), 40 deletions(-) create mode 100644 app/src/main/res/layout/item_dialog_app_force.xml diff --git a/PhotoPreview/build.gradle b/PhotoPreview/build.gradle index 1f65879..62e7b1b 100644 --- a/PhotoPreview/build.gradle +++ b/PhotoPreview/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'com.android.library' android { compileSdkVersion 29 defaultConfig { - minSdkVersion 24 + minSdkVersion 23 targetSdkVersion 29 versionCode 27 versionName "2.4.3" diff --git a/app/build.gradle b/app/build.gradle index d886167..8b41c97 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,11 +13,11 @@ android { defaultConfig { applicationId "com.xwad.os" - minSdkVersion 24 + minSdkVersion 23 targetSdkVersion 29 - versionCode 21 - versionName "1.2.0" + versionCode 24 + versionName "1.2.3" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/java/com/xwad/os/activity/login/LoginViewModel.java b/app/src/main/java/com/xwad/os/activity/login/LoginViewModel.java index b8e220f..fe89b12 100644 --- a/app/src/main/java/com/xwad/os/activity/login/LoginViewModel.java +++ b/app/src/main/java/com/xwad/os/activity/login/LoginViewModel.java @@ -93,7 +93,7 @@ public class LoginViewModel extends BaseViewModel { return; } + if (AppManager.ADD_NAME.equals(pkg)) { + mContext.startActivity(new Intent(mContext, PasswordActivity.class)); + return; + } + if (!ApkUtils.isAvailable(mContext, pkg)) { OpenApkUtils.getInstance().showDownloadDialog(mContext, pkg, lable); return; @@ -119,9 +124,6 @@ public class AppAdapter extends RecyclerView.Adapter { } switch (pkg) { - case AppManager.ADD_NAME: - mContext.startActivity(new Intent(mContext, PasswordActivity.class)); - break; case AppManager.UPDATE_NAME: Intent intent = new Intent(); ComponentName componentName = new ComponentName("com.uiui.zy", "com.uiui.zy.activity.update.UpdateActivity"); 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 8cc4298..688408a 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 @@ -372,12 +372,12 @@ public class MineFragment extends BaseMvvmFragment { public AppAdapter(List list) { - super(R.layout.item_dialog_app, list); + super(R.layout.item_dialog_app_force, list); } @Override @@ -134,7 +134,7 @@ public class DefaultAppsDialog extends Dialog { private List getDefaultApps() { List itemsBeans = new ArrayList<>(); - itemsBeans.add(new ItemsBean("icon_bbx_launcher", "", "com.jxw.launcher,com.jxw.launcher.DummyActivity,,,许可证校验", "许可证校验")); + itemsBeans.add(new ItemsBean("icon_bbx_yygx", "", "com.jxw.launcher,com.jxw.launcher.DummyActivity,,,许可证校验", "许可证校验")); itemsBeans.add(new ItemsBean("icon_bbx_xzzx", "", "com.jxw.download,com.jxw.download.main.ui.HomeActivity,,,下载中心", "下载中心")); itemsBeans.add(new ItemsBean("icon_bbx_player", "", "com.study.flashplayer,,,,Flash播放器", "Flash播放器")); return itemsBeans; diff --git a/app/src/main/res/layout/dialog_default_apps.xml b/app/src/main/res/layout/dialog_default_apps.xml index c070599..057a7d0 100644 --- a/app/src/main/res/layout/dialog_default_apps.xml +++ b/app/src/main/res/layout/dialog_default_apps.xml @@ -59,7 +59,7 @@ android:layout_marginBottom="8dp" android:maxLines="1" android:singleLine="true" - android:text="支付成功后，请先下载上述软件，保证系统正常运行。" + android:text="激活后，请先行安装必备组件，感谢您的支持" android:textColor="@color/red" android:textSize="12sp" /> diff --git a/app/src/main/res/layout/item_dialog_app.xml b/app/src/main/res/layout/item_dialog_app.xml index b410b8d..3705ffa 100644 --- a/app/src/main/res/layout/item_dialog_app.xml +++ b/app/src/main/res/layout/item_dialog_app.xml @@ -1,6 +1,5 @@ - @@ -9,33 +8,17 @@ android:id="@+id/iv_app_icon" android:layout_width="28dp" android:layout_height="28dp" - android:layout_marginTop="8dp" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> - - + android:layout_centerHorizontal="true" /> - \ No newline at end of file + android:textSize="9sp" /> + \ No newline at end of file diff --git a/app/src/main/res/layout/item_dialog_app_force.xml b/app/src/main/res/layout/item_dialog_app_force.xml new file mode 100644 index 0000000..b410b8d --- /dev/null +++ b/app/src/main/res/layout/item_dialog_app_force.xml @@ -0,0 +1,41 @@ + + + + + + + + + \ No newline at end of file