diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java index 17adaf85d7..3173247834 100644 --- a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java +++ b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java @@ -137,7 +137,8 @@ public class BaseBusPassengerPresenter extends Presenter models, int haveArrivedIndex) { - runOnUIThread(() -> mView.routeResult(models,haveArrivedIndex)); + CallerLogger.INSTANCE.d(M_BUS_P + TAG, "routeResult:" + models.size()); + mView.routeResult(models,haveArrivedIndex); } @Override diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java index 74357b47fd..a3ea8e9ebe 100644 --- a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java +++ b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java @@ -142,7 +142,6 @@ public class BusPassengerRouteFragment extends } public void routeResult(List latLngList,int haveArrivedIndex) { - CallerLogger.INSTANCE.d(M_BUS_P + TAG, "routeResult:" + latLngList.size()); if (latLngList.size() > 0) { drawablePolyline(latLngList,haveArrivedIndex); } else { diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/view/SlidePanelView.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/view/SlidePanelView.java index 1433e8e88e..b9bb0b0c18 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/view/SlidePanelView.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/view/SlidePanelView.java @@ -239,10 +239,10 @@ public class SlidePanelView extends View { } private void startBlockBackAnim() { - ObjectAnimator animator = ObjectAnimator.ofInt(this, "blockOffset", blockOffset, 0); - animator.setInterpolator(new DecelerateInterpolator()); - animator.setDuration(1000 * blockOffset / getWidth()); - animator.start(); + ObjectAnimator blockBackanimator = ObjectAnimator.ofInt(this, "blockOffset", blockOffset, 0); + blockBackanimator.setInterpolator(new DecelerateInterpolator()); + blockBackanimator.setDuration(1000 * blockOffset / getWidth()); + blockBackanimator.start(); lastX = 0; } diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/TaxiPassengerServingOrderPresenter.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/TaxiPassengerServingOrderPresenter.java index 4105a50e3c..da983b4303 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/TaxiPassengerServingOrderPresenter.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/TaxiPassengerServingOrderPresenter.java @@ -77,7 +77,8 @@ public class TaxiPassengerServingOrderPresenter extends Presenter models, int haveArrivedIndex) { if (models == null) return; - runOnUIThread(() -> mView.routeResultByServer(models,haveArrivedIndex)); + CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "routeResultByServer:" + models.size()); + mView.routeResultByServer(models,haveArrivedIndex); } diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerServingOrderFragment.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerServingOrderFragment.java index 1232fbaf33..e15ffbf4b0 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerServingOrderFragment.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerServingOrderFragment.java @@ -22,7 +22,6 @@ import androidx.fragment.app.FragmentTransaction; import com.amap.api.maps.model.LatLng; import com.mogo.commons.mvp.MvpFragment; -import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr; import com.mogo.eagle.core.utilcode.util.UiThreadHandler; @@ -229,7 +228,6 @@ public class TaxiPassengerServingOrderFragment extends } public void routeResultByServer(List latLngList,int haveArrivedIndex) { - CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "routeResultByServer:" + latLngList.size()); if (latLngList.size() > 0) { drawablePolylineByServerRoute(latLngList,haveArrivedIndex); } else { diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerStartAutopilotView.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerStartAutopilotView.java index 41146e5982..5d8aba7836 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerStartAutopilotView.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerStartAutopilotView.java @@ -37,8 +37,9 @@ public class TaxiPassengerStartAutopilotView extends RelativeLayout implements V private static final long TIMER_START_AUTOPILOT_INTERVAL = 20 * 1000L; private Context mContext; private View view; - private FrameSurfaceView svCarStartingFrame; private AnimatorDrawableUtil mAnimationDrawable ; + private AnimatorDrawableUtil mCarAnimationDrawable ; + private ImageView mCarIv; private Integer[] startingAnimIds = new Integer[]{ R.drawable.light_00000, R.drawable.light_00001, @@ -98,6 +99,7 @@ public class TaxiPassengerStartAutopilotView extends RelativeLayout implements V mCloseIV.setOnClickListener(this); mAutopilotBtnBg = view.findViewById(R.id.taxi_p_autopilot_btn_bg); + mCarIv = view.findViewById(R.id.taxi_p_autopilot_starting); initBtnAnimatonDrawable(); @@ -105,9 +107,8 @@ public class TaxiPassengerStartAutopilotView extends RelativeLayout implements V } private void initCarStartingFrame() { - svCarStartingFrame = view.findViewById(R.id.taxi_p_autopilot_starting); - svCarStartingFrame.setBitmapIds(Arrays.asList(startingAnimIds)); - svCarStartingFrame.setDuration(1300); + mCarAnimationDrawable = new AnimatorDrawableUtil(); + mCarAnimationDrawable.setAnimation(mCarIv,Arrays.asList(startingAnimIds)); } private void initBtnAnimatonDrawable() { @@ -143,8 +144,8 @@ public class TaxiPassengerStartAutopilotView extends RelativeLayout implements V @SuppressLint("UseCompatLoadingForDrawables") public void handleStartAutopilotBtnStatus(boolean isClickable){ - if (svCarStartingFrame != null){ - svCarStartingFrame.setBackgroundResource(R.drawable.light_00000); + if (mCarIv != null){ + mCarIv.setBackgroundResource(R.drawable.light_00000); } if (mStartAutopilotBtn == null) return; @@ -178,7 +179,7 @@ public class TaxiPassengerStartAutopilotView extends RelativeLayout implements V if (isStart){ if (mAnimationDrawable == null){ - + initBtnAnimatonDrawable(); } if (mAnimationDrawable != null){ mAnimationDrawable.start(true, 30, null); @@ -189,17 +190,18 @@ public class TaxiPassengerStartAutopilotView extends RelativeLayout implements V } private void startingCarBgAnimatorDrawable(boolean isStart){ - if (isStart && svCarStartingFrame != null){ - svCarStartingFrame.setRepeatTimes(-1); - svCarStartingFrame.setBackground(null); - svCarStartingFrame.start(); - }else { - if (svCarStartingFrame != null){ - svCarStartingFrame.reset(); - svCarStartingFrame.setBackgroundResource(R.drawable.light_00000); + if (isStart){ + if (mCarAnimationDrawable == null){ + initCarStartingFrame(); } + mCarIv.setBackgroundResource(0); + mCarAnimationDrawable.start(true,40, null); + }else { + if (mCarAnimationDrawable != null){ + mCarAnimationDrawable.stop(); + } + mCarIv.setBackgroundResource(R.drawable.light_00000); } - } public void startOrStopLoadingAnim(boolean start) { @@ -234,10 +236,9 @@ public class TaxiPassengerStartAutopilotView extends RelativeLayout implements V } public void clearStartingAnimFrame(){ - if (svCarStartingFrame != null){ - svCarStartingFrame.destroy(); + if (mCarAnimationDrawable != null){ + mCarAnimationDrawable.stop(); } - svCarStartingFrame = null; } public void onAutopilotStatusSuccess(){ startOrStopLoadingAnim(false); diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-v29/taxi_video_order_process.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-v29/taxi_video_order_process.xml new file mode 100644 index 0000000000..7575e2073b --- /dev/null +++ b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-v29/taxi_video_order_process.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-v29/taxi_video_seekbar_style.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-v29/taxi_video_seekbar_style.xml new file mode 100644 index 0000000000..aa3e77ed6e --- /dev/null +++ b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-v29/taxi_video_seekbar_style.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_video_order_process.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_video_order_process.xml index b3c6d5d088..44c6941d9c 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_video_order_process.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_video_order_process.xml @@ -17,7 +17,7 @@ - + diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_video_seekbar_style.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_video_seekbar_style.xml index 597931f974..203d9a5332 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_video_seekbar_style.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_video_seekbar_style.xml @@ -17,7 +17,7 @@ - + diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_start_autopilot_view.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_start_autopilot_view.xml index aefbd0fe6d..3416786abb 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_start_autopilot_view.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_start_autopilot_view.xml @@ -7,7 +7,7 @@ android:background="@drawable/taxi_p_passenger_start_panel_bg" tools:ignore="MissingDefaultResource"> - "北京" "0734" -> "衡阳" else -> "未知" @@ -51,17 +49,15 @@ object EnvChangeManager { fun getNetMode(): String { val cache = getConfig() - if (cache == null) { - val mode = DebugConfig.getNetMode() - updateNetMode(mode) - return when(mode) { + return if (cache == null) { + when(DebugConfig.getNetMode()) { DebugConfig.NET_MODE_RELEASE -> "生产" DebugConfig.NET_MODE_QA -> "测试" DebugConfig.NET_MODE_DEMO -> "演示" else -> "未知" } } else { - return when(cache.second) { + when(cache.second) { DebugConfig.NET_MODE_RELEASE -> "生产" DebugConfig.NET_MODE_QA -> "测试" DebugConfig.NET_MODE_DEMO -> "演示" diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt index 7025a4af6c..268eaaf089 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt @@ -207,9 +207,7 @@ import java.util.* setViewNotificationProvider(this) context?.also { - if (!AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) { - CallerDevaToolsManager.showStatusBar(it) - } + CallerDevaToolsManager.showStatusBar(it) } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TapPositionView.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TapPositionView.java index 1aa4b012c2..c8de687a2a 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TapPositionView.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TapPositionView.java @@ -41,6 +41,9 @@ public class TapPositionView extends ConstraintLayout { tabN = findViewById(R.id.tap_n); tabD = findViewById(R.id.tap_d); typedArray = context.obtainStyledAttributes(attrs, R.styleable.TapPositionView); + if(AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)){ + tabP.setVisibility(View.GONE); + } } public void updateWithGear(@NotNull Chassis.GearPosition gear) { diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_tap_position.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_tap_position.xml index a2a8beedd6..263bee811c 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_tap_position.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_tap_position.xml @@ -15,7 +15,6 @@ android:textColor="@color/p_default_txt_color" android:textSize="@dimen/dp_46" android:textStyle="bold" - android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@+id/tap_r" diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsManager.kt index 43004026ef..f4baa19770 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsManager.kt @@ -3,12 +3,14 @@ package com.mogo.eagle.core.function.call.devatools import android.app.Activity import android.content.Context import android.view.View +import com.mogo.eagle.core.data.config.* import com.mogo.eagle.core.data.constants.MogoServicePaths import com.mogo.eagle.core.data.deva.chain.ChainLogParam import com.mogo.eagle.core.data.deva.scene.SceneModule import com.mogo.eagle.core.data.deva.scene.SceneTAG import com.mogo.eagle.core.function.api.devatools.IDevaToolsProvider import com.mogo.eagle.core.function.call.base.CallerBase +import com.mogo.eagle.core.utilcode.mogo.* import record_cache.RecordPanelOuterClass object CallerDevaToolsManager { @@ -149,13 +151,17 @@ object CallerDevaToolsManager { * 展示状态栏 */ fun showStatusBar(ctx: Context) { - devaToolsProviderApi?.showStatusBar(ctx) + if (!AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) { + devaToolsProviderApi?.showStatusBar(ctx) + } } /** * 隐藏状态栏 */ fun hideStatusBar() { - devaToolsProviderApi?.hideStatusBar() + if (!AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) { + devaToolsProviderApi?.hideStatusBar() + } } } \ No newline at end of file