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

style: 提示文字修改

Browse Source
This commit is contained in:
tongtongstudio
2026-06-12 18:09:52 +08:00
parent 36cf37920a
commit 58ddea018c
16 changed files with 83 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@@ -17,8 +17,8 @@ android {
minSdkVersion 23
targetSdkVersion 29
versionCode 41
versionName "1.4.0"
versionCode 43
versionName "1.4.2"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

32
app/src/main/java/com/xwad/os/activity/download/DownloadActivity.java
View File

@@ -25,6 +25,7 @@ import com.xwad.os.databinding.ActivityDownloadBinding;
import com.xwad.os.utils.ActivationUtil;
import com.xwad.os.utils.ApkUtils;
import com.xwad.os.utils.FileUtils;
import com.xwad.os.utils.OpenApkUtils;
import java.util.List;
import java.util.function.Consumer;
@@ -34,6 +35,8 @@ public class DownloadActivity extends BaseMvvmActivity<DownloadViewModel, Activi
private AppInfoAdapter mAppInfoAdapter;
private List<AppInfo> mAppInfos;
private boolean mAutoClose = false;
private String mParamString;
@Override
protected int getLayoutId() {
@@ -64,21 +67,34 @@ public class DownloadActivity extends BaseMvvmActivity<DownloadViewModel, Activi
@Override
protected void initData() {
Intent intent = getIntent();
mAutoClose = intent.getBooleanExtra("auto_close", false);
mParamString = intent.getStringExtra("param");
mViewModel.mListMutableLiveData.observe(this, new Observer<List<AppInfo>>() {
@Override
public void onChanged(List<AppInfo> appInfos) {
mAppInfos = appInfos;
mAppInfoAdapter.setAppInfos(appInfos);
if (appInfos == null || appInfos.isEmpty()) {
mViewDataBinding.clContent.setVisibility(View.GONE);
mViewDataBinding.llNodata.setVisibility(View.VISIBLE);
if (mAutoClose) {
if (OpenApkUtils.getInstance().checkEssentialAppAllInstall()) {
OpenApkUtils.getInstance().openJxwAppWithParam(DownloadActivity.this, mParamString, false);
finish();
} else {
Toaster.show("请先安装必备组件");
}
} else {
mViewDataBinding.clContent.setVisibility(View.VISIBLE);
mViewDataBinding.llNodata.setVisibility(View.GONE);
mAppInfos = appInfos;
mAppInfoAdapter.setAppInfos(appInfos);
if (appInfos == null || appInfos.isEmpty()) {
mViewDataBinding.clContent.setVisibility(View.GONE);
mViewDataBinding.llNodata.setVisibility(View.VISIBLE);
} else {
mViewDataBinding.clContent.setVisibility(View.VISIBLE);
mViewDataBinding.llNodata.setVisibility(View.GONE);
}
}
}
});
mViewModel.getAdminApp();
mViewModel.get365Admin();
}
@Override

12
app/src/main/java/com/xwad/os/activity/download/DownloadViewModel.java
View File

@@ -42,18 +42,18 @@ public class DownloadViewModel extends BaseViewModel<ActivityDownloadBinding, Ac
public MutableLiveData<List<AppInfo>> mListMutableLiveData = new MutableLiveData<>();
public void getAdminApp() {
public void get365Admin() {
NetInterfaceManager.getInstance().get365AdminAppObservable()
.compose(RxLifecycle.bindUntilEvent(getLifecycle(), ActivityEvent.DESTROY))
.subscribe(new Observer<BaseResponse<List<AppInfo>>>() {
@Override
public void onSubscribe(@NonNull Disposable d) {
Log.e("getAdminApp", "onSubscribe: ");
Log.e("get365Admin", "onSubscribe: ");
}
@Override
public void onNext(@NonNull BaseResponse<List<AppInfo>> listBaseResponse) {
Log.e("getAdminApp", "onNext: " + listBaseResponse);
Log.e("get365Admin", "onNext: " + listBaseResponse);
if (listBaseResponse.code == 200) {
List<AppInfo> appInfoList = listBaseResponse.data;
List<AppInfo> forceAppInfoList = appInfoList.stream()
@@ -91,19 +91,19 @@ public class DownloadViewModel extends BaseViewModel<ActivityDownloadBinding, Ac
})
.collect(Collectors.toSet());
mMMKV.encode(CommonConfig.ESSENTIAL_COMPONENT_APPLICATIONS, packageSets);
Log.e("get365Admin", "onNext: packageSets = " + packageSets);
}
}
@Override
public void onError(@NonNull Throwable e) {
Log.e("getAdminApp", "onError: " + e.getMessage());
Log.e("get365Admin", "onError: " + e.getMessage());
onComplete();
}
@Override
public void onComplete() {
Log.e("getAdminApp", "onComplete: ");
Log.e("get365Admin", "onComplete: ");
}
});
}

11
app/src/main/java/com/xwad/os/activity/login/result/LoginSuccessfulActivity.java
View File

@@ -11,6 +11,7 @@ import com.xwad.os.activity.home.HomeActivity;
import com.xwad.os.base.mvvm.BaseMvvmActivity;
import com.xwad.os.bean.UserExpireInfo;
import com.xwad.os.databinding.ActivityLoginSuccessfulBinding;
import com.xwad.os.utils.OpenApkUtils;
import com.xwad.os.utils.Utils;
public class LoginSuccessfulActivity extends BaseMvvmActivity<LoginSuccessfulViewModel, ActivityLoginSuccessfulBinding> {
@@ -44,7 +45,12 @@ public class LoginSuccessfulActivity extends BaseMvvmActivity<LoginSuccessfulVie
mViewModel.mCompleteLiveData.observe(this, new Observer<Boolean>() {
@Override
public void onChanged(Boolean aBoolean) {
finish();
if (OpenApkUtils.getInstance().checkEssentialAppAllInstall()) {
finish();
startActivity(new Intent(LoginSuccessfulActivity.this, HomeActivity.class));
} else {
startActivity(new Intent(LoginSuccessfulActivity.this, DownloadActivity.class));
}
}
});
mViewModel.mUserExpireInfoData.observe(this, new Observer<UserExpireInfo>() {
@@ -78,8 +84,7 @@ public class LoginSuccessfulActivity extends BaseMvvmActivity<LoginSuccessfulVie
public class BtnClick {
public void toHome(View view) {
// mViewModel.getAppInfo();
mViewModel.getAdminAppDownload();
startActivity(new Intent(LoginSuccessfulActivity.this, DownloadActivity.class));
mViewModel.get365Admin();
}
}

14
app/src/main/java/com/xwad/os/activity/login/result/LoginSuccessfulViewModel.java
View File

@@ -78,18 +78,18 @@ public class LoginSuccessfulViewModel extends BaseViewModel<ActivityLoginSuccess
public MutableLiveData<Boolean> mCompleteLiveData = new MutableLiveData<>();
public void getAdminAppDownload() {
NetInterfaceManager.getInstance().getAdminAppObservable()
public void get365Admin() {
NetInterfaceManager.getInstance().get365AdminAppObservable()
.compose(RxLifecycle.bindUntilEvent(getLifecycle(), ActivityEvent.DESTROY))
.subscribe(new Observer<BaseResponse<List<AppInfo>>>() {
@Override
public void onSubscribe(@NonNull Disposable d) {
Log.e("getAdminAppDownload", "onSubscribe: ");
Log.e("get365Admin", "onSubscribe: ");
}
@Override
public void onNext(@NonNull BaseResponse<List<AppInfo>> listBaseResponse) {
Log.e("getAdminAppDownload", "onNext: " + listBaseResponse);
Log.e("get365Admin", "onNext: " + listBaseResponse);
if (listBaseResponse.code == 200) {
List<AppInfo> appInfoList = listBaseResponse.data;
Set<String> packageSets = appInfoList.stream()
@@ -107,20 +107,20 @@ public class LoginSuccessfulViewModel extends BaseViewModel<ActivityLoginSuccess
})
.collect(Collectors.toSet());
mMMKV.encode(CommonConfig.ESSENTIAL_COMPONENT_APPLICATIONS, packageSets);
Log.e("get365Admin", "onNext: packageSets = " + packageSets);
}
mCompleteLiveData.setValue(true);
}
@Override
public void onError(@NonNull Throwable e) {
Log.e("getAdminAppDownload", "onError: " + e.getMessage());
Log.e("get365Admin", "onError: " + e.getMessage());
onComplete();
}
@Override
public void onComplete() {
Log.e("getAdminAppDownload", "onComplete: ");
Log.e("get365Admin", "onComplete: ");
mCompleteLiveData.setValue(true);
}
});

13
app/src/main/java/com/xwad/os/activity/main/MainActivity.java
View File

@@ -24,7 +24,11 @@ import androidx.fragment.app.FragmentManager;
import androidx.lifecycle.Observer;
import androidx.viewpager.widget.ViewPager;
import com.xwad.os.BuildConfig;
import com.hjq.permissions.OnPermissionCallback;
import com.hjq.permissions.Permission;
import com.hjq.permissions.XXPermissions;
import com.hjq.toast.Toaster;
import com.tencent.mmkv.MMKV;
import com.xwad.os.R;
import com.xwad.os.activity.permission.PermissionActivity;
import com.xwad.os.base.mvvm.BaseMvvmActivity;
@@ -43,21 +47,16 @@ import com.xwad.os.fragment.read.ReadFragment;
import com.xwad.os.fragment.safe.SafeFragment;
import com.xwad.os.jxw.JxwPackageConfig;
import com.xwad.os.manager.AmapManager;
import com.xwad.os.manager.DeviceSNManager;
import com.xwad.os.mdm.AdminManager;
import com.xwad.os.utils.ApkUtils;
import com.xwad.os.utils.OpenApkUtils;
import com.xwad.os.utils.Utils;
import com.xwad.os.view.viewpager.BaseFragmentPagerAdapter;
import com.hjq.permissions.OnPermissionCallback;
import com.hjq.permissions.Permission;
import com.hjq.permissions.XXPermissions;
import com.hjq.toast.Toaster;
import com.tencent.mmkv.MMKV;
import java.util.ArrayList;
import java.util.List;
@Deprecated
public class MainActivity extends BaseMvvmActivity<MainViewModel, ActivityMainBinding> {
private static final String TAG = "MainActivity";

1
app/src/main/java/com/xwad/os/config/CommonConfig.java
View File

@@ -8,6 +8,7 @@ public class CommonConfig {
public static final String CLOUD_LESSON_SETTINGS_KEY = "cloud_lesson_settings_key";
public static final String DISALLOWED_RUNNING_APP_KEY = "disallowed_running_app";
public static final String ESSENTIAL_COMPONENT_APPLICATIONS = "essential_component_applications";
public static final Set<String> ESSENTIAL_APPLICATIONS_SETS = new HashSet<String>() {{
this.add("com.jxw.jpkc");

15
app/src/main/java/com/xwad/os/fragment/usercenter/account/AccountFragment.java
View File

@@ -117,10 +117,10 @@ public class AccountFragment extends BaseMvvmFragment<AccountViewModel, Fragment
Log.e(TAG, "onResume: ");
}
private ActivityResultLauncher<Intent> mLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), new ActivityResultCallback<ActivityResult>() {
private ActivityResultLauncher<Intent> mLoginLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), new ActivityResultCallback<ActivityResult>() {
@Override
public void onActivityResult(ActivityResult result) {
Log.e(TAG, "onActivityResult: " + result);
Log.e(TAG, "onActivityResult: mLoginLauncher = " + result);
if (result != null) {
Intent intent = result.getData();
if (intent != null && result.getResultCode() == Activity.RESULT_OK) {
@@ -133,13 +133,14 @@ public class AccountFragment extends BaseMvvmFragment<AccountViewModel, Fragment
private ActivityResultLauncher<Intent> mActivationLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), new ActivityResultCallback<ActivityResult>() {
@Override
public void onActivityResult(ActivityResult result) {
Log.e(TAG, "onActivityResult: " + result);
Log.e(TAG, "onActivityResult: mActivationLauncher = " + result);
if (result != null) {
Intent intent = result.getData();
if (intent != null && result.getResultCode() == Activity.RESULT_OK) {
mViewModel.getUserInfo();
startActivity(new Intent(mContext, DownloadActivity.class));
if (!OpenApkUtils.getInstance().checkEssentialAppAllInstall()) {
startActivity(new Intent(mContext, DownloadActivity.class));
}
// DefaultAppsDialog appsDialog = new DefaultAppsDialog(getActivity());
// appsDialog.show();
}
@@ -209,7 +210,7 @@ public class AccountFragment extends BaseMvvmFragment<AccountViewModel, Fragment
} else {
// showCodeLogin();
mLauncher.launch(new Intent(mContext, LoginActivity.class));
mLoginLauncher.launch(new Intent(mContext, LoginActivity.class));
}
}
@@ -226,7 +227,7 @@ public class AccountFragment extends BaseMvvmFragment<AccountViewModel, Fragment
}
} else {
Toaster.show("请先登录");
mLauncher.launch(new Intent(mContext, LoginActivity.class));
mLoginLauncher.launch(new Intent(mContext, LoginActivity.class));
}
}
}

5
app/src/main/java/com/xwad/os/network/UrlAddress.java
View File

@@ -12,16 +12,15 @@ public class UrlAddress {
/*验证码登录*/
@Deprecated
public final static String CODE_LOGIN = "login/code-login";
public final static String NEW_CODE_LOGIN = "login/new-login";
/*账号密码登录*/
public final static String USER_LOGIN = "login/user-login";
public final static String NEW_CODE_LOGIN = "login/new-login";
/*用户会员信息(用于判断是否有VIP)*/
public static final String USER_INFO = "user/info";
/*获取设备过期时间*/
public static final String USER_expire_info = "user/expire-info";
public static final String USER_EXPIRE_INFO = "user/expire-info";
/*套餐可选列表*/
public static final String VIP_LIST = "user/vip-list";
/*购买VIP下订单*/

2
app/src/main/java/com/xwad/os/network/api/UserApi.java
View File

@@ -25,7 +25,7 @@ public interface UserApi {
@Header("token") String token
);
@GET(UrlAddress.USER_expire_info)
@GET(UrlAddress.USER_EXPIRE_INFO)
Observable<BaseResponse<UserExpireInfo>> getUserExpireInfo(
@Header("token") String token
);

2
app/src/main/java/com/xwad/os/service/main/MainSContact.java
View File

@@ -55,7 +55,7 @@ public class MainSContact {
/*获取管理员应用*/
void getAdminApp();
void getAdminAppDownload();
void get365Admin();
/*获取id管控*/
void getAppInside();

15
app/src/main/java/com/xwad/os/service/main/MainSPresenter.java
View File

@@ -131,7 +131,7 @@ public class MainSPresenter implements MainSContact.Presenter {
// if (!ApkUtils.isAvailable(mContext, "com.study.flashplayer")) {
// getAppInfo("com.study.flashplayer");
// }
getAdminAppDownload();
get365Admin();
}
} else if (userInfoBaseResponse.code == 401) {
@@ -420,18 +420,18 @@ public class MainSPresenter implements MainSContact.Presenter {
}
@Override
public void getAdminAppDownload() {
NetInterfaceManager.getInstance().getAdminAppObservable()
public void get365Admin() {
NetInterfaceManager.getInstance().get365AdminAppObservable()
.compose(RxLifecycle.bindUntilEvent(getLifecycle(), ActivityEvent.DESTROY))
.subscribe(new Observer<BaseResponse<List<AppInfo>>>() {
@Override
public void onSubscribe(@NonNull Disposable d) {
Log.e("getAdminAppDownload", "onSubscribe: ");
Log.e("get365Admin", "onSubscribe: ");
}
@Override
public void onNext(@NonNull BaseResponse<List<AppInfo>> listBaseResponse) {
Log.e("getAdminAppDownload", "onNext: " + listBaseResponse);
Log.e("get365Admin", "onNext: " + listBaseResponse);
if (listBaseResponse.code == 200) {
List<AppInfo> appInfoList = listBaseResponse.data;
appInfoList.stream()
@@ -479,18 +479,19 @@ public class MainSPresenter implements MainSContact.Presenter {
})
.collect(Collectors.toSet());
mMMKV.encode(CommonConfig.ESSENTIAL_COMPONENT_APPLICATIONS, packageSets);
Log.e("get365Admin", "onNext: packageSets = " + packageSets);
}
}
@Override
public void onError(@NonNull Throwable e) {
Log.e("getAdminAppDownload", "onError: " + e.getMessage());
Log.e("get365Admin", "onError: " + e.getMessage());
onComplete();
}
@Override
public void onComplete() {
Log.e("getAdminAppDownload", "onComplete: ");
Log.e("get365Admin", "onComplete: ");
}
});
}

2
app/src/main/java/com/xwad/os/service/main/MainService.java
View File

@@ -153,7 +153,7 @@ public class MainService extends BaseRxService implements MainSContact.MainSView
mPresenter.getScreenLock();
mPresenter.getTestApp();
mPresenter.getAdminApp();
mPresenter.getAdminAppDownload();
mPresenter.get365Admin();
mPresenter.getSystemSettings();
mPresenter.getLockScreenPwd();

11
app/src/main/java/com/xwad/os/utils/OpenApkUtils.java
View File

@@ -703,10 +703,10 @@ public class OpenApkUtils {
if (checkInstall) {
if (!checkEssentialAppAllInstall()) {
activity.startActivity(new Intent(activity, DownloadActivity.class));
// DefaultAppsDialog appsDialog = new DefaultAppsDialog(activity);
// appsDialog.show();
Toaster.show("请先安装必备组件");
Intent intent = new Intent(activity, DownloadActivity.class);
intent.putExtra("auto_close", true);
intent.putExtra("param", paramStr);
activity.startActivity(intent);
return;
}
}
@@ -719,7 +719,7 @@ public class OpenApkUtils {
openJxwApp(activity, paramStr);
}
private boolean checkEssentialAppAllInstall() {
public boolean checkEssentialAppAllInstall() {
Set<String> essentialAppSets = mMMKV.decodeStringSet(CommonConfig.ESSENTIAL_COMPONENT_APPLICATIONS, CommonConfig.ESSENTIAL_APPLICATIONS_SETS);
Log.e(TAG, "checkEssentialAppAllInstall: " + essentialAppSets);
boolean allTrue = essentialAppSets.stream().allMatch(new Predicate<String>() {
@@ -914,7 +914,6 @@ public class OpenApkUtils {
window.setAttributes(attributes);
}
public void showDownloadDialog(Activity context, String pkg, String appName) {
Dialog dialog = new Dialog(context, R.style.ActionSheet);
Window window = dialog.getWindow();

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

@@ -424,7 +424,7 @@
android:layout_gravity="center_horizontal"
android:layout_marginTop="2dp"
android:singleLine="true"
android:text="许可证"
android:text="许可校验"
android:textColor="@color/white"
android:textSize="@dimen/mine_app_name_size"
app:layout_constraintEnd_toEndOf="@+id/app_icon12"

2
build.gradle
View File

@@ -5,6 +5,7 @@ buildscript {
google()
// mavenCentral()
maven { url 'https://jitpack.io' }
maven { url 'https://developer.hihonor.com/repo' }
maven { url 'https://developer.huawei.com/repo/' }
maven { url 'https://maven.aliyun.com/repository/central' }
maven { url 'https://maven.aliyun.com/repository/jcenter' }
@@ -31,6 +32,7 @@ allprojects {
// mavenCentral()
maven { url 'https://jitpack.io' }
maven { url 'https://developer.huawei.com/repo/' }
maven { url 'https://developer.hihonor.com/repo' }
maven { url 'https://maven.aliyun.com/repository/central' }
maven { url 'https://maven.aliyun.com/repository/jcenter' }
maven { url 'https://maven.aliyun.com/repository/public' }