version:m40se 2.9.8

fix:
update:增加G13和P30Pro平台
This commit is contained in:
2023-05-14 11:27:45 +08:00
parent 1765efb459
commit 6b9a1d99b5
9 changed files with 134 additions and 68 deletions

View File

@@ -70,8 +70,6 @@ public class MainActivity extends BaseActivity implements MainAContact.MainView,
TextView tv_customversion;
@BindView(R.id.tv_sn)
TextView tv_sn;
@BindView(R.id.tv_bind)
TextView tv_bind;
@BindView(R.id.tv_version)
TextView tv_version;
@BindView(R.id.qr_code)
@@ -126,7 +124,12 @@ public class MainActivity extends BaseActivity implements MainAContact.MainView,
setOnClickListener();
tv_customversion.setText(JGYUtils.getCustomVersion());
tv_sn.setText("IMEI:" + Utils.getIMEI(MainActivity.this));
if (JGYUtils.getInstance().checkAppPlatform() == JGYUtils.G13Platform) {
tv_sn.setText("SN:" + Utils.getSerial());
}else {
tv_sn.setText("IMEI:" + Utils.getIMEI(MainActivity.this));
}
tv_version.setText(BuildConfig.VERSION_NAME);
task = new TimeTask();
@@ -382,18 +385,15 @@ public class MainActivity extends BaseActivity implements MainAContact.MainView,
if (response != null) {
//设备已经绑定
if (response.code == 200) {
tv_bind.setText(getString(R.string.bind_succeed));
SnInfo snInfo = response.data;
NetInterfaceManager.getInstance().checkDeviceType(snInfo.getType_id());
}
//设备没有绑定
else if (response.code == 300) {
tv_bind.setText(getString(R.string.scan_tips));
ControlManager.getInstance().setDisableSetting();
}
//没有授权的设备
else if (response.code == 400) {
tv_bind.setText(getString(R.string.device_unauthorized));
ToastUtil.show(getString(R.string.device_unauthorized));
Log.e(TAG, "setSnInfo: " + getString(R.string.device_unauthorized));
ControlManager.getInstance().setDisableSetting();