bug fix

2020-06-08 10:25:40 +08:00
parent 30847d81bf
commit 106e9011b3
7 changed files with 56 additions and 28 deletions
--- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java
+++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java
@@ -5,6 +5,7 @@ import android.content.Context;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.mogo.module.share.dialog.LaucherShareDialog;
+import com.mogo.module.share.manager.ServiceApisManager;
 import com.mogo.service.IMogoServiceApis;
 import com.mogo.service.MogoServicePaths;
 import com.mogo.service.share.IMogoShareManager;
@@ -37,5 +38,6 @@ public class ShareControl implements IMogoShareManager {
    @Override
    public void init(Context context) {
        mContext = context;
+        ServiceApisManager.INSTANCE.init(context);
    }
 }
--- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareVoiceCmdReceiver.kt
+++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareVoiceCmdReceiver.kt
@@ -5,6 +5,7 @@ import android.content.Context
 import android.content.Intent
 import com.mogo.module.share.constant.ShareConstants
 import com.mogo.module.share.constant.ShareConstants.*
+import com.mogo.module.share.manager.ServiceApisManager
 import com.mogo.module.share.manager.UploadHelper
 import com.mogo.utils.logger.Logger
 import org.json.JSONObject
@@ -24,7 +25,8 @@ class ShareVoiceCmdReceiver : BroadcastReceiver() {
                val seekHelp = Intent(context, VoiceCmdService::class.java)
                seekHelp.putExtra(ShareConstants.VOICE_CMD_SERVICE_EVENT_KEY, ShareConstants.VOICE_CMD_SERVICE_SEEK_HELP)
                context.startService(seekHelp)
-                ShareControl.getInstance(context).dismissDialog()
+                ServiceApisManager.serviceApis.shareManager.dismissShareDialog()
+//                ShareControl.getInstance(context).dismissDialog()
            }
            VOICE_CMD_GO_TO_SHARE ->{
                val ob = JSONObject(intent.getStringExtra("data") ?: "").opt("ob")
@@ -32,23 +34,28 @@ class ShareVoiceCmdReceiver : BroadcastReceiver() {
                when (ob) {
                    "积水"->{
                        UploadHelper.upload(context, TYPE_STAGNANT_WATER)
-                        ShareControl.getInstance(context).dismissDialog()
+                        ServiceApisManager.serviceApis.shareManager.dismissShareDialog()
+//                        ShareControl.getInstance(context).dismissDialog()
                    }
                    "积冰"->{
                        UploadHelper.upload(context, TYPE_ROAD_ICY)
-                        ShareControl.getInstance(context).dismissDialog()
+                        ServiceApisManager.serviceApis.shareManager.dismissShareDialog()
+//                        ShareControl.getInstance(context).dismissDialog()
                    }
                    "雾"->{
                        UploadHelper.upload(context, TYPE_DENSE_FOG)
-                        ShareControl.getInstance(context).dismissDialog()
+                        ServiceApisManager.serviceApis.shareManager.dismissShareDialog()
+//                        ShareControl.getInstance(context).dismissDialog()
                    }
                    "交通事故"->{
                        UploadHelper.upload(context, TYPE_ACCIDENT)
-                        ShareControl.getInstance(context).dismissDialog()
+                        ServiceApisManager.serviceApis.shareManager.dismissShareDialog()
+//                        ShareControl.getInstance(context).dismissDialog()
                    }
                    "施工"->{
                        UploadHelper.upload(context, TYPE_ROAD_CONSTRUCTION)
-                        ShareControl.getInstance(context).dismissDialog()
+                        ServiceApisManager.serviceApis.shareManager.dismissShareDialog()
+//                        ShareControl.getInstance(context).dismissDialog()
                    }
                }
            }
@@ -59,7 +66,8 @@ class ShareVoiceCmdReceiver : BroadcastReceiver() {
                    // 上报实时路况
                    Logger.d(TAG, "分享框准备触发上报实时路况")
                    UploadHelper.upload(context, TYPE_REAL_TIME_TRAFFIC)
-                    ShareControl.getInstance(context).dismissDialog()
+                    ServiceApisManager.serviceApis.shareManager.dismissShareDialog()
+//                    ShareControl.getInstance(context).dismissDialog()
                }
            }
        }
--- 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
@@ -7,7 +7,6 @@ import com.mogo.commons.data.BaseData
 import com.mogo.commons.network.SubscribeImpl
 import com.mogo.commons.voice.AIAssist
 import com.mogo.commons.voice.IMogoVoiceCmdCallBack
-import com.mogo.module.share.ShareControl
 import com.mogo.module.share.bean.SeekRecord
 import com.mogo.module.share.bean.SeekRequest
 import com.mogo.module.share.bean.getJson
