diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/BusProvider.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/BusProvider.java index 02a9fc3d55..e60a54e1a6 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/BusProvider.java +++ b/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(); - activity.getSupportFragmentManager().beginTransaction().add(containerId, busFragment).commitAllowingStateLoss(); + Fragment fragmentByTag = supportFragmentManager.findFragmentByTag(BusFragment.TAG); + 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() { diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java index 2c05ef5b73..2bf59abf1c 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java +++ b/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 implements SlidePanelView.OnSlidePanelMoveToEndListener, View.OnClickListener { - private static final String TAG = "BusFragment"; + public static final String TAG = "BusFragment"; private TextView mSwitchLine; //切换路线 private TextView mLineName; diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/adapter/SwitchLineAdapter.kt b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/adapter/SwitchLineAdapter.kt index 8ff7865597..741fd6480e 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/adapter/SwitchLineAdapter.kt +++ b/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 diff --git a/OCH/mogo-och-bus/src/main/res/layout/bus_switch_line_list_item.xml b/OCH/mogo-och-bus/src/main/res/layout/bus_switch_line_list_item.xml index 51b6915fcb..e3afdcd016 100644 --- a/OCH/mogo-och-bus/src/main/res/layout/bus_switch_line_list_item.xml +++ b/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" diff --git a/OCH/mogo-och-bus/src/main/res/values/colors.xml b/OCH/mogo-och-bus/src/main/res/values/colors.xml index 137af8caff..38419e0daa 100644 --- a/OCH/mogo-och-bus/src/main/res/values/colors.xml +++ b/OCH/mogo-och-bus/src/main/res/values/colors.xml @@ -33,7 +33,7 @@ #323C6F #2966EC - #F0151D41 + #F7151D41 #19FFFFFF #FFFFFF @@ -46,7 +46,8 @@ #FFFF9B00 #59FFFFFF - #B9C3E9 + #CCB9C3E9 + #4Dffffff #8E9DD4 #2B6EFF diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/comment/TaxiPassengerArrivedView.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/comment/TaxiPassengerArrivedView.kt index 55a3ba0a59..6f56314a9f 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/comment/TaxiPassengerArrivedView.kt +++ b/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?) { diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/comment/adapter/CommentAdapter.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/comment/adapter/CommentAdapter.kt index ccd4886280..71334c1f80 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/comment/adapter/CommentAdapter.kt +++ b/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){ 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 { diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml index 2a5872ee2b..0f8835bef9 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml +++ b/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" /> - + + + @@ -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" diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/funcconfig/FuncConfigCenter.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/funcconfig/FuncConfigCenter.kt index 958cc1b152..b17d692106 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/funcconfig/FuncConfigCenter.kt +++ b/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 { +class FuncConfigCenter : IMogoOnMessageListener, IMoGoAutopilotCarConfigListener { companion object { + + private const val TAG = "FuncConfigCenter" + val bizConfigCenter by lazy(LazyThreadSafetyMode.SYNCHRONIZED) { FuncConfigCenter() } @@ -34,17 +41,24 @@ class FuncConfigCenter : IMogoOnMessageListener { mContext = context MogoAiCloudSocketManager.getInstance(AbsMogoApplication.getApp().applicationContext) .registerOnMessageListener(FUNC_CONFIG_TYPE, this) - UiThreadHandler.postDelayed({ - 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) + CallerAutopilotCarConfigListenerManager.addListener(TAG, this) + } + 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 { @@ -78,7 +92,9 @@ class FuncConfigCenter : IMogoOnMessageListener { fun onDestroy() { MogoAiCloudSocketManager.getInstance(AbsMogoApplication.getApp().applicationContext) .unregisterLifecycleListener(FUNC_CONFIG_TYPE) + CallerAutopilotCarConfigListenerManager.removeListener(TAG) mContext = null } + } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/funcconfig/network/FuncConfigNetWorkModel.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/funcconfig/network/FuncConfigNetWorkModel.kt index 484caf29b8..42429fdd2e 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/funcconfig/network/FuncConfigNetWorkModel.kt +++ b/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 { diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt index c5d8aae365..d27836740b 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt +++ b/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 } } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml index dd2c4e65ea..4b385e8fca 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml +++ b/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="关闭异常上报提示"