Merge branch 'dev_robotaxi-d_230412_2.15.0' of gitlab.zhidaoauto.com:SCA/L4HA/AndroidApp/MoGoEagleEye into dev_robotaxi-d_230412_2.15.0

2023-04-20 16:04:30 +08:00
parent ae684d4fc9 93b92892b4
commit ef347a66cc
10 changed files with 158 additions and 49 deletions
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.java
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.java
@@ -162,6 +162,7 @@ public class BaseTaxiPassengerPresenter extends Presenter<TaxiPassengerBaseFragm
        if (TaxiPassengerOrderStatusEnum.Cancel.getCode() == order.orderStatus){
            runOnUIThread(() -> {
                mView.showOrHideServingOrderFragment(false,true);
+                mView.showOrHideOverMapViewFragment(false);
                mView.showOrHideStartAutopilotView(false,false);
                mView.showOrHidePressengerCheckPager(false, "",
                        "", "", "", "");
@@ -217,6 +218,7 @@ public class BaseTaxiPassengerPresenter extends Presenter<TaxiPassengerBaseFragm
            TaxiPassengerModel.getInstance().recoverNaviInfo();
            TaxiPassengerModel.getInstance().startOrStopRouteAndWipe(false);
            TaxiPassengerGeocodeSearchModel.getInstance(getContext()).destroyGeocodeSearch();
+            mView.showOrHideOverMapViewFragment(false);
            runOnUIThread(() -> {
                mView.showOrHideServingOrderFragment(false,true);
                mView.showOrHideArrivedEndLayout(true, order.endSiteAddr,order.orderNo);
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/OverviewFragment.kt
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/OverviewFragment.kt
@@ -1,16 +1,33 @@
 package com.mogo.och.taxi.passenger.ui

+import android.content.Context
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.mogo.commons.mvp.BaseFragment
+import com.mogo.eagle.core.function.call.biz.CallerFuncBizManager
 import com.mogo.eagle.core.function.view.OverMapView
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
+import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
+import com.mogo.eagle.core.utilcode.util.UiThreadHandler
+import com.mogo.och.taxi.passenger.constant.TaxiPassengerOrderStatusEnum
+import com.mogo.och.taxi.passenger.model.TaxiPassengerModel
+import com.mogo.och.taxi.passenger.ui.leftmenu.OverlayLeftViewUtils
+import io.reactivex.Observable
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.disposables.Disposable
+import java.util.concurrent.TimeUnit

 class OverviewFragment : BaseFragment() {

    private var overmapview: OverMapView?=null

+    private var lifeVisable2User = false
+    private var finalVisable2User = false
+
+    private var subscribe: Disposable?=null
+
    override fun onCreateView(
        inflater: LayoutInflater,
        container: ViewGroup?,
@@ -23,24 +40,83 @@ class OverviewFragment : BaseFragment() {
            viewGroup.removeView(overmapview)
        }
        overmapview?.onCreateView(savedInstanceState)
+        CallerLogger.d(SceneConstant.M_TAXI_P + TAG,"onCreateView")
+        statusChange(TaxiPassengerModel.getInstance().curOrderStatus)
        return overmapview!!
    }

    override fun onResume() {
        super.onResume()
        overmapview?.onResume()
+        CallerLogger.d(SceneConstant.M_TAXI_P + TAG,"onResume")
+        lifeVisable2User = true
+        checkVisable()
    }

    override fun onPause() {
        super.onPause()
        overmapview?.onPause()
+        CallerLogger.d(SceneConstant.M_TAXI_P + TAG,"onPause")
+        lifeVisable2User = false
+        checkVisable()
+    }
+
+    private fun checkVisable() {
+
+        subscribe?.let {
+            if (!it.isDisposed) {
+                it.dispose()
+            }
+        }
+        subscribe = Observable.timer(500, TimeUnit.MILLISECONDS)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe {
+                if(lifeVisable2User){//展示
+                    if(!finalVisable2User){
+                        CallerLogger.d(SceneConstant.M_TAXI_P + TAG,"正在展示")
+                        finalVisable2User = true
+                        statusChange(TaxiPassengerModel.getInstance().curOrderStatus)
+                    }
+
+                }else{//没有展示
+                    if(finalVisable2User){
+                        CallerLogger.d(SceneConstant.M_TAXI_P + TAG,"已经隐藏")
+                        finalVisable2User = false
+                        stopAndClear()
+                    }
+                }
+            }
    }

    override fun onDestroy() {
        super.onDestroy()
        overmapview?.onDestroy()
+        CallerLogger.d(SceneConstant.M_TAXI_P + TAG,"onDestroy")
    }

+    private fun statusChange(currentStatusEnum: TaxiPassengerOrderStatusEnum){
+        CallerLogger.d(SceneConstant.M_TAXI_P + TAG,"状态变更最新状态：$currentStatusEnum")
+        when (currentStatusEnum) {
+            TaxiPassengerOrderStatusEnum.OnTheWayToEnd -> {
+                CallerFuncBizManager.bizProvider.getAllV2XEvents()
+            }
+            TaxiPassengerOrderStatusEnum.ArriveAtEnd,TaxiPassengerOrderStatusEnum.JourneyCompleted,
+            TaxiPassengerOrderStatusEnum.Cancel -> {
+                // stop clear
+                stopAndClear()
+            }
+            else -> {}
+        }
+    }
+
+    private fun stopAndClear(){
+        CallerFuncBizManager.bizProvider.stopQueryV2XEvents()
+        UiThreadHandler.post({
+            overmapview?.clearV2XMarkers()
+        }, UiThreadHandler.MODE.QUEUE)
+    }
+
+
    override fun getLayoutId(): Int {
        return 0
    }
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java
@@ -11,6 +11,7 @@ import android.widget.ImageView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.FragmentTransaction;
+import androidx.lifecycle.Lifecycle;

 import com.mogo.commons.module.status.MogoStatusManager;
 import com.mogo.commons.mvp.MvpFragment;
@@ -356,21 +357,25 @@ public class TaxiPassengerBaseFragment extends MvpFragment<TaxiPassengerBaseFrag
            if (overviewFragment.isHidden()) {
                transaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
                        .show(overviewFragment).commitAllowingStateLoss();
+                transaction.setMaxLifecycle(overviewFragment, Lifecycle.State.RESUMED);
                return;
            }
            if (overviewFragment.isAdded()) {
                transaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
                        .show(overviewFragment).commitAllowingStateLoss();
+                transaction.setMaxLifecycle(overviewFragment, Lifecycle.State.RESUMED);
                return;
            }
            transaction
                    .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
                    .add(R.id.fl_container_overview, overviewFragment)
                    .show(overviewFragment).commitAllowingStateLoss();
+            transaction.setMaxLifecycle(overviewFragment, Lifecycle.State.RESUMED);
        } else {
            if (overviewFragment != null) {
                transaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_CLOSE)
                        .hide(overviewFragment).commitAllowingStateLoss();
+                transaction.setMaxLifecycle(overviewFragment, Lifecycle.State.STARTED);
            }
        }
    }
--- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt
+++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt
@@ -1,6 +1,7 @@
 package com.mogo.eagle.core.function.datacenter.obu

 import android.content.Context
+import android.util.Log
 import com.mogo.eagle.core.data.app.AppConfigInfo
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.data.config.HmiBuildConfig
@@ -100,7 +101,9 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener {
     * 上传obu文件的状态, 升级成功，需要删除obu的文件和解压文件夹
     */
    override fun onUpgradeStatus(status: ObuSoftwareUpgradeStatus?, t: Throwable?) {
-        CallerLogger.d("$M_OBU${MogoObuConst.TAG_UPGRADE_OBU}", "onUpgradeStatus status = $status ")
+        if (t != null) {
+            CallerLogger.d("$M_OBU${MogoObuConst.TAG_UPGRADE_OBU}", "onUpgradeStatus status = $status  --- t = ${t.cause.toString()}")
+        }
        //上传完成就相当于成功了，立即升级，比上电升级，只是多了一个重启
        if (status == ObuSoftwareUpgradeStatus.UPLOAD_FINISH || status == ObuSoftwareUpgradeStatus.EXEC_UPGRADE_PROGRAM_FINISH
            || status == ObuSoftwareUpgradeStatus.CONNECTION_FAILED || status == ObuSoftwareUpgradeStatus.AUTHENTICATION_FAILED
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt
@@ -185,7 +185,6 @@ class DevaToolsProvider : IDevaToolsProvider {

    override fun updateUpgradeProgress() {
        upgradeManager.updateUpgradeProgress(mContext!!)
-        upgradeManager.updateObuUpgradeStatus(mContext!!)
    }

    override fun showStatusBar(ctx: Context, container: ViewGroup) {
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarManager.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarManager.kt
@@ -185,6 +185,7 @@ class BindingCarManager : IMoGoAutopilotCarConfigListener {
     * obu的升级,只需要司机屏连接
     */
    fun queryObuUpgrade(obuVersionName: String) {
+        CallerLogger.d("${SceneConstant.M_OBU}${MogoObuConst.TAG_UPGRADE_OBU}", "screenType = $screenType ----role = $role")
        if (screenType == 1) {
            CallerLogger.d("${SceneConstant.M_OBU}${MogoObuConst.TAG_UPGRADE_OBU}","queryObuUpgrade isConnected =  ${CallerObuApiManager.isConnected()} --- mAddress = $mAddress")
            ObuUpgradeAppNetWorkManager.instance?.getObuUpgradeInfo(mContext, if(!mAddress.isNullOrEmpty()) mAddress else SharedPrefsMgr.getInstance(mContext!!).getString(SharedPrefsConstants.APP_MAC), obuVersionName)
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/ObuUpgradeAppNetWorkManager.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/ObuUpgradeAppNetWorkManager.kt
@@ -1,9 +1,11 @@
 package com.zhjt.mogo_core_function_devatools.upgrade

 import android.content.*
+import android.util.Log
 import com.mogo.cloud.passport.*
 import com.mogo.commons.constants.*
 import com.mogo.eagle.core.data.deva.bindingcar.*
+import com.mogo.eagle.core.data.obu.MogoObuConst.TAG_UPGRADE_OBU
 import com.mogo.eagle.core.function.api.devatools.download.DownloadType.OBU
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager.downLoadPackage
 import com.mogo.eagle.core.function.call.obu.CallerObuApiManager.deleteObuFile
@@ -43,22 +45,22 @@ class ObuUpgradeAppNetWorkManager private constructor() {
        scope.launch {
            try {
                val sn = MoGoAiCloudClientConfig.getInstance().sn
-                d(SceneConstant.M_BINDING + TAG, "getObuUpgradeInfo mac = $mac ---sn = $sn ---versionName = $versionName")
+                d(SceneConstant.M_BINDING + TAG_UPGRADE_OBU, "getObuUpgradeInfo mac = $mac ---sn = $sn ---versionName = $versionName --host = ${HostConst.getHost()}")
                val request = UpgradeAppRequest(sn, mac, "7", null, "0")
                val requestBody = RequestBody.create(MediaType.get("application/json;charset=UTF-8"), GsonUtil.jsonFromObject(request))
                val info = mUpgradeApiService.getUpgradeInfo(requestBody)
                if (info.result == null) {
-                    d(SceneConstant.M_BINDING + TAG, "getObuUpgradeInfo onNext info == null")
+                    d(SceneConstant.M_BINDING + TAG_UPGRADE_OBU, "getObuUpgradeInfo onNext info == null")
                    deleteObuFile()
                } else {
-                    d(SceneConstant.M_BINDING + TAG, "getObuUpgradeInfo appFileName = " + info.result.appFileName + " ----url = " + info.result.appUrl + " ----name = " + info.result.versionName + " --obuVersionName =" + versionName + " ---info.result = " + info.result)
+                    d(SceneConstant.M_BINDING + TAG_UPGRADE_OBU, "getObuUpgradeInfo appFileName = " + info.result.appFileName + " ----url = " + info.result.appUrl + " ----name = " + info.result.versionName + " --obuVersionName =" + versionName + " ---info.result = " + info.result)
                    if (info.result.versionName.toString() != versionName) { //判断是否下载,当文件名称不一致的时候，就下载
                        downLoadPackage(OBU, info.result.appFileName, info.result.appUrl)
                    }
                }
            } catch (t: Throwable) {
                t.printStackTrace()
-                e(SceneConstant.M_BINDING + TAG, "getObuUpgradeInfo e = $t") //请求出错，需要删除相关文件
+                e(SceneConstant.M_BINDING + TAG_UPGRADE_OBU, "getObuUpgradeInfo e = $t") //请求出错，需要删除相关文件
                deleteObuFile()
            }
        }
@@ -66,7 +68,6 @@ class ObuUpgradeAppNetWorkManager private constructor() {

    companion object {
        @Volatile private var requestNoticeManager: ObuUpgradeAppNetWorkManager? = null
-        private const val TAG = "ObuUpgrade"
        val instance: ObuUpgradeAppNetWorkManager?
            get() {
                if (requestNoticeManager == null) {
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeManager.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeManager.kt
@@ -207,6 +207,8 @@ class UpgradeManager : IDownload {
                        }
                    }
                }
+            } else if (type == OBU) {
+                handleObuUpgrade(localPath)
            }
            CallerDevaToolsUpgradeListenerManager.invokeUpgradeFinish(downloadUrl, localPath)
        }
@@ -219,6 +221,10 @@ class UpgradeManager : IDownload {
            val type = types[downloadUrl]
            if (type == APK || type == PATCH) {
                scope.launch { upgradeProvider?.recordDownloadFailed(downloadUrl,errorMsg ?: "下载失败") }
+            } else if (type == OBU) {
+                CallerLogger.e("${SceneConstant.M_OBU}${MogoObuConst.TAG_UPGRADE_OBU}", "----updateObuUpgradeStatus errorMsg = $errorMsg ")
+                //下载失败，删除文件夹
+                CallerObuApiManager.deleteObuFile()
            }
        }
    }
@@ -258,48 +264,63 @@ class UpgradeManager : IDownload {
            })
    }

+    /**
+     * 对下载的obu文件进行处理
+     */
+    private fun handleObuUpgrade(localPath: String) {
+        //下载完成，解压文件
+        try {
+            CallerLogger.d("${SceneConstant.M_OBU}${MogoObuConst.TAG_UPGRADE_OBU}", " onFinished localPath = $localPath")
+            Log.d("liyz", " onFinished localPath = $localPath")
+            val dest = File(localPath)
+            val files = ZipUtils.unzipFile(localPath, Config.downLoadUnzipObuPath)
+            CallerLogger.d("${SceneConstant.M_OBU}${MogoObuConst.TAG_UPGRADE_OBU}", " onFinished file = ${Config.downLoadObuPath + dest.name} -----files = $files ")
+            //1传给obu升级,升级成功，2需要删除相应文件夹
+            var md5Path = ""
+            var tarPath = ""
+            for (f in files) {
+                if (f.path.contains(".md5")) {
+                    md5Path = f.path
+                }
+                if (f.path.contains(".gz")) {
+                    tarPath = f.path
+                }
+            }
+            CallerLogger.d("${SceneConstant.M_OBU}${MogoObuConst.TAG_UPGRADE_OBU}", "updateObuUpgradeStatus ---md5Path = $md5Path -----tarPath = $tarPath ")
+            CallerObuApiManager.uploadObuPack(arrayOf(md5Path, tarPath))
+        } catch (e: IOException) {
+            CallerLogger.e("${SceneConstant.M_OBU}${MogoObuConst.TAG_UPGRADE_OBU}", "----updateObuUpgradeStatus e = $e ")
+            //解压失败,删除文件夹
+            CallerObuApiManager.deleteObuFile()
+            e.printStackTrace()
+        }
+    }
+
    /**
     * obu升级包下载监听
     */
-    fun updateObuUpgradeStatus(context: Context) {
-        CallerDevaToolsUpgradeListenerManager.addListener(
-            TAG,
-            object : IMogoDevaToolsUpgradeListener {
-                override fun onStart(url: String?) {}
-                override fun onPause(url: String?) {}
-                override fun onProgress(url: String?, length: Int) {
-                }
-
-                override fun onFinished(url: String?, localPath: String) {
-                    //下载完成，解压文件
-                    try {
-                        val dest = File(localPath)
-                        val files = ZipUtils.unzipFile(localPath, Config.downLoadUnzipObuPath)
-                        CallerLogger.d("${SceneConstant.M_OBU}${MogoObuConst.TAG_UPGRADE_OBU}", " onFinished file = ${Config.downLoadObuPath + dest.name} -----files = $files ")
-                        //1传给obu升级,升级成功，2需要删除相应文件夹
-                        var md5Path = ""
-                        var tarPath = ""
-                        for (f in files) {
-                            if (f.path.contains(".md5")) {
-                                md5Path = f.path
-                            }
-                            if (f.path.contains(".gz")) {
-                                tarPath = f.path
-                            }
-                        }
-                        CallerLogger.d("${SceneConstant.M_OBU}${MogoObuConst.TAG_UPGRADE_OBU}", "updateObuUpgradeStatus ---md5Path = $md5Path -----tarPath = $tarPath ")
-                        CallerObuApiManager.uploadObuPack(arrayOf(md5Path, tarPath))
-                    } catch (e: IOException) {
-                        //解压失败,删除文件夹
-                        CallerObuApiManager.deleteObuFile()
-                        e.printStackTrace()
-                    }
-                }
-
-                override fun onError(url: String?, errorMsg: String?) {
-                    //下载失败，删除文件夹
-                    CallerObuApiManager.deleteObuFile()
-                }
-            })
-    }
+//    fun updateObuUpgradeStatus(context: Context) {
+//        CallerDevaToolsUpgradeListenerManager.addListener(
+//            TAG,
+//            object : IMogoDevaToolsUpgradeListener {
+//                override fun onStart(url: String?) {
+//                    CallerLogger.d("${SceneConstant.M_OBU}${MogoObuConst.TAG_UPGRADE_OBU}", "----updateObuUpgradeStatus onStart ")
+//                }
+//                override fun onPause(url: String?) {
+//                    CallerLogger.d("${SceneConstant.M_OBU}${MogoObuConst.TAG_UPGRADE_OBU}", "----updateObuUpgradeStatus onPause ")
+//                }
+//                override fun onProgress(url: String?, length: Int) {
+//                }
+//
+//                override fun onFinished(url: String?, localPath: String) {
+//
+//                }
+//
+//                override fun onError(url: String?, errorMsg: String?) {
+//                    CallerLogger.e("${SceneConstant.M_OBU}${MogoObuConst.TAG_UPGRADE_OBU}", "----updateObuUpgradeStatus errorMsg = $errorMsg ")
+//                    //下载失败，删除文件夹
+//                    CallerObuApiManager.deleteObuFile()
+//                }
+//            })
+//    }
 }
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/obu/MogoObuConst.java
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/obu/MogoObuConst.java
@@ -16,7 +16,7 @@ public class MogoObuConst {
     * 自研obu 默认ip obu的taxi和bus的ip已经全部统一成1网段ip
     */
    public static String OBU_DEFAULT_IP = "192.168.1.199";
-//    public static String OBU_DEFAULT_IP = "192.168.0.53"; //obu室内环境
+//    public static String OBU_DEFAULT_IP = "192.168.0.242"; //obu室内环境

    /**
     * obu 升级tag
--- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/services/DownloadService.java
+++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/services/DownloadService.java
@@ -156,6 +156,7 @@ public class DownloadService implements InitThread.InitCallBack, DownloadCallBac
    @Override
    public void threadDownLoadFinished(String url, ThreadBean threadBean, String localPath) {
        IDownload iDownload = callBacks.get(url);
+        Log.d(DOWN_LOAD_TAG, "下载完成 -----> iDownload = " + iDownload);
        if (iDownload != null) {
            iDownload.onFinished(url, threadBean, localPath);
        }