From 3001c33bc605e77e1dc697136eaee884182c49a4 Mon Sep 17 00:00:00 2001 From: tongtongstudio Date: Mon, 1 Dec 2025 10:42:22 +0800 Subject: [PATCH] =?UTF-8?q?version=20fix:=20update:=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E8=81=94=E6=83=B3csdk=E8=8E=B7=E5=8F=96sn?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xwad/os/activity/edit/EditActivity.java | 3 +- .../xwad/os/activity/home/HomeActivity.java | 2 +- .../xwad/os/activity/home/HomeViewModel.java | 3 +- .../xwad/os/activity/main/MainActivity.java | 2 +- .../xwad/os/activity/main/MainViewModel.java | 3 +- .../selectegrade/SelecteGradeActivity.java | 3 +- .../xwad/os/activity/user/UserActivity.java | 2 +- .../com/xwad/os/base/BaseApplication.java | 4 +-- .../xwad/os/fragment/user/UserViewModel.java | 2 +- .../usercenter/device/DeviceFragment.java | 3 +- .../usercenter/info/InfoFragment.java | 5 ++-- .../com/xwad/os/manager/RemoteManager.java | 24 +++++++-------- .../xwad/os/network/NetInterfaceManager.java | 29 ++++++++++--------- .../com/xwad/os/service/SocketService.java | 7 +++-- .../com/xwad/os/utils/LenovoCsdkUtil.java | 14 ++++----- app/src/main/res/values/strings.xml | 2 +- 16 files changed, 58 insertions(+), 50 deletions(-) diff --git a/app/src/main/java/com/xwad/os/activity/edit/EditActivity.java b/app/src/main/java/com/xwad/os/activity/edit/EditActivity.java index f032b89..5f61fb6 100644 --- a/app/src/main/java/com/xwad/os/activity/edit/EditActivity.java +++ b/app/src/main/java/com/xwad/os/activity/edit/EditActivity.java @@ -13,6 +13,7 @@ import com.xwad.os.R; import com.xwad.os.base.mvvm.BaseMvvmActivity; import com.xwad.os.config.CommonConfig; import com.xwad.os.databinding.ActivityEditBinding; +import com.xwad.os.manager.RemoteManager; import com.xwad.os.utils.ActivationUtil; import com.xwad.os.utils.LenovoCsdkUtil; @@ -102,7 +103,7 @@ public class EditActivity extends BaseMvvmActivity params = new HashMap<>(); - params.put("sn", LenovoCsdkUtil.getInstance().getSerial()); + params.put("sn", RemoteManager.getInstance().getSerial()); params.put(mTypeName, mViewDataBinding.editText.getText().toString()); mViewModel.updateInfo(params); } else { 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 f35b144..0bdf59a 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 @@ -100,7 +100,7 @@ public class HomeActivity extends BaseMvvmActivity params = new HashMap<>(); - params.put("sn", LenovoCsdkUtil.getInstance().getSerial()); + params.put("sn", RemoteManager.getInstance().getSerial()); params.put("sn_grade", grade); mViewModel.updateInfo(params); } diff --git a/app/src/main/java/com/xwad/os/activity/user/UserActivity.java b/app/src/main/java/com/xwad/os/activity/user/UserActivity.java index 1cdf7ab..cff34c0 100644 --- a/app/src/main/java/com/xwad/os/activity/user/UserActivity.java +++ b/app/src/main/java/com/xwad/os/activity/user/UserActivity.java @@ -245,7 +245,7 @@ public class UserActivity extends BaseMvvmActivity params = new HashMap<>(); - params.put("sn", LenovoCsdkUtil.getInstance().getSerial()); + params.put("sn", RemoteManager.getInstance().getSerial()); mViewModel.updateInfo(params, body); } else { mMMKV.encode(CommonConfig.UIUI_USER_AVATAR_KEY, avatarFilePath); diff --git a/app/src/main/java/com/xwad/os/base/BaseApplication.java b/app/src/main/java/com/xwad/os/base/BaseApplication.java index c40e6dd..697a837 100644 --- a/app/src/main/java/com/xwad/os/base/BaseApplication.java +++ b/app/src/main/java/com/xwad/os/base/BaseApplication.java @@ -68,17 +68,17 @@ public class BaseApplication extends Application { Log.e(TAG, "mmkv root: " + rootDir); ActivationUtil.init(this); + RemoteManager.init(this); LenovoCsdkUtil.init(this); CrashReport.initCrashReport(getApplicationContext(), "d1cd982951", false); - CrashReport.setDeviceId(BaseApplication.this, LenovoCsdkUtil.getInstance().getSerial()); + CrashReport.setDeviceId(BaseApplication.this, RemoteManager.getInstance().getSerial()); // 初始化 Toast 框架 Toaster.init(this); AmapManager.init(this); AppManager.init(this); PushManager.init(this); - RemoteManager.init(this); AlarmUtils.init(this); AppUsedTimeUtils.init(this); diff --git a/app/src/main/java/com/xwad/os/fragment/user/UserViewModel.java b/app/src/main/java/com/xwad/os/fragment/user/UserViewModel.java index 5427294..b16e1b6 100644 --- a/app/src/main/java/com/xwad/os/fragment/user/UserViewModel.java +++ b/app/src/main/java/com/xwad/os/fragment/user/UserViewModel.java @@ -138,7 +138,7 @@ public class UserViewModel extends BaseViewModel mQrCodeData = new MutableLiveData<>(); public void getQrCode() { - String encryptString = CXAESUtil.encrypt(CommonConfig.AES_KEY, LenovoCsdkUtil.getInstance().getSerial()); + String encryptString = CXAESUtil.encrypt(CommonConfig.AES_KEY, RemoteManager.getInstance().getSerial()); Log.e("getQRCode", "setImageAndText: " + encryptString); Bitmap bitmap = Utils.createQRImage(encryptString, 400, 400); mQrCodeData.setValue(bitmap); diff --git a/app/src/main/java/com/xwad/os/fragment/usercenter/device/DeviceFragment.java b/app/src/main/java/com/xwad/os/fragment/usercenter/device/DeviceFragment.java index bc5027a..9f6a98d 100644 --- a/app/src/main/java/com/xwad/os/fragment/usercenter/device/DeviceFragment.java +++ b/app/src/main/java/com/xwad/os/fragment/usercenter/device/DeviceFragment.java @@ -12,6 +12,7 @@ import com.xwad.os.activity.permission.PermissionActivity; import com.xwad.os.activity.service.ServiceActivity; import com.xwad.os.base.mvvm.fragment.BaseMvvmFragment; import com.xwad.os.databinding.FragmentDeviceBinding; +import com.xwad.os.manager.RemoteManager; import com.xwad.os.utils.LenovoCsdkUtil; public class DeviceFragment extends BaseMvvmFragment { @@ -40,7 +41,7 @@ public class DeviceFragment extends BaseMvvmFragment params = new HashMap<>(); - params.put("sn", LenovoCsdkUtil.getInstance().getSerial()); + params.put("sn", RemoteManager.getInstance().getSerial()); params.put("sex", "1"); mViewModel.updateInfo(params); } else { @@ -77,7 +78,7 @@ public class InfoFragment extends BaseMvvmFragment params = new HashMap<>(); - params.put("sn", LenovoCsdkUtil.getInstance().getSerial()); + params.put("sn", RemoteManager.getInstance().getSerial()); params.put("sex", "2"); mViewModel.updateInfo(params); } else { diff --git a/app/src/main/java/com/xwad/os/manager/RemoteManager.java b/app/src/main/java/com/xwad/os/manager/RemoteManager.java index 52e1c8e..1c6f89c 100644 --- a/app/src/main/java/com/xwad/os/manager/RemoteManager.java +++ b/app/src/main/java/com/xwad/os/manager/RemoteManager.java @@ -167,18 +167,18 @@ public class RemoteManager { /** * @return 获取sn */ -// public String getSerial() { -// if (mIGetInfoInterface != null) { -// try { -// return mIGetInfoInterface.getSerial(); -// } catch (Exception e) { -// Log.e(TAG, "getSerial: " + e.getMessage()); -// } -// } else { -// bindInfoService(); -// } -// return mMMKV.decodeString(SN_KEY, ""); -// } + public String getSerial() { + if (mIGetInfoInterface != null) { + try { + return mIGetInfoInterface.getSerial(); + } catch (Exception e) { + Log.e(TAG, "getSerial: " + e.getMessage()); + } + } else { + bindInfoService(); + } + return mMMKV.decodeString(SN_KEY, "unknown"); + } public String getAppUsedStatistics() { Log.e(TAG, "getAppUsedStatistics: " ); diff --git a/app/src/main/java/com/xwad/os/network/NetInterfaceManager.java b/app/src/main/java/com/xwad/os/network/NetInterfaceManager.java index 92c571f..dca64e1 100644 --- a/app/src/main/java/com/xwad/os/network/NetInterfaceManager.java +++ b/app/src/main/java/com/xwad/os/network/NetInterfaceManager.java @@ -27,6 +27,7 @@ import com.xwad.os.bean.UserAvatarInfo; import com.xwad.os.config.CommonConfig; import com.xwad.os.disklrucache.CacheHelper; import com.xwad.os.gson.GsonUtils; +import com.xwad.os.manager.RemoteManager; import com.xwad.os.network.api.AlarmClockApi; import com.xwad.os.network.api.AppUsageRecordApi; import com.xwad.os.network.api.FilesApi; @@ -222,14 +223,14 @@ public class NetInterfaceManager { public Observable> getSnInfoControl() { return mRetrofit.create(SnInfoApi.class) - .getSninfo(LenovoCsdkUtil.getInstance().getSerial()) + .getSninfo(RemoteManager.getInstance().getSerial()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()); } public Observable> getUserAvatarInfoControl() { return mRetrofit.create(SnInfoApi.class) - .getUserAvatarInfo(LenovoCsdkUtil.getInstance().getSerial()) + .getUserAvatarInfo(RemoteManager.getInstance().getSerial()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()); } @@ -254,21 +255,21 @@ public class NetInterfaceManager { public Observable getRunningAppObservable(String json) { return mRetrofit.create(AppUsageRecordApi.class) - .sendRunningInfo(LenovoCsdkUtil.getInstance().getSerial(), json) + .sendRunningInfo(RemoteManager.getInstance().getSerial(), json) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()); } public Observable> getCloudLessonObservable() { return mRetrofit.create(SettingApi.class) - .getCloudLessonSetting(LenovoCsdkUtil.getInstance().getSerial()) + .getCloudLessonSetting(RemoteManager.getInstance().getSerial()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()); } public Observable> getCloudLessonAppObservable() { return mRetrofit.create(SettingApi.class) - .getCloudLessonApp(LenovoCsdkUtil.getInstance().getSerial()) + .getCloudLessonApp(RemoteManager.getInstance().getSerial()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()); } @@ -276,28 +277,28 @@ public class NetInterfaceManager { public Observable>> getAlarmClockObservable() { return mRetrofit .create(AlarmClockApi.class) - .getAlarmClock(LenovoCsdkUtil.getInstance().getSerial()) + .getAlarmClock(RemoteManager.getInstance().getSerial()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()); } public Observable getUpdateAlarmObservable(int id) { return mRetrofit.create(AlarmClockApi.class) - .updateAlarm(LenovoCsdkUtil.getInstance().getSerial(), id) + .updateAlarm(RemoteManager.getInstance().getSerial(), id) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()); } public Observable> getStudyStatObservable() { return mRetrofit.create(SnInfoApi.class) - .getStudyStat(LenovoCsdkUtil.getInstance().getSerial()) + .getStudyStat(RemoteManager.getInstance().getSerial()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()); } public Observable getUpdateAddressObservable(String address, double longitude, double latitude) { return mRetrofit.create(SnInfoApi.class) - .updateAddress(LenovoCsdkUtil.getInstance().getSerial(), address, longitude, latitude) + .updateAddress(RemoteManager.getInstance().getSerial(), address, longitude, latitude) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()); } @@ -311,35 +312,35 @@ public class NetInterfaceManager { public Observable>> getHomeworkObservable() { return mRetrofit.create(HomeworkApi.class) - .getHomeworks(LenovoCsdkUtil.getInstance().getSerial()) + .getHomeworks(RemoteManager.getInstance().getSerial()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()); } public Observable> getHomeworkDetailObservable(int id) { return mRetrofit.create(HomeworkApi.class) - .getHomeworkDetail(LenovoCsdkUtil.getInstance().getSerial(), id) + .getHomeworkDetail(RemoteManager.getInstance().getSerial(), id) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()); } public Observable getHomeworkUpdateObservable(int id) { return mRetrofit.create(HomeworkApi.class) - .updateHomework(LenovoCsdkUtil.getInstance().getSerial(), id) + .updateHomework(RemoteManager.getInstance().getSerial(), id) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()); } public Observable> getPhraseObservable() { return mRetrofit.create(PhraseApi.class) - .getPhrase(LenovoCsdkUtil.getInstance().getSerial()) + .getPhrase(RemoteManager.getInstance().getSerial()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()); } public Observable> getsettingControl() { return mRetrofit.create(SettingApi.class) - .getSetting(LenovoCsdkUtil.getInstance().getSerial()) + .getSetting(RemoteManager.getInstance().getSerial()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()); } diff --git a/app/src/main/java/com/xwad/os/service/SocketService.java b/app/src/main/java/com/xwad/os/service/SocketService.java index 0c7c133..aa0a949 100644 --- a/app/src/main/java/com/xwad/os/service/SocketService.java +++ b/app/src/main/java/com/xwad/os/service/SocketService.java @@ -25,6 +25,7 @@ import com.xwad.os.BuildConfig; import com.xwad.os.R; import com.xwad.os.activity.main.MainActivity; import com.xwad.os.config.CommonConfig; +import com.xwad.os.manager.RemoteManager; import com.xwad.os.utils.ActivationUtil; import com.xwad.os.utils.LenovoCsdkUtil; import com.xwad.os.utils.Utils; @@ -321,7 +322,7 @@ public class SocketService extends Service implements NetworkUtils.OnNetworkStat * 初始化websocket连接 */ private void initSocketClient() { - URI uri = URI.create(BuildConfig.WEBSOCKET_URL + "?sn=" + LenovoCsdkUtil.getInstance().getSerial()); + URI uri = URI.create(BuildConfig.WEBSOCKET_URL + "?sn=" + RemoteManager.getInstance().getSerial()); mJWebSocketClient = new JWebSocketClient(uri) { @Override public void onMessage(String message) { @@ -399,7 +400,7 @@ public class SocketService extends Service implements NetworkUtils.OnNetworkStat */ public void sendPingMsg() { JsonObject jsonObject = new JsonObject(); - jsonObject.addProperty("sn", LenovoCsdkUtil.getInstance().getSerial()); + jsonObject.addProperty("sn", RemoteManager.getInstance().getSerial()); jsonObject.addProperty("type", "ping"); if (null != mJWebSocketClient) { Log.i(TAG, "sendPingMsg: 发送的消息：" + jsonObject.toString()); @@ -409,7 +410,7 @@ public class SocketService extends Service implements NetworkUtils.OnNetworkStat public void sendMsgScreen() { JsonObject jsonObject = new JsonObject(); - jsonObject.addProperty("sn", LenovoCsdkUtil.getInstance().getSerial()); + jsonObject.addProperty("sn", RemoteManager.getInstance().getSerial()); if (Utils.isScreenOn(SocketService.this)) { jsonObject.addProperty("type", "device_open_screen"); } else { diff --git a/app/src/main/java/com/xwad/os/utils/LenovoCsdkUtil.java b/app/src/main/java/com/xwad/os/utils/LenovoCsdkUtil.java index 0783c44..2b9a141 100644 --- a/app/src/main/java/com/xwad/os/utils/LenovoCsdkUtil.java +++ b/app/src/main/java/com/xwad/os/utils/LenovoCsdkUtil.java @@ -62,13 +62,13 @@ public class LenovoCsdkUtil { return mac; } - public String getSerial() { - if (BuildConfig.DEBUG) { - return "T811MN128GB23529041363"; - } - String sn = mCSDKManager.getDeviceInfo(2); - return sn; - } +// public String getSerial() { +// if (BuildConfig.DEBUG) { +// return "T811MN128GB23529041363"; +// } +// String sn = mCSDKManager.getDeviceInfo(2); +// return sn; +// } public String getDeviceModel() { String model = mCSDKManager.getDeviceInfo(3); diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 50e4987..1013428 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,5 @@ - 学习空间 + 学王365 隐私协议 服务协议和隐私政策 \t\t\t\t请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了向你提供即时通讯，内容分享等服务，