From ae07009fdc036265e5c32b9c58d412b743a5daab Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Thu, 23 Jul 2020 15:08:08 +0800 Subject: [PATCH] =?UTF-8?q?bug=20fix=20=E4=BF=AE=E5=A4=8D=E6=95=85?= =?UTF-8?q?=E9=9A=9C=E6=B1=82=E5=8A=A9=E4=B8=8A=E6=8A=A5=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E6=98=AF=E8=8E=B7=E5=8F=96sn?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/module/extensions/ExtensionsPresenter.java | 4 ++-- .../mogo/module/extensions/entrance/EntrancePresenter.java | 4 ++-- .../java/com/mogo/module/share/manager/SeekHelpManager.kt | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsPresenter.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsPresenter.java index cef726c5b2..11aa6dee90 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsPresenter.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsPresenter.java @@ -7,6 +7,7 @@ import androidx.lifecycle.LifecycleOwner; import com.alibaba.android.arouter.launcher.ARouter; import com.mogo.commons.mvp.Presenter; +import com.mogo.commons.network.Utils; import com.mogo.module.extensions.net.UserInfoNetApiServices; import com.mogo.module.extensions.userinfo.UserInfo; import com.mogo.module.extensions.userinfo.UserInfoConstant; @@ -23,7 +24,6 @@ import com.mogo.service.statusmanager.IMogoMsgCenter; import com.mogo.service.statusmanager.IMogoMsgCenterListener; import com.mogo.utils.digest.DigestUtils; import com.mogo.utils.logger.Logger; -import com.zhidao.auto.platform.util.DeviceUtil; import java.util.Map; @@ -113,7 +113,7 @@ public class ExtensionsPresenter extends Presenter< ExtensionsView > implements private UserInfo userInfo; public void requestUserInfo() { Map params = new ArrayMap<>(); - params.put("sn", DeviceUtil.getSn()); + params.put("sn", Utils.getSn()); params.put("source", "2"); String sign = createSign(params, "JGqZw9"); params.put("sig", sign); diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java index e638517410..c4ca90cd05 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java @@ -8,6 +8,7 @@ import androidx.lifecycle.LifecycleOwner; import com.alibaba.android.arouter.launcher.ARouter; import com.mogo.commons.mvp.Presenter; +import com.mogo.commons.network.Utils; import com.mogo.module.extensions.R; import com.mogo.module.extensions.net.UserInfoNetApiServices; import com.mogo.module.extensions.userinfo.UserInfo; @@ -25,7 +26,6 @@ import com.mogo.service.statusmanager.IMogoMsgCenter; import com.mogo.service.statusmanager.IMogoMsgCenterListener; import com.mogo.utils.digest.DigestUtils; import com.mogo.utils.logger.Logger; -import com.zhidao.auto.platform.util.DeviceUtil; import java.util.Map; @@ -113,7 +113,7 @@ public class EntrancePresenter extends Presenter implements Weathe private UserInfo userInfo; public void requestUserInfo() { Map params = new ArrayMap<>(); - params.put("sn", DeviceUtil.getSn()); + params.put("sn", Utils.getSn()); params.put("source", "2"); String sign = createSign(params, "JGqZw9"); params.put("sig", sign); diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/SeekHelpManager.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/SeekHelpManager.kt index 9a9c1d949f..83282b97f4 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/SeekHelpManager.kt +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/SeekHelpManager.kt @@ -5,6 +5,7 @@ import android.content.Context import android.os.SystemClock import com.mogo.commons.data.BaseData import com.mogo.commons.network.SubscribeImpl +import com.mogo.commons.network.Utils import com.mogo.commons.voice.AIAssist import com.mogo.commons.voice.IMogoVoiceCmdCallBack import com.mogo.module.share.bean.SeekRecord @@ -16,7 +17,6 @@ import com.mogo.utils.TipToast import com.mogo.utils.logger.Logger import com.mogo.utils.network.RequestOptions import com.mogo.utils.storage.SharedPrefsMgr -import com.zhidao.auto.platform.util.DeviceUtil import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers @@ -152,7 +152,7 @@ object SeekHelpManager { private fun realSeekHelp() { Logger.d(TAG, "realSeekHelp") // 请求故障求助接口 - val seekRequest = SeekRequest(DeviceUtil.getSn()) + val seekRequest = SeekRequest(Utils.getSn()) val param = mutableMapOf("data" to seekRequest.getJson()) ServiceApisManager.serviceApis.networkApi.create(ShareApiService::class.java, HttpConstant.getNetHost()).sendHelpSignal(param).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(object : SubscribeImpl(RequestOptions.create(context)) { @@ -209,7 +209,7 @@ object SeekHelpManager { } fun debugCancelSeek() { - val seekRequest = SeekRequest(DeviceUtil.getSn(), 0) + val seekRequest = SeekRequest(Utils.getSn(), 0) val param = mutableMapOf("data" to seekRequest.getJson()) ServiceApisManager.serviceApis.networkApi.create(ShareApiService::class.java, HttpConstant.getNetHost()).sendHelpSignal(param).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(object : SubscribeImpl(RequestOptions.create(context)) { override fun onSuccess(o: BaseData?) {