From 9f8177602a74048212979e9974e572f1d6914074 Mon Sep 17 00:00:00 2001
From: zhangyuanzhen <zhangyuanzhen@zhidaoauto.com>
Date: Fri, 20 Mar 2020 18:03:27 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=9C=B0=E5=9B=BE=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/mogo/module/main/MainActivity.java   | 7 +------
 .../mogo/module/main/cards/HorizentalStackTransformer.java | 4 ++--
 .../src/main/res/layout/module_main_activity_main.xml      | 2 +-
 .../mogo-module-main/src/main/res/values-ldpi/dimens.xml   | 1 +
 .../mogo-module-main/src/main/res/values-xhdpi/dimens.xml  | 1 +
 .../main/java/com/mogo/module/service/MogoServices.java    | 1 +
 6 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
index 324fb644b0..e518d74da4 100644
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
@@ -281,12 +281,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
             if ( size == 0 ) {
                 showLayout();
             } else if ( size == 1 ) {
-                UiThreadHandler.postDelayed( new Runnable() {
-                    @Override
-                    public void run() {
-                        mMogoMapUIController.setPointToCenter( 0.5, 0.5 );
-                    }
-                }, 1000 );
+
                 hideLayout();
             }
         } );
diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/HorizentalStackTransformer.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/HorizentalStackTransformer.java
index 16f7ea21f6..bec1449b7c 100644
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/HorizentalStackTransformer.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/HorizentalStackTransformer.java
@@ -56,8 +56,8 @@ public class HorizentalStackTransformer extends HorizentalBaseTransformer {
             page.setTranslationX( -page.getHeight() * position + ( page.getHeight() * 0.5f ) * ( 1 - scale ) + spaceBetweenFirAndSecHeight * position );
         }else{
             float currentPage;
-            if(offsetScroll > 0.2f){
-                currentPage = 0.2f;
+            if(offsetScroll > 0.1f){
+                currentPage = 0.1f;
             }else{
                 currentPage = offsetScroll;
             }
diff --git a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml
index 0d8eeb964d..6be848e190 100644
--- a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml
+++ b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml
@@ -64,7 +64,7 @@
             android:id="@+id/module_main_id_card_cover_up_bottom"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_26"
-            android:layout_marginTop="@dimen/cards_container_dp_600"
+            android:layout_marginTop="@dimen/cards_container_shadow_dp_margin_top"
             android:layout_marginLeft="@dimen/dp_64"
             android:layout_marginRight="@dimen/dp_64"
             android:visibility="invisible"
diff --git a/modules/mogo-module-main/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-main/src/main/res/values-ldpi/dimens.xml
index aaf70a0598..f94f83a779 100644
--- a/modules/mogo-module-main/src/main/res/values-ldpi/dimens.xml
+++ b/modules/mogo-module-main/src/main/res/values-ldpi/dimens.xml
@@ -14,5 +14,6 @@
     <dimen name="module_main_card_cover_up_margin">352px</dimen>
 
     <dimen name="cards_container_dp_600">320px</dimen>
+    <dimen name="cards_container_shadow_dp_margin_top">319px</dimen>
 
 </resources>
\ No newline at end of file
diff --git a/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml
index 420c9126b7..05f521641d 100644
--- a/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml
@@ -13,5 +13,6 @@
     <dimen name="module_main_top_shadow_height">270px</dimen>
     <dimen name="module_main_card_cover_up_margin">660px</dimen>
     <dimen name="cards_container_dp_600">600px</dimen>
+    <dimen name="cards_container_shadow_dp_margin_top">599px</dimen>
 
 </resources>
\ No newline at end of file
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java
index 3e2e904551..e771c237f5 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java
@@ -956,6 +956,7 @@ public class MogoServices implements IMogoMapListener,
             AIAssist.getInstance( mContext ).unregisterUnWakeupCommand( ServiceConst.CMD_BACK );
         } else {
             AIAssist.getInstance( mContext ).registerUnWakeupCommand( ServiceConst.CMD_BACK, ServiceConst.CMD_BACK_WORDS, this );
+            mUiController.setPointToCenter( 0.5, 0.5 );
         }
     }
 }