|
@@ -69,6 +69,13 @@ class RegisterActivity : BaseActivity<DevicePresenter, ActivityRegisterBinding>(
|
|
|
Log.e(TAG,"mac: "+Constants.mac + ", imei: " + Constants.imei)
|
|
|
tv_local_mac.text = "本机MAC:"+Constants.mac
|
|
|
tv_local_imei.text = "IMEI或序列号: " + Constants.imei
|
|
|
+ tv_device_model.text = "设备型号: " + Build.MODEL
|
|
|
+
|
|
|
+ if ("YUNPAI_H6".equals(Build.MODEL) || "YUNPAI_H6B".equals(Build.MODEL)) {
|
|
|
+ Constants.device_serial_id = Constants.imei
|
|
|
+ } else {
|
|
|
+ Constants.device_serial_id = Constants.mac
|
|
|
+ }
|
|
|
|
|
|
Thread{
|
|
|
//val logoBitmap = BitmapFactory.decodeResource(resources, R.mipmap.erlogo)
|
|
@@ -77,11 +84,7 @@ class RegisterActivity : BaseActivity<DevicePresenter, ActivityRegisterBinding>(
|
|
|
builder.append("&code=")
|
|
|
builder.append(Constants.DEVICE_CODE)
|
|
|
builder.append("&mac=")
|
|
|
- if ("YUNPAI_H6".equals(Build.MODEL)) {
|
|
|
- builder.append(Constants.imei)
|
|
|
- } else {
|
|
|
- builder.append(Constants.mac)
|
|
|
- }
|
|
|
+ builder.append(Constants.device_serial_id)
|
|
|
builder.append("&model=")
|
|
|
builder.append(Constants.DEVICE_MODEL)
|
|
|
builder.append("&hard_ver=")
|
|
@@ -114,19 +117,11 @@ class RegisterActivity : BaseActivity<DevicePresenter, ActivityRegisterBinding>(
|
|
|
btn_reload.isEnabled = false
|
|
|
btn_reload.setOnClickListener {
|
|
|
btn_reload.isEnabled = false
|
|
|
- if ("YUNPAI_H6".equals(Build.MODEL)) {
|
|
|
- presenter.loadData(Constants.imei!!)
|
|
|
- } else {
|
|
|
- presenter.loadData(Constants.mac!!)
|
|
|
- }
|
|
|
+ presenter.loadData(Constants.device_serial_id!!)
|
|
|
}
|
|
|
|
|
|
if (permissionGrant) {
|
|
|
- if ("YUNPAI_H6".equals(Build.MODEL)) {
|
|
|
- presenter.loadData(Constants.imei!!)
|
|
|
- } else {
|
|
|
- presenter.loadData(Constants.mac!!)
|
|
|
- }
|
|
|
+ presenter.loadData(Constants.device_serial_id!!)
|
|
|
} else {
|
|
|
reload()
|
|
|
}
|
|
@@ -136,11 +131,7 @@ class RegisterActivity : BaseActivity<DevicePresenter, ActivityRegisterBinding>(
|
|
|
handler.postDelayed({
|
|
|
if (permissionGrant) {
|
|
|
btn_reload.isEnabled = false
|
|
|
- if ("YUNPAI_H6".equals(Build.MODEL)) {
|
|
|
- presenter.loadData(Constants.imei!!)
|
|
|
- } else {
|
|
|
- presenter.loadData(Constants.mac!!)
|
|
|
- }
|
|
|
+ presenter.loadData(Constants.device_serial_id!!)
|
|
|
} else {
|
|
|
reload()
|
|
|
}
|