Merge branch 'dev_opt_2.15.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_opt_2.15.0

This commit is contained in:
xinfengkun
2023-03-20 17:12:37 +08:00

View File

@@ -43,17 +43,10 @@ class UpgradeAppNetWorkManager private constructor() {
*/
fun getAppUpgradeInfo(context: Context?, mac: String, screenType: String) { // String sn = "X20202203105S688HZ";
// String mac = "48:b0:2d:3a:bc:78";
var mac = mac
var screenType = screenType
var sn = MoGoAiCloudClientConfig.getInstance().sn
val sn = MoGoAiCloudClientConfig.getInstance().sn
val versionCode = AppUtils.getAppVersionCode()
val versionName = AppUtils.getAppVersionName()
d(SceneConstant.M_BINDING + TAG, "getAppUpgradeInfo mac = $mac---type = $screenType---sn = $sn---versionCode =$versionCode---versionName =$versionName")
//TODO renwj undo start
mac = "48:b0:2d:4d:31:7f"
sn = null
screenType = "10" //TODO renwj undo end
val request = UpgradeAppRequest(sn, mac, screenType, versionName, "1")
val requestBody = RequestBody.create(MediaType.get("application/json;charset=UTF-8"), GsonUtil.jsonFromObject(request))
mUpgradeApiService.getUpgradeInfo(requestBody).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(object : Observer<UpgradeAppInfo> {