diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionSoftFragment.kt b/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionSoftFragment.kt index 680746a882..f4758cff68 100644 --- a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionSoftFragment.kt +++ b/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionSoftFragment.kt @@ -4,7 +4,6 @@ import android.content.Context import android.graphics.Color import android.graphics.drawable.ClipDrawable import android.graphics.drawable.LayerDrawable -import android.graphics.drawable.ScaleDrawable import android.media.AudioManager import android.os.Bundle import android.view.Gravity @@ -14,7 +13,6 @@ import android.widget.SeekBar.OnSeekBarChangeListener import android.widget.TextView import androidx.core.content.ContextCompat import androidx.recyclerview.widget.LinearSnapHelper -import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.SnapHelper import com.mogo.commons.mvp.MvpFragment import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger @@ -30,7 +28,6 @@ import com.mogo.och.bus.passenger.view.HorizontalDecoration import com.mogo.och.bus.passenger.view.PickerLayoutManager import com.mogo.och.common.module.utils.SoundPoolHelper import com.yangyakun.main.ui.loading.drawable.MineGradientDrawable -import com.zhidao.support.adas.high.AdasManager import kotlinx.android.synthetic.m1.bus_p_function_setting_soft_fragment.* import me.jessyan.autosize.utils.AutoSizeUtils @@ -322,6 +319,16 @@ class BusPassengerFunctionSoftFragment : if (layoutManager is PickerLayoutManager) { layoutManager.setHorizontallyScroll(enable) } + val adapter = rv_aircondition_temperature.adapter as TemperatureAdapter + if(enable){ + adapter.setEnable(true) + iv_temperature_select.visibility = View.VISIBLE + rb_wind_speed_low.setTextColor(ContextCompat.getColor(requireContext(),R.color.bus_p_m1_6647576e)) + }else{ + adapter.setEnable(false) + iv_temperature_select.visibility = View.GONE + rb_wind_speed_low.setTextColor(ContextCompat.getColor(requireContext(),R.color.bus_p_function_airconditon_pattern_text_color_selector)) + } } /** @@ -330,28 +337,30 @@ class BusPassengerFunctionSoftFragment : private fun openHeater() { CallerLogger.d(SceneConstant.M_BUS_P + TAG, "打开暖风") heaterAirEnable(false) - if (!tv_aircondition_switch.isChecked) { - return - } closeAircondition()//关闭空调 + var switch = 1; when (rg_setting_windspeed.checkedRadioButtonId) { R.id.rb_wind_speed_low -> { rb_wind_speed_middle.tag = touchTag rb_wind_speed_middle.toggle() - mPresenter?.openAndSetHeader(1) + switch = 1 } R.id.rb_wind_speed_middle -> { - mPresenter?.openAndSetHeader(1) + switch = 1 } R.id.rb_wind_speed_high -> { - mPresenter?.openAndSetHeader(2) + switch = 2 } else -> { rb_wind_speed_middle.tag = touchTag rb_wind_speed_middle.toggle() - mPresenter?.openAndSetHeader(1) + switch = 1 } } + if (!tv_aircondition_switch.isChecked) { + return + } + mPresenter?.openAndSetHeader(switch) } @@ -445,7 +454,7 @@ class BusPassengerFunctionSoftFragment : private fun setVoiceInfo() { val dp2px = AutoSizeUtils.dp2px(context, 26f)//进度条高度 - R.color.bus_p_m1_47576E + R.color.bus_p_m1_47576e val color2CBFFC = ContextCompat.getColor(requireContext(), R.color.bus_p_m1_2cbffc) val color1060FF = ContextCompat.getColor(requireContext(), R.color.bus_p_m1_1060ff) val color96A5C2 = ContextCompat.getColor(requireContext(), R.color.bus_p_m1_96a5c2) diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.kt b/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.kt index 43519e473c..6984eca699 100644 --- a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.kt +++ b/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.kt @@ -1,11 +1,13 @@ package com.mogo.och.bus.passenger.ui import android.os.Bundle +import android.view.View import androidx.fragment.app.DialogFragment import androidx.fragment.app.Fragment import com.mogo.commons.mvp.MvpFragment import com.mogo.eagle.core.function.call.hmi.CallerHmiManager import com.mogo.eagle.core.function.call.map.CallerSmpManager.hidePanel +import com.mogo.eagle.core.function.hmi.ui.msgbox.MMsgBoxButtonView import com.mogo.eagle.core.function.hmi.ui.setting.ToggleDebugView import com.mogo.eagle.core.utilcode.kotlin.onClick import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger @@ -52,29 +54,48 @@ class BusPassengerRouteFragment : true } omvOverMap.hideResetView() + viewDriverMsgBoxButton.setClickListener(object : MMsgBoxButtonView.ClickListener { + override fun showMsgBoxList(show: Boolean) { + if (show) { + viewDriverMsgBoxList.visibility = View.VISIBLE + viewDriverMsgBoxBubble.visibility = View.GONE + viewDriverMsgBoxBubble.isShowData(false) + } else { + viewDriverMsgBoxList.visibility = View.GONE + viewDriverMsgBoxBubble.visibility = View.VISIBLE + viewDriverMsgBoxBubble.isShowData(true) + } + } + + }) } - private fun openSettingPage(tab:String) { + private fun openSettingPage(tab: String) { CallerHmiManager.hideToolsView() - val fragmentByTag: Fragment? = childFragmentManager.findFragmentByTag(BusPassengerFunctionFragment.TAG) + val fragmentByTag: Fragment? = + childFragmentManager.findFragmentByTag(BusPassengerFunctionFragment.TAG) if (fragmentByTag is DialogFragment) { if (fragmentByTag.dialog != null && fragmentByTag.dialog!!.isShowing) { return } if (fragmentByTag.dialog != null && fragmentByTag.isAdded) { if (AppStateManager.currentActivity() == null) { // 没有在当前应用内 在启动页面关闭应用 - CallerLogger.d(SceneConstant.M_TAXI + LoginServiceImpl.TAG, "showLoginDialogFragment 权限验证") + CallerLogger.d( + SceneConstant.M_TAXI + LoginServiceImpl.TAG, + "showLoginDialogFragment 权限验证" + ) return } } } if (bpFunctionGroupDialogFragment?.get() == null) { - bpFunctionGroupDialogFragment = WeakReference(BusPassengerFunctionFragment.newInstance()) + bpFunctionGroupDialogFragment = + WeakReference(BusPassengerFunctionFragment.newInstance()) } val bpFunctionGroup = bpFunctionGroupDialogFragment?.get() - bpFunctionGroup?.arguments?.putString(BusPassengerFunctionFragment.SELECTTAB,tab) + bpFunctionGroup?.arguments?.putString(BusPassengerFunctionFragment.SELECTTAB, tab) if (bpFunctionGroup != null) { if (bpFunctionGroup.dialog != null && bpFunctionGroup.dialog!!.isShowing) { return @@ -85,18 +106,30 @@ class BusPassengerRouteFragment : } if (ClickUtils.isFastClick()) { bpFunctionGroup.show(parentFragmentManager, LoginServiceImpl.TAG) - CallerLogger.d(SceneConstant.M_TAXI + LoginServiceImpl.TAG, "showLoginDialogFragment 展示登录界面") - }else{ - CallerLogger.d(SceneConstant.M_TAXI + LoginServiceImpl.TAG, "showLoginDialogFragment 展示登录界面 1s内执行一次") + CallerLogger.d( + SceneConstant.M_TAXI + LoginServiceImpl.TAG, + "showLoginDialogFragment 展示登录界面" + ) + } else { + CallerLogger.d( + SceneConstant.M_TAXI + LoginServiceImpl.TAG, + "showLoginDialogFragment 展示登录界面 1s内执行一次" + ) } } } - fun setSpeed(speed:String){ + fun setSpeed(speed: String) { tv_speed.text = speed } - fun setDistanceAndTime(distance: String,distanceUnit: String,sumTime:String,arrivedTime:String){ + + fun setDistanceAndTime( + distance: String, + distanceUnit: String, + sumTime: String, + arrivedTime: String + ) { tv_distance.text = distance tv_distance_unit.text = "距离(${distanceUnit})" tv_distance_surplus_time.text = sumTime diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/adapter/TemperatureAdapter.java b/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/adapter/TemperatureAdapter.java index cf181e721a..127040a013 100644 --- a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/adapter/TemperatureAdapter.java +++ b/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/adapter/TemperatureAdapter.java @@ -6,6 +6,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.RecyclerView; import com.mogo.och.bus.passenger.R; @@ -23,6 +24,7 @@ public class TemperatureAdapter extends RecyclerView.Adapter dataList; private RecyclerView recyclerView; + private Boolean enable = true; public TemperatureAdapter(Context context, List dataList, RecyclerView recyclerView) { this.context = context; @@ -42,6 +44,12 @@ public class TemperatureAdapter extends RecyclerView.Adapter { if (recyclerView != null) { @@ -64,6 +72,11 @@ public class TemperatureAdapter extends RecyclerView.Adapter + + + + \ No newline at end of file diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/color/bus_p_function_airconditon_pattern_text_color_selector.xml b/OCH/mogo-och-bus-passenger/src/m1/res/color/bus_p_function_airconditon_pattern_text_color_selector.xml new file mode 100644 index 0000000000..2ca70c84f5 --- /dev/null +++ b/OCH/mogo-och-bus-passenger/src/m1/res/color/bus_p_function_airconditon_pattern_text_color_selector.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_airconditon_pattern_text_color_selector.xml b/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_airconditon_pattern_text_color_selector.xml deleted file mode 100644 index 6b00e3a3d1..0000000000 --- a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_airconditon_pattern_text_color_selector.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_fragment.xml b/OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_fragment.xml index 25a2792236..b3bc02a7b7 100644 --- a/OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_fragment.xml +++ b/OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_fragment.xml @@ -163,6 +163,37 @@ + + + + + + + + + + + diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/values/color.xml b/OCH/mogo-och-bus-passenger/src/m1/res/values/color.xml index e44d470456..e7f1fa3fb1 100644 --- a/OCH/mogo-och-bus-passenger/src/m1/res/values/color.xml +++ b/OCH/mogo-och-bus-passenger/src/m1/res/values/color.xml @@ -3,7 +3,8 @@ #212831 #203555 - #47576E + #47576E + #6647576E #374968 #2CBFFC #1060FF diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_m1_msg_box_button.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_m1_msg_box_button.xml index 8bb164354d..7e98b72cdb 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_m1_msg_box_button.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_m1_msg_box_button.xml @@ -1,15 +1,15 @@