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

version

Browse Source 
fix:
update:去掉联想csdk获取sn
This commit is contained in:
tongtongstudio
2025-12-01 10:42:22 +08:00
parent 7e16ba8813
commit 3001c33bc6
16 changed files with 58 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

3
app/src/main/java/com/xwad/os/fragment/usercenter/device/DeviceFragment.java
View File

@@ -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

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

@@ -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 {