@@ -20,7 +19,6 @@ import com.mogo.utils.storage.SharedPrefsMgr
 import com.zhidao.auto.platform.util.DeviceUtil
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
-import java.util.*

 /**
 * 故障求助管理类，相关故障求助操作的具体实现类
@@ -73,7 +71,6 @@ object SeekHelpManager {

    }

-
    /**
     * 寻求帮助，是开始故障求助的入口
     * 由于当前需求仅需要提供这一个方法，所以context的初始化放到了此方法，后面如果有增加，需要把这部分提出去
@@ -88,7 +85,8 @@ object SeekHelpManager {
                this.context = context
            }
            aiAssist = AIAssist.getInstance(context)
-            isSeekHelp = ShareControl.getInstance(SeekHelpManager.context).mogoServiceApis.statusManagerApi.isSeekHelping
+
+            isSeekHelp = ServiceApisManager.serviceApis.statusManagerApi.isSeekHelping
            Logger.d(TAG, "开始故障求助上报---${isSeekHelp}")
            seekListenerList.add(seekHelpListener)
            when {
@@ -157,11 +155,11 @@ object SeekHelpManager {
        val seekRequest = SeekRequest(DeviceUtil.getSn())
        val param = mutableMapOf("data" to seekRequest.getJson())

-        ShareControl.getInstance(context).mogoServiceApis.networkApi.create(ShareApiService::class.java, HttpConstant.getNetHost()).sendHelpSignal(param).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(object : SubscribeImpl<BaseData>(RequestOptions.create(context)) {
+        ServiceApisManager.serviceApis.networkApi.create(ShareApiService::class.java, HttpConstant.getNetHost()).sendHelpSignal(param).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(object : SubscribeImpl<BaseData>(RequestOptions.create(context)) {
            override fun onSuccess(o: BaseData?) {
                super.onSuccess(o)
                // 接口请求成功，内部同步v2x状态，通知adas，改变自车图标
-                ShareControl.getInstance(context).mogoServiceApis.statusManagerApi.setSeekHelping("ShareDialog", true)
+                ServiceApisManager.serviceApis.statusManagerApi.setSeekHelping("ShareDialog", true)
                SharedPrefsMgr.getInstance(context!!).putLong("seek_help_time", System.currentTimeMillis())
                isSeekHelp = true
                aiAssist?.speakTTSVoice("已发布求助信息，将为你通知其他车主")
@@ -213,11 +211,11 @@ object SeekHelpManager {
    fun debugCancelSeek() {
        val seekRequest = SeekRequest(DeviceUtil.getSn(), 0)
        val param = mutableMapOf("data" to seekRequest.getJson())
-        ShareControl.getInstance(context).mogoServiceApis.networkApi.create(ShareApiService::class.java, HttpConstant.getNetHost()).sendHelpSignal(param).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(object : SubscribeImpl<BaseData>(RequestOptions.create(context)) {
+       ServiceApisManager.serviceApis.networkApi.create(ShareApiService::class.java, HttpConstant.getNetHost()).sendHelpSignal(param).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(object : SubscribeImpl<BaseData>(RequestOptions.create(context)) {
            override fun onSuccess(o: BaseData?) {
                super.onSuccess(o)
                // 接口请求成功，内部同步v2x状态，通知adas，改变自车图标
-                ShareControl.getInstance(context).mogoServiceApis.statusManagerApi.setSeekHelping("ShareDialog", false)
+                ServiceApisManager.serviceApis.statusManagerApi.setSeekHelping("ShareDialog", false)
                isSeekHelp = false
            }

--- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/ServiceApisManager.kt
+++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/ServiceApisManager.kt
@@ -0,0 +1,17 @@
+package com.mogo.module.share.manager
+
+import android.content.Context
+import com.alibaba.android.arouter.launcher.ARouter
+import com.mogo.service.IMogoServiceApis
+import com.mogo.service.MogoServicePaths
+
+/**
+ * 全局管理IMogoServiceApis
+ */
+object ServiceApisManager {
+    lateinit var serviceApis: IMogoServiceApis
+
+    fun init(context: Context) {
+        serviceApis = ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS).navigation(context) as IMogoServiceApis
+    }
+}
--- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/UploadHelper.kt
+++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/UploadHelper.kt
@@ -11,7 +11,7 @@ import com.mogo.utils.logger.Logger
 */
 object UploadHelper {
    fun upload(context:Context, type: String) {
-        ShareControl.getInstance(context).mogoServiceApis.statusManagerApi.setUploadingStatus("CARD_TYPE_ROAD_CONDITION", true)
+        ServiceApisManager.serviceApis.statusManagerApi.setUploadingStatus("CARD_TYPE_ROAD_CONDITION", true)
        Logger.d("UploadHelper", "upload ----> $type")
        val intent = Intent()
        intent.action = "com.zhidao.roadcondition.share"