version

fix:
update:去掉联想csdk获取sn

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<EditViewModel, ActivityEditBi
             }
             if (ActivationUtil.getInstance().isActivation()) {
                 Map<String, String> 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 {

app/src/main/java/com/xwad/os/activity/home/HomeActivity.java

@@ -100,7 +100,7 @@ public class HomeActivity extends BaseMvvmActivity<HomeViewModel, ActivityHomeBi
 
     @Override
     public void initView() {
-        Log.e(TAG, "initView: getSerial = " + LenovoCsdkUtil.getInstance().getSerial());
+        Log.e(TAG, "initView: getSerial = " + RemoteManager.getInstance().getSerial());
 
         RemoteManager.setListener(this);
         Utils.getAndroiodScreenProperty(this);

app/src/main/java/com/xwad/os/activity/home/HomeViewModel.java

@@ -15,6 +15,7 @@ import com.xwad.os.bean.SnInfo;
 import com.xwad.os.bean.SystemSettings;
 import com.xwad.os.config.CommonConfig;
 import com.xwad.os.databinding.ActivityHomeBinding;
+import com.xwad.os.manager.RemoteManager;
 import com.xwad.os.network.NetInterfaceManager;
 import com.xwad.os.utils.ActivationUtil;
 import com.xwad.os.utils.ApkUtils;
@@ -173,7 +174,7 @@ public class HomeViewModel extends BaseViewModel<ActivityHomeBinding, ActivityEv
             Log.e(TAG, "onRestart: " + packagename);
             NetInterfaceManager.getInstance()
                     .getAppUsageRecordControl()
-                    .sendappUsageRecord(LenovoCsdkUtil.getInstance().getSerial(),
+                    .sendappUsageRecord(RemoteManager.getInstance().getSerial(),
                             ApkUtils.getAppNameByPackage(getCtx(), packagename),
                             packagename,
                             AppUsedTimeUtils.getInstance().getStartTime() / 1000,

app/src/main/java/com/xwad/os/activity/main/MainActivity.java

@@ -103,7 +103,7 @@ public class MainActivity extends BaseMvvmActivity<MainViewModel, ActivityMainBi
 
     @Override
     public void initView() {
-        Log.e(TAG, "initView: getSerial = " + LenovoCsdkUtil.getInstance().getSerial());
+        Log.e(TAG, "initView: getSerial = " + RemoteManager.getInstance().getSerial());
 
 
 //        OpenApkUtils.getInstance().openWordLecture();

app/src/main/java/com/xwad/os/activity/main/MainViewModel.java

@@ -19,6 +19,7 @@ import com.xwad.os.bean.SnInfo;
 import com.xwad.os.bean.SystemSettings;
 import com.xwad.os.config.CommonConfig;
 import com.xwad.os.databinding.ActivityMainBinding;
+import com.xwad.os.manager.RemoteManager;
 import com.xwad.os.network.NetInterfaceManager;
 import com.xwad.os.utils.ActivationUtil;
 import com.xwad.os.utils.ApkUtils;
@@ -174,7 +175,7 @@ public class MainViewModel extends BaseViewModel<ActivityMainBinding, ActivityEv
             Log.e(TAG, "onRestart: " + packagename);
             NetInterfaceManager.getInstance()
                     .getAppUsageRecordControl()
-                    .sendappUsageRecord(LenovoCsdkUtil.getInstance().getSerial(),
+                    .sendappUsageRecord(RemoteManager.getInstance().getSerial(),
                             ApkUtils.getAppNameByPackage(getCtx(), packagename),
                             packagename,
                             AppUsedTimeUtils.getInstance().getStartTime() / 1000,

app/src/main/java/com/xwad/os/activity/selectegrade/SelecteGradeActivity.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.ActivitySelecteGradeBinding;
+import com.xwad.os.manager.RemoteManager;
 import com.xwad.os.utils.ActivationUtil;
 import com.xwad.os.utils.LenovoCsdkUtil;
 import com.xwad.os.utils.Utils;
@@ -168,7 +169,7 @@ public class SelecteGradeActivity extends BaseMvvmActivity<SelecteGradeViewModel
             mMMKV.encode(CommonConfig.UIUI_USER_GRADE_KEY, grade);
             if (ActivationUtil.getInstance().isActivation()) {
                 Map<String, String> params = new HashMap<>();
-                params.put("sn", LenovoCsdkUtil.getInstance().getSerial());
+                params.put("sn", RemoteManager.getInstance().getSerial());
                 params.put("sn_grade", grade);
                 mViewModel.updateInfo(params);
             }

app/src/main/java/com/xwad/os/activity/user/UserActivity.java

@@ -245,7 +245,7 @@ public class UserActivity extends BaseMvvmActivity<UserViewModel, ActivityUserBi
                             RequestBody requestBody = RequestBody.Companion.create(avatarFile, mediaType);
                             MultipartBody.Part body = MultipartBody.Part.createFormData("avatar", avatarFile.getName(), requestBody);
                             Map<String, String> 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);

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);

app/src/main/java/com/xwad/os/fragment/user/UserViewModel.java

@@ -138,7 +138,7 @@ public class UserViewModel extends BaseViewModel<FragmentUserBinding, FragmentEv
     public MutableLiveData<Bitmap> 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);

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<DeviceViewModel, FragmentDeviceBinding> {
@@ -40,7 +41,7 @@ public class DeviceFragment extends BaseMvvmFragment<DeviceViewModel, FragmentDe
     protected void initView(Bundle bundle) {
         mViewDataBinding.tvModel.setText(Build.MODEL);
         mViewDataBinding.tvVersion.setText(BuildConfig.VERSION_NAME);
-        mViewDataBinding.tvMac.setText(LenovoCsdkUtil.getInstance().getSerial());
+        mViewDataBinding.tvMac.setText(RemoteManager.getInstance().getSerial());
     }
 
     @Override

app/src/main/java/com/xwad/os/fragment/usercenter/info/InfoFragment.java

@@ -18,6 +18,7 @@ import com.xwad.os.base.mvvm.fragment.BaseMvvmFragment;
 import com.xwad.os.bean.SnInfo;
 import com.xwad.os.config.CommonConfig;
 import com.xwad.os.databinding.FragmentInfoBinding;
+import com.xwad.os.manager.RemoteManager;
 import com.xwad.os.utils.ActivationUtil;
 import com.xwad.os.utils.LenovoCsdkUtil;
 
@@ -62,7 +63,7 @@ public class InfoFragment extends BaseMvvmFragment<InfoViewModel, FragmentInfoBi
                 if (b) {
                     if (ActivationUtil.getInstance().isActivation()) {
                         Map<String, String> 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<InfoViewModel, FragmentInfoBi
                 if (b) {
                     if (ActivationUtil.getInstance().isActivation()) {
                         Map<String, String> params = new HashMap<>();
-                        params.put("sn", LenovoCsdkUtil.getInstance().getSerial());
+                        params.put("sn", RemoteManager.getInstance().getSerial());
                         params.put("sex", "2");
                         mViewModel.updateInfo(params);
                     } else {

app/src/main/java/com/xwad/os/manager/RemoteManager.java

@@ -167,18 +167,18 @@ public class RemoteManager {
     /**
      * @return 获取sn
      */
-//    public String getSerial() {
+    public String getSerial() {
-//        if (mIGetInfoInterface != null) {
+        if (mIGetInfoInterface != null) {
-//            try {
+            try {
-//                return mIGetInfoInterface.getSerial();
+                return mIGetInfoInterface.getSerial();
-//            } catch (Exception e) {
+            } catch (Exception e) {
-//                Log.e(TAG, "getSerial: " + e.getMessage());
+                Log.e(TAG, "getSerial: " + e.getMessage());
-//            }
+            }
-//        } else {
+        } else {
-//            bindInfoService();
+            bindInfoService();
-//        }
+        }
-//        return mMMKV.decodeString(SN_KEY, "");
+        return mMMKV.decodeString(SN_KEY, "unknown");
-//    }
+    }
 
     public String getAppUsedStatistics() {
         Log.e(TAG, "getAppUsedStatistics: " );

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<BaseResponse<SnInfo>> getSnInfoControl() {
         return mRetrofit.create(SnInfoApi.class)
-                .getSninfo(LenovoCsdkUtil.getInstance().getSerial())
+                .getSninfo(RemoteManager.getInstance().getSerial())
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread());
     }
 
     public Observable<BaseResponse<UserAvatarInfo>> 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<BaseResponse> 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<BaseResponse<LessonSetting>> getCloudLessonObservable() {
         return mRetrofit.create(SettingApi.class)
-                .getCloudLessonSetting(LenovoCsdkUtil.getInstance().getSerial())
+                .getCloudLessonSetting(RemoteManager.getInstance().getSerial())
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread());
     }
 
     public Observable<BaseResponse<LessonApp>> 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<BaseResponse<List<AlarmClockData>>> getAlarmClockObservable() {
         return mRetrofit
                 .create(AlarmClockApi.class)
-                .getAlarmClock(LenovoCsdkUtil.getInstance().getSerial())
+                .getAlarmClock(RemoteManager.getInstance().getSerial())
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread());
     }
 
     public Observable<BaseResponse> 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<BaseResponse<StudyStatBean>> getStudyStatObservable() {
         return mRetrofit.create(SnInfoApi.class)
-                .getStudyStat(LenovoCsdkUtil.getInstance().getSerial())
+                .getStudyStat(RemoteManager.getInstance().getSerial())
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread());
     }
 
     public Observable<BaseResponse> 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<BaseResponse<ArrayList<HomeworkBean>>> getHomeworkObservable() {
         return mRetrofit.create(HomeworkApi.class)
-                .getHomeworks(LenovoCsdkUtil.getInstance().getSerial())
+                .getHomeworks(RemoteManager.getInstance().getSerial())
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread());
     }
 
     public Observable<BaseResponse<HomeworkBean>> 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<BaseResponse> 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<BaseResponse<PhraseContent>> getPhraseObservable() {
         return mRetrofit.create(PhraseApi.class)
-                .getPhrase(LenovoCsdkUtil.getInstance().getSerial())
+                .getPhrase(RemoteManager.getInstance().getSerial())
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread());
     }
 
     public Observable<BaseResponse<SystemSettings>> getsettingControl() {
         return mRetrofit.create(SettingApi.class)
-                .getSetting(LenovoCsdkUtil.getInstance().getSerial())
+                .getSetting(RemoteManager.getInstance().getSerial())
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread());
     }

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 {

app/src/main/java/com/xwad/os/utils/LenovoCsdkUtil.java

@@ -62,13 +62,13 @@ public class LenovoCsdkUtil {
         return mac;
     }
 
-    public String getSerial() {
+//    public String getSerial() {
-        if (BuildConfig.DEBUG) {
+//        if (BuildConfig.DEBUG) {
-            return "T811MN128GB23529041363";
+//            return "T811MN128GB23529041363";
-        }
+//        }
-        String sn = mCSDKManager.getDeviceInfo(2);
+//        String sn = mCSDKManager.getDeviceInfo(2);
-        return sn;
+//        return sn;
-    }
+//    }
 
     public String getDeviceModel() {
         String model = mCSDKManager.getDeviceInfo(3);

app/src/main/res/values/strings.xml

@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">学习空间</string>
+    <string name="app_name">学王365</string>
     <string name="privacy_agreement"><u>隐私协议</u></string>
     <string name="privacy_agreement_title">服务协议和隐私政策</string>
     <string name="privacy_agreement_content">\t\t\t\t请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了向你提供即时通讯，内容分享等服务，