tt/Xuewang365OSNeutral
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

version:1.2.3

Browse Source 
fix:修复闪退
update:
This commit is contained in:
tongtongstudio
2026-01-10 16:47:56 +08:00
parent 6c28512c1a
commit 9cfe11cea5
9 changed files with 66 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PhotoPreview/build.gradle
View File

@@ -3,7 +3,7 @@ apply plugin: 'com.android.library'
android { android {
compileSdkVersion 29 compileSdkVersion 29
defaultConfig { defaultConfig {
minSdkVersion 24 minSdkVersion 23
targetSdkVersion 29 targetSdkVersion 29
versionCode 27 versionCode 27
versionName "2.4.3" versionName "2.4.3"

6
app/build.gradle
View File

@@ -13,11 +13,11 @@ android {
defaultConfig { defaultConfig {
applicationId "com.xwad.os" applicationId "com.xwad.os"
minSdkVersion 24 minSdkVersion 23
targetSdkVersion 29 targetSdkVersion 29
versionCode 21 versionCode 24
versionName "1.2.0" versionName "1.2.3"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

2
app/src/main/java/com/xwad/os/activity/login/LoginViewModel.java
View File

@@ -93,7 +93,7 @@ public class LoginViewModel extends BaseViewModel<ActivityLoginBinding, Activity
mLoginInfoData.setValue(loginInfo); mLoginInfoData.setValue(loginInfo);
} else { } else {
mMMKV.encode(CommonConfig.ACCOUNT_LOGIN_STATU, 0); mMMKV.encode(CommonConfig.ACCOUNT_LOGIN_STATU, 0);
Toaster.show(baseResponse.msg); Toaster.show("登录失败，请重试");
} }
} }

8
app/src/main/java/com/xwad/os/adapter/AppAdapter.java
View File

@@ -99,6 +99,11 @@ public class AppAdapter extends RecyclerView.Adapter<AppAdapter.AppHolder> {
return; return;
} }
if (AppManager.ADD_NAME.equals(pkg)) {
mContext.startActivity(new Intent(mContext, PasswordActivity.class));
return;
}
if (!ApkUtils.isAvailable(mContext, pkg)) { if (!ApkUtils.isAvailable(mContext, pkg)) {
OpenApkUtils.getInstance().showDownloadDialog(mContext, pkg, lable); OpenApkUtils.getInstance().showDownloadDialog(mContext, pkg, lable);
return; return;
@@ -119,9 +124,6 @@ public class AppAdapter extends RecyclerView.Adapter<AppAdapter.AppHolder> {
} }
switch (pkg) { switch (pkg) {
case AppManager.ADD_NAME:
mContext.startActivity(new Intent(mContext, PasswordActivity.class));
break;
case AppManager.UPDATE_NAME: case AppManager.UPDATE_NAME:
Intent intent = new Intent(); Intent intent = new Intent();
ComponentName componentName = new ComponentName("com.uiui.zy", "com.uiui.zy.activity.update.UpdateActivity"); ComponentName componentName = new ComponentName("com.uiui.zy", "com.uiui.zy.activity.update.UpdateActivity");

10
app/src/main/java/com/xwad/os/fragment/mine/MineFragment.java
View File

@@ -372,12 +372,12 @@ public class MineFragment extends BaseMvvmFragment<MineViewModel, FragmentMineBi
} }
public void register(View view) { public void register(View view) {
boolean regist_success = mMMKV.decodeBool(MainService.JXW_REGISTER_SUCCESS, false); // boolean regist_success = mMMKV.decodeBool(MainService.JXW_REGISTER_SUCCESS, false);
if (regist_success) { // if (regist_success) {
startActivity(new Intent(mContext, LoginSuccessfulActivity.class)); // startActivity(new Intent(mContext, LoginSuccessfulActivity.class));
} else { // } else {
OpenApkUtils.getInstance().openJxwAppWithParam(mContext, (String) view.getTag(), true); OpenApkUtils.getInstance().openJxwAppWithParam(mContext, (String) view.getTag(), true);
} // }
} }
} }

4
app/src/main/java/com/xwad/os/view/jxw/widget/DefaultAppsDialog.java
View File

@@ -85,7 +85,7 @@ public class DefaultAppsDialog extends Dialog {
public class AppAdapter extends BaseQuickAdapter<ItemsBean, BaseViewHolder> { public class AppAdapter extends BaseQuickAdapter<ItemsBean, BaseViewHolder> {
public AppAdapter(List<ItemsBean> list) { public AppAdapter(List<ItemsBean> list) {
super(R.layout.item_dialog_app, list); super(R.layout.item_dialog_app_force, list);
} }
@Override @Override
@@ -134,7 +134,7 @@ public class DefaultAppsDialog extends Dialog {
private List<ItemsBean> getDefaultApps() { private List<ItemsBean> getDefaultApps() {
List<ItemsBean> itemsBeans = new ArrayList<>(); List<ItemsBean> 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_xzzx", "", "com.jxw.download,com.jxw.download.main.ui.HomeActivity,,,下载中心", "下载中心"));
itemsBeans.add(new ItemsBean("icon_bbx_player", "", "com.study.flashplayer,,,,Flash播放器", "Flash播放器")); itemsBeans.add(new ItemsBean("icon_bbx_player", "", "com.study.flashplayer,,,,Flash播放器", "Flash播放器"));
return itemsBeans; return itemsBeans;

2
app/src/main/res/layout/dialog_default_apps.xml
View File

@@ -59,7 +59,7 @@
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:maxLines="1" android:maxLines="1"
android:singleLine="true" android:singleLine="true"
android:text="支付成功后，请先下载上述软件，保证系统正常运行。" android:text="激活后，请先行安装必备组件，感谢您的支持"
android:textColor="@color/red" android:textColor="@color/red"
android:textSize="12sp" /> android:textSize="12sp" />
</LinearLayout> </LinearLayout>

31
app/src/main/res/layout/item_dialog_app.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/rl_root" android:id="@+id/rl_root"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="69dp"> android:layout_height="69dp">
@@ -9,33 +8,17 @@
android:id="@+id/iv_app_icon" android:id="@+id/iv_app_icon"
android:layout_width="28dp" android:layout_width="28dp"
android:layout_height="28dp" android:layout_height="28dp"
android:layout_marginTop="8dp" android:layout_centerHorizontal="true" />
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/iv_download"
android:layout_width="14dp"
android:layout_height="14dp"
android:layout_marginTop="20dp"
android:layout_marginStart="20dp"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
android:src="@drawable/ic_download"
app:layout_constraintStart_toStartOf="@+id/iv_app_icon"
app:layout_constraintTop_toTopOf="@+id/iv_app_icon" />
<TextView <TextView
android:id="@+id/tv_app_name" android:id="@+id/tv_app_name"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/iv_app_icon"
android:layout_centerHorizontal="true"
android:layout_marginTop="5dp"
android:gravity="center" android:gravity="center"
android:text="当前壁纸" android:text="当前壁纸"
android:textColor="#333333" android:textColor="#333333"
android:textSize="9sp" android:textSize="9sp" />
app:layout_constraintBottom_toBottomOf="parent" </RelativeLayout>
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/iv_app_icon" />
</androidx.constraintlayout.widget.ConstraintLayout>

41
app/src/main/res/layout/item_dialog_app_force.xml Normal file
View File

@@ -0,0 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/rl_root"
android:layout_width="match_parent"
android:layout_height="69dp">
<ImageView
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" />
<ImageView
android:id="@+id/iv_download"
android:layout_width="14dp"
android:layout_height="14dp"
android:layout_marginTop="20dp"
android:layout_marginStart="20dp"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
android:src="@drawable/ic_download"
app:layout_constraintStart_toStartOf="@+id/iv_app_icon"
app:layout_constraintTop_toTopOf="@+id/iv_app_icon" />
<TextView
android:id="@+id/tv_app_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="当前壁纸"
android:textColor="#333333"
android:textSize="9sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/iv_app_icon" />
</androidx.constraintlayout.widget.ConstraintLayout>