diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/SchemeIntent.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/SchemeIntent.java index 09839d91eb..7c959c2012 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/SchemeIntent.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/SchemeIntent.java @@ -7,6 +7,7 @@ import android.text.TextUtils; import android.util.Log; import com.mogo.map.MogoLatLng; +import com.mogo.module.common.MogoApisHandler; import com.mogo.service.IMogoServiceApis; import com.mogo.service.statusmanager.IMogoStatusChangedListener; import com.mogo.service.statusmanager.StatusDescriptor; diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/unwake/GlobalUnwakeManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/unwake/GlobalUnwakeManager.java index 691fbe525f..36f6a706b2 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/unwake/GlobalUnwakeManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/unwake/GlobalUnwakeManager.java @@ -96,6 +96,7 @@ public class GlobalUnwakeManager implements IProvider, IMogoIntentListener, IMog * @param type 面板位置索引 */ private void showPanelByStatus(String target, int type){ + MogoApisHandler.getInstance().getApis().getAdasControllerApi().setSettingStatus(false); if ( MogoApisHandler.getInstance().getApis().getStatusManagerApi().isMainPageOnResume() ) { MogoApisHandler.getInstance().getApis().getEventPanelManager().showPanelWithSelectedItem(type); } else { diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml index d3bb0f90c1..edaa337156 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml @@ -9,7 +9,7 @@ android:id="@+id/no_share_image" android:layout_width="@dimen/share_empty_icon_width" android:layout_height="@dimen/share_empty_icon_width" - android:layout_marginTop="30px" + android:layout_marginTop="@dimen/share_empty_margin_top" android:src="@drawable/icon_share_empty" /> 22px 16px 20px - 34px + 15px + 34px 15px 29px -8px diff --git a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml index 3fabb9b780..a211bb52c0 100644 --- a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml @@ -65,7 +65,7 @@ 22px 16px 20px - 34px + 34px 16px 29px -8px diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml index c9d80ab227..190ceeba56 100644 --- a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml @@ -62,7 +62,8 @@ 48px 28px 40px - 60px + 30px + 60px 22px 54px -10px diff --git a/modules/mogo-module-v2x/src/main/res/values/dimens.xml b/modules/mogo-module-v2x/src/main/res/values/dimens.xml index 79bc217c51..c371aabb58 100644 --- a/modules/mogo-module-v2x/src/main/res/values/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values/dimens.xml @@ -60,7 +60,8 @@ 22px 16px 20px - 34px + 20px + 34px 15px 29px -8px