Merge branch 'dev_robotaxi-d-app-module_2110_220915_2.11.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_robotaxi-d-app-module_2110_220915_2.11.0

OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/BusProvider.java

@@ -1,3 +1,4 @@
+
 package com.mogo.och.bus;
 
 import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS;
@@ -6,10 +7,10 @@ import android.content.Context;
 
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
-import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
 import com.mogo.map.MogoMapUIController;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.och.bus.constant.BusConst;
@@ -50,14 +51,20 @@ public class BusProvider implements IMogoOCH {
     }
 
     private void showFragment() {
+        FragmentManager supportFragmentManager = activity.getSupportFragmentManager();
         if (busFragment == null) {
             CallerLogger.INSTANCE.d(TAG, "准备add fragment======");
-            busFragment = new BusFragment();
+            Fragment fragmentByTag = supportFragmentManager.findFragmentByTag(BusFragment.TAG);
-            activity.getSupportFragmentManager().beginTransaction().add(containerId, busFragment).commitAllowingStateLoss();
+            if(fragmentByTag instanceof BusFragment){
+                busFragment = (BusFragment)fragmentByTag;
+            }else {
+                busFragment = new BusFragment();
+            }
+            supportFragmentManager.beginTransaction().add(containerId, busFragment,BusFragment.TAG).commitAllowingStateLoss();
             return;
         }
         CallerLogger.INSTANCE.d(TAG, "准备show fragment");
-        activity.getSupportFragmentManager().beginTransaction().show(busFragment).commitAllowingStateLoss();
+        supportFragmentManager.beginTransaction().show(busFragment).commitAllowingStateLoss();
     }
 
     private void hideFragment() {

OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java

@@ -50,7 +50,7 @@ import java.util.List;
  */
 public class BusFragment extends BaseBusTabFragment<BusFragment, BusPresenter>
         implements SlidePanelView.OnSlidePanelMoveToEndListener, View.OnClickListener {
-    private static final String TAG = "BusFragment";
+    public static final String TAG = "BusFragment";
 
     private TextView mSwitchLine; //切换路线
     private TextView mLineName;

OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/adapter/SwitchLineAdapter.kt

@@ -6,6 +6,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import androidx.appcompat.widget.AppCompatTextView
+import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.mogo.och.bus.R
@@ -77,12 +78,14 @@ class SwitchLineAdapter(
         if(line.open){
             if(line.taskList==null||line.taskList.isEmpty()){
                 holder.actvShowMore.text = mContext.getString(R.string.bus_switch_line_no_task)
+                holder.actvShowMore.setTextColor(ContextCompat.getColor(mContext,R.color.bus_color_4dffffff))
                 holder.vLineTask.visibility = View.GONE
                 holder.rvLineTask.visibility = View.GONE
                 holder.selectIv.visibility =  View.INVISIBLE
                 holder.itemView.setBackgroundResource(R.drawable.bus_shape_select_line_item_bg_normal)
             }else {
                 holder.actvShowMore.text = mContext.getString(R.string.bus_switch_line_select_task)
+                holder.actvShowMore.setTextColor(ContextCompat.getColor(mContext,android.R.color.white))
                 holder.vLineTask.visibility = View.VISIBLE
                 holder.rvLineTask.visibility = View.VISIBLE
                 holder.selectIv.visibility =  View.VISIBLE
@@ -96,12 +99,14 @@ class SwitchLineAdapter(
         }else{
             if(line.haveTask){
                 holder.actvShowMore.text = mContext.getString(R.string.bus_switch_line_no_task)
+                holder.actvShowMore.setTextColor(ContextCompat.getColor(mContext,R.color.bus_color_4dffffff))
                 holder.vLineTask.visibility = View.GONE
                 holder.rvLineTask.visibility = View.GONE
                 holder.selectIv.visibility =  View.INVISIBLE
                 holder.itemView.setBackgroundResource(R.drawable.bus_shape_select_line_item_bg_normal)
             }else {
                 holder.actvShowMore.text = mContext.getString(R.string.bus_switch_line_select_task)
+                holder.actvShowMore.setTextColor(ContextCompat.getColor(mContext,android.R.color.white))
                 holder.vLineTask.visibility = View.GONE
                 holder.rvLineTask.visibility = View.GONE
                 holder.selectIv.visibility = View.VISIBLE

OCH/mogo-och-bus/src/main/res/layout/bus_switch_line_list_item.xml

@@ -12,6 +12,7 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/dp_13"
         android:text="选择时间"
+        android:gravity="center"
         android:textColor="@android:color/white"
         android:textSize="@dimen/dp_40"
         app:layout_constraintTop_toTopOf="@+id/switch_line_item_select_iv"
@@ -38,7 +39,6 @@
         android:maxLines="2"
         android:textColor="@android:color/white"
         android:textSize="@dimen/dp_46"
-        android:textStyle="bold"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="@string/bus_switch_line_name" />
@@ -50,7 +50,7 @@
         android:layout_marginTop="@dimen/dp_20"
         android:layout_marginBottom="@dimen/dp_35"
         android:singleLine="true"
-        android:textColor="@color/bus_color_b9c3e9"
+        android:textColor="@color/bus_color_ccb9c3e9"
         android:textSize="@dimen/dp_36"
         app:layout_constraintBottom_toTopOf="@+id/v_line_task"
         app:layout_constraintStart_toStartOf="@+id/switch_line_name"
@@ -64,7 +64,7 @@
         android:layout_height="1px"
         android:layout_marginStart="@dimen/dp_80"
         android:layout_marginEnd="@dimen/dp_80"
-        android:background="#88ffffff"
+        android:background="#63ffffff"
         android:visibility="gone"
         app:layout_constraintBottom_toTopOf="@+id/rv_line_task_list"
         app:layout_constraintEnd_toEndOf="parent"

OCH/mogo-och-bus/src/main/res/values/colors.xml

@@ -33,7 +33,7 @@
     <color name="bus_switch_map_bg_c">#323C6F</color>
 
     <color name="switch_line">#2966EC</color>
-    <color name="bus_switch_line_bg">#F0151D41</color>
+    <color name="bus_switch_line_bg">#F7151D41</color>
 
     <color name="bus_switch_btn_bg_half">#19FFFFFF</color>
     <color name="bus_white">#FFFFFF</color>
@@ -46,7 +46,8 @@
     <color name="bus_traffic_light_yellow_color_down">#FFFF9B00</color>
     <color name="bus_arrived_btn_un_clickable_color">#59FFFFFF</color>
 
-    <color name="bus_color_b9c3e9">#B9C3E9 </color>
+    <color name="bus_color_ccb9c3e9">#CCB9C3E9</color>
+    <color name="bus_color_4dffffff">#4Dffffff</color>
 
     <color name="bus_station_tag_txt_un_color">#8E9DD4</color>
     <color name="bus_task_time_bg_color">#2B6EFF</color>

OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/comment/TaxiPassengerArrivedView.kt

@@ -305,18 +305,24 @@ class TaxiPassengerArrivedView :RelativeLayout, View.OnClickListener {
 
     private fun startChangeHeightAnimarion() {
         // 815 除了 点评的高度
-        val resizeAnimation = ResizeAnimation(clCommentContain,923+rvCommentList.height, clCommentContain.height)
+        val resizeAnimation = ResizeAnimation(clCommentContain,913+rvCommentList.height, clCommentContain.height)
         resizeAnimation.duration = 300
         resizeAnimation.setAnimationListener(object :Animation.AnimationListener{
             override fun onAnimationStart(animation: Animation?) {
                 rvCommentList.visibility = View.VISIBLE
-                btnSubmit.visibility = View.VISIBLE
             }
 
             override fun onAnimationEnd(animation: Animation?) {
                 allStartOrdered.forEach {
                     it.isEnabled = true
                 }
+                if(btnSubmit.visibility==View.GONE||btnSubmit.visibility==View.INVISIBLE) {
+                    btnSubmit.visibility = View.VISIBLE
+                    val showAnimator = ObjectAnimator.ofFloat(btnSubmit, "alpha", 0.1f, 1f)
+                    showAnimator.duration = 600
+                    showAnimator.start()
+                }
+
             }
 
             override fun onAnimationRepeat(animation: Animation?) {

OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/comment/adapter/CommentAdapter.kt

@@ -19,6 +19,19 @@ class CommentAdapter(private val context: Context?,private val itemDataList: Mut
     fun addAll(itemDataList: MutableList<TaxiPassengerStarWorld>){
         this.itemDataList.clear()
         this.itemDataList.addAll(itemDataList)
+        // region 临时代码
+        var needMove:TaxiPassengerStarWorld?=null
+        itemDataList.forEachIndexed { index, taxiPassengerStarWorld ->
+            if(taxiPassengerStarWorld.labelInfo=="频繁急停急刹"){
+                needMove = taxiPassengerStarWorld
+                return@forEachIndexed
+            }
+        }
+        needMove?.let {
+            this.itemDataList.remove(it)
+            this.itemDataList.add(this.itemDataList.size-1,it)
+        }
+        // endregion
         this.notifyDataSetChanged()
     }
     fun getSelectComment(): List<TaxiPassengerStarWorld> {

OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml

@@ -29,7 +29,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/dp_109"
-        android:layout_marginBottom="@dimen/dp_110"
+        android:layout_marginBottom="@dimen/dp_30"
         app:bgColor="@color/taxi_p_map_bg"
         app:blurRadius="@dimen/dp_60"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -56,15 +56,7 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
-            <ImageView
+
-                android:id="@+id/iv_bottom_light"
-                app:layout_constraintBottom_toBottomOf="parent"
-                android:src="@drawable/taxi_p_arrived_end_light"
-                app:layout_constraintStart_toStartOf="parent"
-                android:rotation="180"
-                app:layout_constraintEnd_toEndOf="parent"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
             <View
                 android:id="@+id/bg_taxi_p_arrived_info_yello_v"
                 app:layout_constraintStart_toStartOf="parent"
@@ -226,16 +218,25 @@
                 android:gravity="center"
                 android:visibility="invisible"
                 android:textColor="@color/taxi_order_status_textColor"
-                app:layout_constraintTop_toBottomOf="@+id/rv_comment_list"
+                app:layout_constraintBottom_toTopOf="@+id/iv_bottom_light"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 android:background="@drawable/taxi_p_comment_submit"
                 android:textSize="@dimen/sp_42"
                 android:height="120px"
-                android:layout_marginTop="33px"
                 android:layout_width="450px"
                 android:layout_height="wrap_content"/>
 
+            <ImageView
+                android:id="@+id/iv_bottom_light"
+                android:layout_width="match_parent"
+                android:layout_height="95px"
+                android:rotation="180"
+                android:src="@drawable/taxi_p_arrived_end_light"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent" />
+
         </androidx.constraintlayout.widget.ConstraintLayout>
     </com.mogo.och.common.module.wigets.OCHBorderShadowLayout>
 
@@ -245,7 +246,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/dp_109"
-        android:layout_marginBottom="@dimen/dp_110"
+        android:layout_marginBottom="@dimen/dp_30"
         app:bgColor="@color/taxi_p_map_bg"
         app:blurRadius="@dimen/dp_60"
         app:layout_constraintBottom_toBottomOf="parent"

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/funcconfig/FuncConfigCenter.kt

@@ -7,9 +7,12 @@ import com.mogo.commons.AbsMogoApplication
 import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_FUNC_CONFIG_CHANGED
 import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_CLOUD_SHOW
 import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_LOG_CONNECT_STATUS
+import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotCarConfigListener
+import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotCarConfigListenerManager
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsFuncConfigListenerManager
 import com.mogo.eagle.core.utilcode.util.GsonUtils
 import com.mogo.eagle.core.utilcode.util.SPUtils
+import com.mogo.eagle.core.utilcode.util.ToastUtils
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import com.zhjt.mogo_core_function_devatools.funcconfig.FuncConfigConst.Companion.FUNC_CONFIG_TYPE
 import com.zhjt.mogo_core_function_devatools.funcconfig.FuncConfigConst.Companion.defaultFuncConfig
@@ -18,10 +21,14 @@ import com.zhjt.service.chain.ChainLog
 import com.zhjt.service.chain.TracingConstants
 import com.zhjt.service_biz.BizManager
 import com.zhjt.service_biz.FuncConfig
+import mogo.telematics.pad.MessagePad
 
-class FuncConfigCenter : IMogoOnMessageListener<FuncConfig> {
+class FuncConfigCenter : IMogoOnMessageListener<FuncConfig>, IMoGoAutopilotCarConfigListener {
 
     companion object {
+
+        private const val TAG = "FuncConfigCenter"
+
         val bizConfigCenter by lazy(LazyThreadSafetyMode.SYNCHRONIZED) {
             FuncConfigCenter()
         }
@@ -34,17 +41,24 @@ class FuncConfigCenter : IMogoOnMessageListener<FuncConfig> {
         mContext = context
         MogoAiCloudSocketManager.getInstance(AbsMogoApplication.getApp().applicationContext)
             .registerOnMessageListener(FUNC_CONFIG_TYPE, this)
-        UiThreadHandler.postDelayed({
+        CallerAutopilotCarConfigListenerManager.addListener(TAG, this)
-            funcConfigNetWorkModel.requestFuncConfig({
+    }
-                SPUtils.getInstance("biz_config").put("config", GsonUtils.toJson(it))
-                refreshConfig(it)
-            }, {
-                val bizJson = SPUtils.getInstance("biz_config")
-                    .getString("config", GsonUtils.toJson(defaultFuncConfig()))
-                refreshConfig(GsonUtils.fromJson(bizJson, FuncConfig::class.java))
-            })
-        }, 1000L * 5)
 
+    override fun onAutopilotCarConfig(carConfigResp: MessagePad.CarConfigResp) {
+        if (!carConfigResp.macAddress.isNullOrEmpty()) {
+            UiThreadHandler.post {
+                funcConfigNetWorkModel.requestFuncConfig({
+                    SPUtils.getInstance("biz_config").put("config", GsonUtils.toJson(it))
+                    refreshConfig(it)
+                }, {
+                    val bizJson = SPUtils.getInstance("biz_config")
+                        .getString("config", GsonUtils.toJson(defaultFuncConfig()))
+                    refreshConfig(GsonUtils.fromJson(bizJson, FuncConfig::class.java))
+                })
+            }
+        }else{
+            ToastUtils.showLong("未获取到域控mac信息")
+        }
     }
 
     override fun target(): Class<FuncConfig> {
@@ -78,7 +92,9 @@ class FuncConfigCenter : IMogoOnMessageListener<FuncConfig> {
     fun onDestroy() {
         MogoAiCloudSocketManager.getInstance(AbsMogoApplication.getApp().applicationContext)
             .unregisterLifecycleListener(FUNC_CONFIG_TYPE)
+        CallerAutopilotCarConfigListenerManager.removeListener(TAG)
         mContext = null
     }
 
+
 }

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/funcconfig/network/FuncConfigNetWorkModel.kt

@@ -34,8 +34,11 @@ class FuncConfigNetWorkModel {
                     error = onError
                 }
                 map["sn"] = MoGoAiCloudClientConfig.getInstance().sn
+//                map["sn"] = "X20202203105S688HZ"
                 map["mac"] = DeviceUtils.getMacAddress()
+//                map["mac"] = "48:b0:2d:3a:bc:78"
                 map["channelVersion"] = FuncConfigConst.getChannelCode()
+//                map["channelVersion"] = 1
             }
             loader {
                 apiCall {

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt

@@ -1878,7 +1878,7 @@ class DebugSettingView @JvmOverloads constructor(
                 if(lock){
                     tbReportWarning.background = resources.getDrawable(R.drawable.radio_button_lock_background)
                 }else{
-                    tbReportWarning.background = resources.getDrawable(R.drawable.radio_button_normal_background_right)
+                    tbReportWarning.background = null
                 }
             }
             BIZ_BAG_RECORD -> {
@@ -1888,7 +1888,7 @@ class DebugSettingView @JvmOverloads constructor(
                 } else {
                     btnRecordBag.isClickable = true
                     btnRecordBag.requestFocus()
-                    btnRecordBag.background = resources.getDrawable(R.drawable.radio_button_normal_background_right)
+                    btnRecordBag.background = null
                 }
             }
             BIZ_FULL_LOG -> {
@@ -1898,7 +1898,7 @@ class DebugSettingView @JvmOverloads constructor(
                 } else {
                     tbLogCatch.isClickable = true
                     tbLogCatch.requestFocus()
-                    tbLogCatch.background = resources.getDrawable(R.drawable.radio_button_normal_background_right)
+                    tbLogCatch.background = null
                 }
             }
         }

core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml

@@ -649,7 +649,6 @@
                     android:id="@+id/btnRecordBag"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:background="@drawable/radio_button_normal_background_right"
                     android:gravity="center"
                     android:padding="@dimen/dp_5"
                     android:text="录制Bag包"
@@ -1188,7 +1187,6 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_margin="@dimen/dp_10"
-                        android:background="@drawable/radio_button_normal_background_right"
                         android:textColor="#000"
                         android:textOff="开启异常上报提示"
                         android:textOn="关闭异常上报提示"