diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java index 27f121fae8..a2d67be768 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java @@ -8,6 +8,7 @@ import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_MAI import android.os.Bundle; import android.os.Process; +import android.util.Log; import android.view.KeyEvent; import androidx.annotation.Nullable; @@ -90,10 +91,12 @@ public class MainLauncherActivity extends MainActivity { // 兼容处理之前联想PAD及小巴车多个设备部署不同APP方案 if (!DebugConfig.isMultiDisplay()) { if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) { + Log.i("emArrow","Driver start"); ochProvider = (IMoGoFunctionProvider) ARouter.getInstance() .build("/driver/api") .navigation(getContext()); } else if(AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)){ + Log.i("emArrow","Passenger start"); ochProvider = (IMoGoFunctionProvider) ARouter.getInstance() .build("/passenger/api") .navigation(getContext()); diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-nodpi/icon_progress_bg_patch.9.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-nodpi/icon_progress_bg_patch.9.png new file mode 100644 index 0000000000..297e80cb1c Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-nodpi/icon_progress_bg_patch.9.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-nodpi/icon_progress_patch.9.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-nodpi/icon_progress_patch.9.png index 6dd9358414..73e6592de8 100644 Binary files a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-nodpi/icon_progress_patch.9.png and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-nodpi/icon_progress_patch.9.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/progressbar_corner_bg_test.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/progressbar_corner_bg_test.xml index a715ccaeae..15c23affd0 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/progressbar_corner_bg_test.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/progressbar_corner_bg_test.xml @@ -1,5 +1,5 @@ - + - + - + + + @@ -33,10 +33,10 @@ \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_container.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_container.xml index 956a3ac6e7..dff2577d56 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_container.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_container.xml @@ -11,7 +11,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_19" - android:layout_marginTop="@dimen/dp_76" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -20,7 +19,7 @@ android:id="@+id/clBoneBiz" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/dp_385" + android:layout_marginTop="@dimen/dp_309" android:layout_marginStart="@dimen/dp_19" android:elevation="1dp" app:layout_constraintLeft_toLeftOf="parent" @@ -30,10 +29,9 @@ android:id="@+id/clBoneTab" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_marginTop="@dimen/dp_385" + android:layout_marginTop="@dimen/dp_309" android:elevation="20dp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" /> - \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_tab.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_tab.xml index fefbf2a188..e269c962db 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_tab.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_tab.xml @@ -15,7 +15,7 @@ 1170dp 1176dp 1200dp + 1214dp 1241dp 1250dp 1261dp