diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/DebugWatchDogPresenter.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/DebugWatchDogPresenter.kt deleted file mode 100644 index f451a04c96..0000000000 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/DebugWatchDogPresenter.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.mogo.och.bus.passenger.presenter - -import com.mogo.och.bus.passenger.ui.dialogfragment.DebugViewWatchDogFragment -import com.mogo.och.bus.passenger.ui.dialogfragment.M1CarUserNoOrderFragment - -class DebugWatchDogPresenter(view: DebugViewWatchDogFragment?) : - BusBasePassengerFunctionDevicePresenter(view){ - companion object { - private const val TAG = "BusPassengerFunctionPresenter" - } - - -} \ No newline at end of file diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt index ae0b1ccadc..b4f975f9f9 100644 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt @@ -9,7 +9,6 @@ import com.amap.api.maps.model.LatLng import com.mogo.commons.AbsMogoApplication import com.mogo.commons.mvp.MvpFragment import com.mogo.eagle.core.data.config.HdMapBuildConfig -import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager.getMapUIController import com.mogo.eagle.core.function.hmi.ui.msgbox.MMsgBoxButtonView import com.mogo.eagle.core.function.hmi.ui.setting.ToggleDebugView @@ -25,7 +24,7 @@ import com.mogo.och.bus.passenger.bean.event.EventLineSites import com.mogo.och.bus.passenger.bean.response.OrderInfoResponse import com.mogo.och.bus.passenger.model.CharterPassengerModel import com.mogo.och.bus.passenger.presenter.BusPassengerPresenter -import com.mogo.och.bus.passenger.ui.dialogfragment.DebugViewWatchDogFragment +import com.mogo.och.common.module.manager.debug.DebugViewWatchDogFragment import com.mogo.och.bus.passenger.ui.dialogfragment.M1CarUserNoOrderFragment import com.mogo.och.bus.passenger.ui.dialogfragment.M1ContainFragment import com.mogo.och.bus.passenger.ui.dialogfragment.NoviceGuidanceFragment diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/M1ContainFragment.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/M1ContainFragment.kt index a3d1cde613..3d27d3906b 100644 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/M1ContainFragment.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/M1ContainFragment.kt @@ -25,6 +25,7 @@ import com.mogo.och.bus.passenger.ui.view.bottom.BottomBar import com.mogo.och.bus.passenger.ui.view.bottom.BottomClickView import com.mogo.och.bus.passenger.utils.ToastCharterUtils import com.mogo.och.common.module.biz.constant.LoginStatusManager +import com.mogo.och.common.module.manager.debug.DebugViewWatchDogFragment import kotlinx.android.synthetic.main.m1_contain_fragment.* import org.greenrobot.eventbus.EventBus diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/DebugViewWatchDogFragment.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/debug/DebugViewWatchDogFragment.kt similarity index 94% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/DebugViewWatchDogFragment.kt rename to OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/debug/DebugViewWatchDogFragment.kt index 8f8026b9f3..51ddc897f0 100644 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/DebugViewWatchDogFragment.kt +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/debug/DebugViewWatchDogFragment.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.dialogfragment +package com.mogo.och.common.module.manager.debug import android.content.DialogInterface import android.os.Bundle @@ -17,10 +17,8 @@ import com.mogo.eagle.core.utilcode.util.AppStateManager import com.mogo.eagle.core.utilcode.util.BarUtils import com.mogo.eagle.core.utilcode.util.ClickUtils import com.mogo.eagle.core.utilcode.util.KeyboardUtils -import com.mogo.och.bus.passenger.utils.ToastCharterUtils -import com.mogo.och.bus.passenger.R -import com.mogo.och.bus.passenger.presenter.DebugWatchDogPresenter -import com.mogo.och.bus.passenger.ui.MainFragment +import com.mogo.eagle.core.utilcode.util.ToastUtils +import com.mogo.och.common.module.R import kotlinx.android.synthetic.main.m1_debugview_pass.* /** @@ -45,7 +43,7 @@ class DebugViewWatchDogFragment : actv_password_submit.setOnClickListener { val text = acet_close.text if(text==null||text.isEmpty()){ - ToastCharterUtils.showShort("请输入密码") + ToastUtils.showShort("请输入密码") }else{ if(text.toString() == "123987"){ dismissAllowingStateLoss() @@ -54,7 +52,7 @@ class DebugViewWatchDogFragment : } ToggleDebugView.toggleDebugView.toggle(requireContext()) }else{ - ToastCharterUtils.showShort("请输入正确密码") + ToastUtils.showShort("请输入正确密码") } } } diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/debug/DebugWatchDogPresenter.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/debug/DebugWatchDogPresenter.kt new file mode 100644 index 0000000000..c43cb5d864 --- /dev/null +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/debug/DebugWatchDogPresenter.kt @@ -0,0 +1,12 @@ +package com.mogo.och.common.module.manager.debug + +import com.mogo.commons.mvp.Presenter + +class DebugWatchDogPresenter(view: DebugViewWatchDogFragment?) : + Presenter(view){ + companion object { + private const val TAG = "BusPassengerFunctionPresenter" + } + + +} \ No newline at end of file diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_debug_view_password.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_debug_view_password.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_debug_view_password.png rename to OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_debug_view_password.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_debugview_bg.xml b/OCH/mogo-och-common-module/src/main/res/drawable/charter_p_debugview_bg.xml similarity index 78% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_debugview_bg.xml rename to OCH/mogo-och-common-module/src/main/res/drawable/charter_p_debugview_bg.xml index 39850c37aa..34b6cfc3fc 100644 --- a/OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_debugview_bg.xml +++ b/OCH/mogo-och-common-module/src/main/res/drawable/charter_p_debugview_bg.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_debugview_cancle.xml b/OCH/mogo-och-common-module/src/main/res/drawable/charter_p_debugview_cancle.xml similarity index 78% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_debugview_cancle.xml rename to OCH/mogo-och-common-module/src/main/res/drawable/charter_p_debugview_cancle.xml index c061ab1fa0..ebc348c24f 100644 --- a/OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_debugview_cancle.xml +++ b/OCH/mogo-och-common-module/src/main/res/drawable/charter_p_debugview_cancle.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_debugview_edit_bg.xml b/OCH/mogo-och-common-module/src/main/res/drawable/charter_p_debugview_edit_bg.xml similarity index 78% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_debugview_edit_bg.xml rename to OCH/mogo-och-common-module/src/main/res/drawable/charter_p_debugview_edit_bg.xml index 204ecfe5e2..2cf51a6c09 100644 --- a/OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_debugview_edit_bg.xml +++ b/OCH/mogo-och-common-module/src/main/res/drawable/charter_p_debugview_edit_bg.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_debugview_submit.xml b/OCH/mogo-och-common-module/src/main/res/drawable/charter_p_debugview_submit.xml similarity index 78% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_debugview_submit.xml rename to OCH/mogo-och-common-module/src/main/res/drawable/charter_p_debugview_submit.xml index cd71d5703f..a62507c38d 100644 --- a/OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_debugview_submit.xml +++ b/OCH/mogo-och-common-module/src/main/res/drawable/charter_p_debugview_submit.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_debugview_pass.xml b/OCH/mogo-och-common-module/src/main/res/layout/m1_debugview_pass.xml similarity index 98% rename from OCH/mogo-och-charter-passenger/src/main/res/layout/m1_debugview_pass.xml rename to OCH/mogo-och-common-module/src/main/res/layout/m1_debugview_pass.xml index 873316e934..d6c0a9bbc7 100644 --- a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_debugview_pass.xml +++ b/OCH/mogo-och-common-module/src/main/res/layout/m1_debugview_pass.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/bus_p_m1_80000000" + android:background="@color/common_80000000" tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout"> #66B8BFE8 #3B4577 + + #80000000 + #1466FB + #E0EFFF + #B8C2D7 + #B8C2D8 \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/provider/StatusViewManager.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/provider/StatusViewManager.java new file mode 100644 index 0000000000..97c9108e3a --- /dev/null +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/provider/StatusViewManager.java @@ -0,0 +1,33 @@ +package com.mogo.och.taxi.passenger.provider; + +import android.content.Context; +import android.view.View; + +import androidx.annotation.NonNull; + +import com.alibaba.android.arouter.facade.annotation.Route; +import com.mogo.eagle.core.data.constants.MogoServicePaths; +import com.mogo.eagle.core.function.api.hmi.view.IStatusViewLayout; +import com.mogo.och.taxi.passenger.ui.statusview.StatusBarView; + +/** + * @author congtaowang + * @since 2020-01-06 + *

+ * 根据优先级控制显示 window view. + */ +@Route( path = MogoServicePaths.PATH_STATUS_VIEW_MANAGER ) +public class StatusViewManager implements IStatusViewLayout { + + + @NonNull + @Override + public View getStatusView(Context context) { + return new StatusBarView(context); + } + + @Override + public void init(Context context) { + + } +} diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt index 178f6e16b0..5be1d097af 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt @@ -8,6 +8,9 @@ import com.mogo.commons.voice.AIAssist import com.mogo.eagle.core.function.call.hmi.CallerHmiManager import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager import com.mogo.eagle.core.utilcode.kotlin.onClick +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.mogo.logger.scene.SceneConstant.Companion.M_TAXI_P import com.mogo.eagle.core.utilcode.util.DeviceUtils import com.mogo.eagle.core.utilcode.util.OverlayViewUtils import com.mogo.map.listener.IMogoMapListener @@ -148,10 +151,6 @@ class TaxiPassengerBaseFragment() : } } - - aciv_xiaozhi_normal.setImageResource(R.drawable.taxi_p_xioazhi_normal) - val anim = aciv_xiaozhi_normal.drawable as AnimationDrawable - anim.start() } private fun initCheckView() { @@ -170,6 +169,12 @@ class TaxiPassengerBaseFragment() : super.onResume() mapBizView!!.onResume() overMapView.onResume() + CallerLogger.d(M_TAXI_P + TAG, "onResume") + + if (aciv_xiaozhi_normal.drawable is AnimationDrawable) { + val anim = aciv_xiaozhi_normal.drawable as AnimationDrawable + anim.start() + } } override fun createPresenter(): BaseTaxiPassengerPresenter { @@ -190,6 +195,11 @@ class TaxiPassengerBaseFragment() : super.onPause() mapBizView!!.onPause() overMapView?.onPause() + CallerLogger.d(M_TAXI_P + TAG, "onPause") + if (aciv_xiaozhi_normal.drawable is AnimationDrawable) { + val anim = aciv_xiaozhi_normal.drawable as AnimationDrawable + anim.stop() + } } override fun onDestroyView() { @@ -198,10 +208,6 @@ class TaxiPassengerBaseFragment() : super.onDestroyView() } - override fun onMapVisualAngleChanged(visualAngleMode: VisualAngleMode) { - //todo ui 切换 - } - /** * 显示或隐藏订单信息 * diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/statusview/StatusBarView.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/statusview/StatusBarView.kt new file mode 100644 index 0000000000..c4a7dca1c8 --- /dev/null +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/statusview/StatusBarView.kt @@ -0,0 +1,99 @@ +package com.mogo.och.taxi.passenger.ui.statusview + +import android.content.Context +import android.os.SystemClock +import android.util.AttributeSet +import android.view.LayoutInflater +import android.view.ViewGroup +import androidx.constraintlayout.widget.ConstraintLayout +import androidx.fragment.app.FragmentActivity +import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager +import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager +import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager +import com.mogo.eagle.core.function.call.setting.CallerSkinModeListenerManager +import com.mogo.eagle.core.function.hmi.ui.setting.ToggleDebugView +import com.mogo.eagle.core.utilcode.util.ActivityUtils +import com.mogo.och.common.module.manager.debug.DebugViewWatchDogFragment +import com.mogo.och.taxi.passenger.R +import kotlinx.android.synthetic.main.taxi_p_statusview.view.iv_biz_icon +import me.jessyan.autosize.utils.AutoSizeUtils +import java.lang.ref.WeakReference + +class StatusBarView @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : ConstraintLayout(context, attrs, defStyleAttr), IMoGoAutopilotStatusListener { + + companion object { + const val TAG = "StatusBarView" + private const val COUNTS = 4 // 点击次数 + private const val DURATION: Long = 1000 // 规定有效时间 + const val bizz = "bizz" // 业务debug + const val debugView = "debugView" // 业务debug + } + + private var debugViewWatchDogFragment: WeakReference? = null + + private var mHits = LongArray(COUNTS) + + private fun continuousClick(type:String) { + if (ToggleDebugView.toggleDebugView.isShowIng()) { + ToggleDebugView.toggleDebugView.dismiss() + return + } + //每次点击时，数组向前移动一位 + System.arraycopy(mHits, 1, mHits, 0, mHits.size - 1) + //为数组最后一位赋值 + mHits[mHits.size - 1] = SystemClock.uptimeMillis() + if (mHits[0] >= (SystemClock.uptimeMillis() - DURATION)) { + mHits = LongArray(COUNTS) //重新初始化数组 + showDebugView() + } + } + + init { + LayoutInflater.from(context).inflate(R.layout.taxi_p_statusview, this, true) + setBackgroundResource(R.drawable.taxi_p_status_bg) + isClickable = true + isFocusable = true + } + + override fun onAttachedToWindow() { + super.onAttachedToWindow() + post { + val params: ViewGroup.LayoutParams = layoutParams + params.height = AutoSizeUtils.dp2px(context,120f) + layoutParams = params + } + + CallerAutoPilotStatusListenerManager.addListener(TAG, this) + +// bizz_view.setOnClickListener { continuousClick(bizz) } +// + iv_biz_icon.setOnClickListener { continuousClick(debugView) } + + } + + private fun showDebugView() { + if (debugViewWatchDogFragment?.get() == null) { + debugViewWatchDogFragment = WeakReference(DebugViewWatchDogFragment.newInstance()) + } + val debugViewFragment = debugViewWatchDogFragment?.get() + if (ActivityUtils.getTopActivity() is FragmentActivity) { + val fragmentActivity = ActivityUtils.getTopActivity() as FragmentActivity + DebugViewWatchDogFragment.showDebugView(fragmentActivity.supportFragmentManager,fragmentActivity.supportFragmentManager,debugViewFragment) + } + + } + + override fun onDetachedFromWindow() { + super.onDetachedFromWindow() + CallerHmiViewControlListenerManager.removeListener(TAG) + CallerSkinModeListenerManager.removeListener(TAG) + CallerDevaToolsManager.hideStatusBar() + } + +} + diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/statusview/TaxiPBlueToothView.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/statusview/TaxiPBlueToothView.kt new file mode 100644 index 0000000000..b27eeb0c21 --- /dev/null +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/statusview/TaxiPBlueToothView.kt @@ -0,0 +1,66 @@ +package com.mogo.och.taxi.passenger.ui.statusview + +import android.annotation.SuppressLint +import android.content.Context +import android.util.AttributeSet +import android.view.LayoutInflater +import android.widget.RelativeLayout +import com.mogo.eagle.core.function.api.devatools.mofang.IMoGoMoFangProvider +import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager +import com.mogo.och.taxi.passenger.R +import kotlinx.android.synthetic.main.taxi_p_blue_tooth.view.mofangView + +/** + * 魔戒蓝牙控件 + * 放置于StatusBar右侧位置 + * todo arrow + */ +class TaxiPBlueToothView : RelativeLayout, IMoGoMoFangProvider.OnMoFangStatusListener { + + companion object{ + const val TAG = "TaxiPBlueToothView" + } + + + constructor(context: Context) : this(context, null) + constructor(context: Context, attrs: AttributeSet?) : this(context, attrs, 0) + constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : this(context, attrs, defStyleAttr, 0) + constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int, defStyleRes: Int) : super(context, attrs, defStyleAttr, defStyleRes) + + init { + LayoutInflater.from(context).inflate(R.layout.taxi_p_blue_tooth, this, true) + } + + + override fun onAttachedToWindow() { + super.onAttachedToWindow() + CallerDevaToolsManager.mofang()?.registerMoFangStatusListener(TAG, this) + } + + override fun onDetachedFromWindow() { + super.onDetachedFromWindow() + CallerDevaToolsManager.mofang()?.unRegisterMoFangStatusListener(this) + } + + override fun onMoFangConnected() { + mofangView.setImageResource(R.drawable.taxi_p_blue_tooth_close) + } + + override fun onMoFangDisconnected() { + mofangView.setImageResource(R.drawable.taxi_p_blue_tooth_open) + } + + @SuppressLint("SetTextI18n") + override fun onMoFangBatteryChanged(battery: Int) { + + } + + override fun onMoFangClicked(keyCode: Int) {} + + override fun onMoFangLongClicked(keyCode: Int) {} + + override fun onMoFangCombineClicked(vararg keyCodes: Int) {} + + override fun onMoFangStatusError(msg: String) {} + +} \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_blue_tooth_close.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_blue_tooth_close.png new file mode 100644 index 0000000000..e547bddbb2 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_blue_tooth_close.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_blue_tooth_open.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_blue_tooth_open.png new file mode 100644 index 0000000000..4d07f9ecf6 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_blue_tooth_open.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_status_bg.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_status_bg.png new file mode 100644 index 0000000000..ea6962bfca Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_status_bg.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_001.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_001.png index cb7db36c2c..14bc96edde 100644 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_001.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_001.png differ 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 033a667bc4..960552ebf9 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 @@ -110,10 +110,10 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" android:layout_marginEnd="@dimen/dp_98" - android:src="@drawable/xiaozhi_safety_belt" + android:src="@drawable/xiaozhi_normal_001" android:layout_marginBottom="@dimen/dp_30" - android:layout_width="wrap_content" - android:layout_height="wrap_content"/> + android:layout_width="@dimen/dp_216" + android:layout_height="@dimen/dp_216"/> \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml index 4e8829db31..d1e357c336 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml @@ -131,7 +131,7 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" android:layout_marginEnd="@dimen/dp_82" - android:src="@drawable/xiaozhi_normal_001" + android:src="@drawable/taxi_p_xioazhi_normal" android:layout_marginBottom="@dimen/dp_28" android:layout_width="wrap_content" android:layout_height="wrap_content"/> diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_blue_tooth.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_blue_tooth.xml new file mode 100644 index 0000000000..26243e5e87 --- /dev/null +++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_blue_tooth.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_statusview.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_statusview.xml new file mode 100644 index 0000000000..93de004200 --- /dev/null +++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_statusview.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/script/productFlavors/taxi.gradle b/app/script/productFlavors/taxi.gradle index 82c4323f0d..8a3ff987e2 100644 --- a/app/script/productFlavors/taxi.gradle +++ b/app/script/productFlavors/taxi.gradle @@ -14,20 +14,23 @@ project.android.productFlavors { // ②连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.1.102\"" - // ③是否需要重写状态栏 - buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' - // ④构建 是否支持多屏异显异交互 buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' if (isCurrentDriver("taxi")) { // 在启动的时候把Task给清空 manifestPlaceholders.put("ACTIVITY_ROOT", true) + // ③是否需要重写状态栏 + buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' }else if (isCurrentPassenger("taxi")) { // 在启动的时候把Task给清空 manifestPlaceholders.put("ACTIVITY_ROOT", false) + // ③是否需要重写状态栏 + buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'true' }else { manifestPlaceholders.put("ACTIVITY_ROOT", false) + // ③是否需要重写状态栏 + buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' } } } \ No newline at end of file