From 64db09cdbea429bf34cd1d8a4ddede973ee4b8f0 Mon Sep 17 00:00:00 2001
From: tongchenfei <tongchenfei@zhidaoauto.com>
Date: Wed, 2 Sep 2020 10:34:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=A4=A9=E6=B0=94=E6=8E=A7?=
 =?UTF-8?q?=E4=BB=B6=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/misc.xml                                |  2 +-
 .../extensions/entrance/EntranceFragment.java | 31 +++++++++++++++----
 .../res/layout/module_ext_layout_entrance.xml |  2 +-
 .../layout/module_ext_layout_extensions.xml   |  8 ++---
 .../src/main/res/values-xhdpi/dimens.xml      |  2 +-
 .../src/main/res/values/dimens.xml            |  2 +-
 6 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 21e99e2dc0..cd77a1f062 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,7 +4,7 @@
     <asm skipDebug="false" skipFrames="false" skipCode="false" expandFrames="false" />
     <groovy codeStyle="LEGACY" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
 </project>
\ No newline at end of file
diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
index 11ef74de23..f8386a14b7 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
@@ -14,6 +14,7 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.constraintlayout.widget.ConstraintSet;
 
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.mogo.commons.AbsMogoApplication;
@@ -315,9 +316,25 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
         mUploadButtonAnimatorController = new UploadButtonAnimatorController(mUploading, mUpload,
                 mStatusManager);
 
+        dealWeatherContainer();
+
         debugTopView();
     }
 
+    /**
+     * 由于Launcher和Independent对于天气的表现形式不太一样，所以通过此方法区分处理
+     */
+    private void dealWeatherContainer(){
+        if (!DebugConfig.isLauncher()) {
+            ConstraintSet constraintSet = new ConstraintSet();
+            constraintSet.clone((ConstraintLayout) getView());
+            constraintSet.clear(R.id.module_ext_id_weather_container,ConstraintSet.START);
+            constraintSet.connect(R.id.module_ext_id_weather_container, ConstraintSet.END,
+                    getView().getId(), ConstraintSet.END);
+            constraintSet.applyTo((ConstraintLayout) getView());
+        }
+    }
+
     public void showShareDialog() {
         isClickShare = true;
         mApis.getShareManager().showShareDialog();
@@ -600,15 +617,17 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
         findViewById(R.id.btnShowTextTip).setOnClickListener(v-> TipToast.tip("分享成功"));
 
         findViewById(R.id.btnShowDrawableTip).setOnClickListener(v->{
-            TipDrawable drawable =
-                    new TipDrawable(getResources().getDrawable(R.drawable.model_ext_default_user_head), 150, 150);
-            TipToast.tip("分享成功",drawable);
+            mMsgContainer.setVisibility(View.VISIBLE);
+//            TipDrawable drawable =
+//                    new TipDrawable(getResources().getDrawable(R.drawable.model_ext_default_user_head), 150, 150);
+//            TipToast.tip("分享成功",drawable);
         });
 
         findViewById(R.id.btnShowDrawableTipNoSize).setOnClickListener(v->{
-            TipDrawable drawable =
-                    new TipDrawable(getResources().getDrawable(R.drawable.model_ext_default_user_head));
-            TipToast.tip("分享成功",drawable);
+            mMsgContainer.setVisibility(View.GONE);
+//            TipDrawable drawable =
+//                    new TipDrawable(getResources().getDrawable(R.drawable.model_ext_default_user_head));
+//            TipToast.tip("分享成功",drawable);
         });
     }
 
diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml
index ee58f94945..71d0e83764 100644
--- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml
+++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml
@@ -242,7 +242,7 @@
         android:id="@+id/groupTopViewDebug"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:visibility="gone"
+        android:visibility="visible"
         app:constraint_referenced_ids="btnShowDrawableTipNoSize,btnShowDrawableTip,btnShowTextTip,btnDebugCtrlNaviView,btnDebugCtrlSubView,btnDebugCtrlTopView,btnDebugAddBottomLayerView" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml
index 07d35e0de1..3af17da994 100644
--- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml
+++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml
@@ -8,15 +8,15 @@
         android:id="@+id/module_ext_id_weather_container"
         android:layout_width="wrap_content"
         android:layout_height="@dimen/module_ext_height"
-        android:layout_marginEnd="@dimen/module_ext_weather_margin_end"
-        app:layout_goneMarginEnd="0dp"
         android:background="@drawable/module_ext_drawable_weather_bkg"
         android:gravity="center"
         android:paddingStart="@dimen/module_ext_weather_container_paddingLeft"
         android:paddingEnd="@dimen/module_ext_weather_container_paddingRight"
         android:visibility="invisible"
-        app:layout_constraintRight_toLeftOf="@+id/ivUserHeadImg"
+        app:layout_goneMarginLeft="@dimen/module_ext_notice_margin_start"
         app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintLeft_toRightOf="@+id/module_ext_id_msg"
+        android:layout_marginStart="@dimen/module_ext_weather_margin_start"
         tools:visibility="visible">
 
         <ImageView
@@ -75,5 +75,5 @@
         app:layout_constraintBottom_toBottomOf="@+id/module_ext_id_weather_container"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="@+id/module_ext_id_weather_container"
-        tools:visibility="visible" />
+        tools:visibility="gone" />
 </merge>
\ No newline at end of file
diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml
index 274ee166d4..681046e6cc 100644
--- a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml
@@ -145,5 +145,5 @@
 
     <dimen name="module_ext_top_over_navi_height">34px</dimen>
     <dimen name="module_ext_notice_margin_start">175px</dimen>
-    <dimen name="module_ext_weather_margin_end">485px</dimen>
+    <dimen name="module_ext_weather_margin_start">30px</dimen>
 </resources>
\ No newline at end of file
diff --git a/modules/mogo-module-extensions/src/main/res/values/dimens.xml b/modules/mogo-module-extensions/src/main/res/values/dimens.xml
index 569df88f5a..3f596dd6de 100644
--- a/modules/mogo-module-extensions/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-extensions/src/main/res/values/dimens.xml
@@ -150,6 +150,6 @@
     <dimen name="module_ext_display_overview_icon_marginTop">10px</dimen>
 
     <dimen name="module_ext_top_over_navi_height">19px</dimen>
+    <dimen name="module_ext_weather_margin_start">16px</dimen>
 
-    <dimen name="module_ext_weather_margin_end">231px</dimen>
 </resources>
\ No newline at end of file