Merge remote-tracking branch 'origin/qa_light' into qa_light

# Conflicts:
#	modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_list_item.xml
#	modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml
#	skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_list_item_light.xml

.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>

modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml

@@ -1053,5 +1053,6 @@
     <dimen name="sp_42">42px</dimen>
     <dimen name="sp_48">48px</dimen>
     <dimen name="module_common_shadow_width">-10px</dimen>
+    <dimen name="module_common_shadow_width_pos">10px</dimen>
 
 </resources>

modules/mogo-module-common/src/main/res/values/dimens.xml

@@ -1044,4 +1044,5 @@
 	<dimen name="sp_42">22.9688px</dimen>
 	<dimen name="sp_48">26.2500px</dimen>
 	<dimen name="module_common_shadow_width">-8px</dimen>
+	<dimen name="module_common_shadow_width_pos">8px</dimen>
 </resources>

modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml

@@ -81,8 +81,10 @@
         android:id="@+id/module_entrance_id_move2_current_location"
         android:layout_width="@dimen/module_ext_operation_panel_width"
         android:layout_height="@dimen/module_ext_operation_panel_move2_height"
-        android:background="@drawable/module_ext_dw_common_corner_bkg"
+        android:background="@drawable/module_ext_shadow_bkg"
         android:scaleType="centerInside"
+        android:translationY="@dimen/module_common_shadow_width_pos"
+        android:translationX="@dimen/module_common_shadow_width_pos"
         android:src="@drawable/module_map_ic_move2_current_location"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintRight_toRightOf="parent" />

modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml

@@ -73,8 +73,8 @@
 
     <ImageView
         android:id="@+id/ivUserHeadImg"
-        android:layout_width="@dimen/module_ext_height"
+        android:layout_width="@dimen/module_ext_user_avator_size"
-        android:layout_height="@dimen/module_ext_height"
+        android:layout_height="@dimen/module_ext_user_avator_size"
         android:src="@drawable/model_ext_default_user_head"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent"

modules/mogo-module-extensions/src/main/res/values-mdpi/dimens.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="module_ext_msg_counter_margin">26px</dimen>
+    <dimen name="module_ext_user_avator_size">66px</dimen>
 </resources>

modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml

@@ -30,17 +30,17 @@
     <dimen name="module_ext_navi_panel_marginLeft">32px</dimen>
     <dimen name="module_ext_navi_panel_marginTop">2px</dimen>
 
-    <dimen name="module_ext_operation_panel_width">120px</dimen>
+    <dimen name="module_ext_operation_panel_width">140px</dimen>
     <dimen name="module_ext_operation_panel_marginRight">32px</dimen>
     <dimen name="module_ext_operation_panel_marginBottom">60px</dimen>
     <dimen name="module_ext_operation_panel_vr_height">92px</dimen>
     <dimen name="module_ext_operation_panel_vr_textSize">24px</dimen>
     <dimen name="module_ext_operation_panel_divider_width">48px</dimen>
     <dimen name="module_ext_operation_panel_divider_height">2px</dimen>
-    <dimen name="module_ext_operation_panel_move2_height">120px</dimen>
+    <dimen name="module_ext_operation_panel_move2_height">140px</dimen>
-    <dimen name="module_ext_operation_panel_share_width">120px</dimen>
+    <dimen name="module_ext_operation_panel_share_width">140px</dimen>
     <dimen name="module_ext_operation_panel_share_height">120px</dimen>
-    <dimen name="module_ext_operation_panel_share_marginBottom">30px</dimen>
+    <dimen name="module_ext_operation_panel_share_marginBottom">20px</dimen>
     <dimen name="module_ext_operation_panel_share_textSize">30px</dimen>
     <dimen name="module_ext_operation_panel_share_goneMarginBottom">32px</dimen>
     <dimen name="module_ext_operation_panel_share_goneMarginRight">32px</dimen>
@@ -146,4 +146,5 @@
 
     <dimen name="module_ext_top_over_navi_height">40px</dimen>
     <dimen name="module_ext_msg_counter_margin">45px</dimen>
+    <dimen name="module_ext_user_avator_size">120px</dimen>
 </resources>

modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml

@@ -30,17 +30,17 @@
     <dimen name="module_ext_navi_panel_marginLeft">32px</dimen>
     <dimen name="module_ext_navi_panel_marginTop">2px</dimen>
 
-    <dimen name="module_ext_operation_panel_width">120px</dimen>
+    <dimen name="module_ext_operation_panel_width">140px</dimen>
     <dimen name="module_ext_operation_panel_marginRight">32px</dimen>
     <dimen name="module_ext_operation_panel_marginBottom">60px</dimen>
     <dimen name="module_ext_operation_panel_vr_height">92px</dimen>
     <dimen name="module_ext_operation_panel_vr_textSize">24px</dimen>
     <dimen name="module_ext_operation_panel_divider_width">48px</dimen>
     <dimen name="module_ext_operation_panel_divider_height">2px</dimen>
-    <dimen name="module_ext_operation_panel_move2_height">120px</dimen>
+    <dimen name="module_ext_operation_panel_move2_height">140px</dimen>
     <dimen name="module_ext_operation_panel_share_width">120px</dimen>
     <dimen name="module_ext_operation_panel_share_height">120px</dimen>
-    <dimen name="module_ext_operation_panel_share_marginBottom">30px</dimen>
+    <dimen name="module_ext_operation_panel_share_marginBottom">20px</dimen>
     <dimen name="module_ext_operation_panel_share_textSize">30px</dimen>
     <dimen name="module_ext_operation_panel_share_goneMarginBottom">32px</dimen>
     <dimen name="module_ext_operation_panel_share_goneMarginRight">32px</dimen>
@@ -148,4 +148,5 @@
     <dimen name="module_ext_notice_margin_start">175px</dimen>
     <dimen name="module_ext_weather_margin_start">30px</dimen>
     <dimen name="module_ext_msg_counter_margin">45px</dimen>
+    <dimen name="module_ext_user_avator_size">120px</dimen>
 </resources>

modules/mogo-module-extensions/src/main/res/values/dimens.xml

@@ -30,17 +30,17 @@
     <dimen name="module_ext_navi_panel_marginLeft">20px</dimen>
     <dimen name="module_ext_navi_panel_marginTop">1px</dimen>
 
-    <dimen name="module_ext_operation_panel_width">66px</dimen>
+    <dimen name="module_ext_operation_panel_width">82px</dimen>
     <dimen name="module_ext_operation_panel_marginRight">20px</dimen>
     <dimen name="module_ext_operation_panel_marginBottom">34.5px</dimen>
     <dimen name="module_ext_operation_panel_vr_height">58px</dimen>
     <dimen name="module_ext_operation_panel_vr_textSize">17px</dimen>
     <dimen name="module_ext_operation_panel_divider_width">31.4px</dimen>
     <dimen name="module_ext_operation_panel_divider_height">1.2px</dimen>
-    <dimen name="module_ext_operation_panel_move2_height">66px</dimen>
+    <dimen name="module_ext_operation_panel_move2_height">82px</dimen>
     <dimen name="module_ext_operation_panel_share_width">66px</dimen>
     <dimen name="module_ext_operation_panel_share_height">66px</dimen>
-    <dimen name="module_ext_operation_panel_share_marginBottom">16px</dimen>
+    <dimen name="module_ext_operation_panel_share_marginBottom">8px</dimen>
     <dimen name="module_ext_operation_panel_share_textSize">16px</dimen>
     <dimen name="module_ext_operation_panel_share_goneMarginBottom">34.5px</dimen>
     <dimen name="module_ext_operation_panel_share_goneMarginRight">20px</dimen>
@@ -153,5 +153,6 @@
     <dimen name="module_ext_top_over_navi_height">19px</dimen>
     <dimen name="module_ext_weather_margin_start">16px</dimen>
     <dimen name="module_ext_msg_counter_margin">26px</dimen>
+    <dimen name="module_ext_user_avator_size">66px</dimen>
 
 </resources>

modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml

@@ -48,6 +48,12 @@
         android:layout_marginLeft="@dimen/module_main_id_entrance_fragment_container_marginLeft"
         android:padding="@dimen/module_main_entrance_fragment_container_padding" />
 
+    <!-- 浮层-->
+    <FrameLayout
+        android:id="@+id/module_main_id_floating_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
     <FrameLayout
         android:id="@+id/module_main_id_event_panel_fragment_container"
         android:layout_width="match_parent"
@@ -61,12 +67,6 @@
         android:layout_height="match_parent"
         android:layout_marginLeft="@dimen/module_main_id_entrance_fragment_container_marginLeft"/>
 
-    <!-- 浮层-->
-    <FrameLayout
-        android:id="@+id/module_main_id_floating_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
     <FrameLayout
         android:id="@+id/module_main_id_search_fragment"
         android:layout_width="match_parent"

modules/mogo-module-tanlu/src/main/res/values-mdpi/dimens.xml

@@ -85,7 +85,7 @@
     <dimen name="tanlu_module_card_margin_top">13px</dimen>
     <dimen name="tanlu_module_card_margin_left">8px</dimen>
     <dimen name="tanlu_module_margin_right">13px</dimen>
-    <dimen name="tanlu_module_margin_left">15px</dimen>
+    <dimen name="tanlu_module_margin_left">17px</dimen>
     <dimen name="tanlu_module_margin_top">3px</dimen>
     <dimen name="tanlu_module_mavi_height">18px</dimen>
     <dimen name="tanlu_module_button_height">26px</dimen>

modules/mogo-module-tanlu/src/main/res/values-xhdpi-1920x1000/dimens.xml

@@ -85,7 +85,7 @@
     <dimen name="tanlu_module_card_margin_top">19px</dimen>
     <dimen name="tanlu_module_card_margin_left">13px</dimen>
     <dimen name="tanlu_module_margin_right">23px</dimen>
-    <dimen name="tanlu_module_margin_left">15px</dimen>
+    <dimen name="tanlu_module_margin_left">30px</dimen>
     <dimen name="tanlu_module_margin_top">9px</dimen>
     <dimen name="tanlu_module_mavi_height">27px</dimen>
     <dimen name="tanlu_module_button_height">46px</dimen>

modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml

@@ -85,7 +85,7 @@
     <dimen name="tanlu_module_card_margin_top">19px</dimen>
     <dimen name="tanlu_module_card_margin_left">13px</dimen>
     <dimen name="tanlu_module_margin_right">23px</dimen>
-    <dimen name="tanlu_module_margin_left">15px</dimen>
+    <dimen name="tanlu_module_margin_left">30px</dimen>
     <dimen name="tanlu_module_margin_top">9px</dimen>
     <dimen name="tanlu_module_mavi_height">27px</dimen>
     <dimen name="tanlu_module_button_height">46px</dimen>

modules/mogo-module-tanlu/src/main/res/values/dimens.xml

@@ -85,7 +85,7 @@
     <dimen name="tanlu_module_card_margin_top">13px</dimen>
     <dimen name="tanlu_module_card_margin_left">8px</dimen>
     <dimen name="tanlu_module_margin_right">13px</dimen>
-    <dimen name="tanlu_module_margin_left">15px</dimen>
+    <dimen name="tanlu_module_margin_left">17px</dimen>
     <dimen name="tanlu_module_margin_top">3px</dimen>
     <dimen name="tanlu_module_mavi_height">18px</dimen>
     <dimen name="tanlu_module_button_height">26px</dimen>

modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/animation/V2XAnimationManager.java

@@ -1,63 +1,64 @@
 package com.mogo.module.v2x.utils.animation;
 
-import android.graphics.drawable.AnimationDrawable;
+import android.os.Handler;
-import android.util.Log;
+import android.os.Looper;
+import android.os.Message;
 import android.view.View;
 import android.widget.ImageView;
 
-import com.mogo.utils.ThreadPoolService;
-import com.mogo.utils.UiThreadHandler;
-
 public class V2XAnimationManager implements Animation {
 
     private static final String TAG = "V2XAnimationManager";
     private ImageView targetImageView;
-    private Animation delegate;
     private boolean isStarted = false;
 
+    private int mStartIndex = 0;
+
+    private final static int MSG_LOOP = 3004;
+    private long INTERVAL = 100L;
+
+    private Handler mHandler = new Handler( Looper.getMainLooper() ) {
+        @Override
+        public void handleMessage( Message msg ) {
+            super.handleMessage( msg );
+            switch ( msg.what ) {
+                case MSG_LOOP:
+                    if ( isStarted ) {
+                        targetImageView.setImageResource( AnimationResources.loadingRes[mStartIndex++ % AnimationResources.loadingRes.length] );
+                        mHandler.sendEmptyMessageDelayed( MSG_LOOP, INTERVAL );
+                    }
+                    break;
+            }
+        }
+    };
+
     public void animationWithTarget(ImageView imageView, int[] resources, int duration) {
         targetImageView = imageView;
-        ThreadPoolService.execute(() -> {
+        INTERVAL = duration;
-            final AnimationDrawable drawable = new AnimationDrawable();
+        start();
-            for (int i = 0; i < resources.length; i++) {
-                drawable.setOneShot(false);
-                drawable.addFrame(targetImageView.getResources().getDrawable(resources[i]), duration);
-            }
-            UiThreadHandler.post(() -> {
-                targetImageView.setBackground(drawable);
-                delegate = new DelegateDrawable(drawable);
-                start();
-            });
-        });
 
     }
 
     @Override
     synchronized public void start() {
-        if (delegate != null && !isStarted) {
+        isStarted = true;
-            targetImageView.setVisibility(View.VISIBLE);
+        mHandler.sendEmptyMessage( MSG_LOOP );
-            isStarted = true;
+        targetImageView.setVisibility(View.VISIBLE);
-            delegate.start();
-        }
     }
 
     @Override
     synchronized public void stop() {
-        if (delegate != null && isStarted) {
+        isStarted = false;
-            isStarted = false;
+        mHandler.removeMessages( MSG_LOOP );
-            delegate.stop();
+        targetImageView.setVisibility(View.INVISIBLE);
-            targetImageView.setVisibility(View.INVISIBLE);
-        }
     }
 
     public void soptWithError(){
-        if (delegate != null && isStarted) {
+        stop();
-            isStarted = false;
+        targetImageView.setVisibility(View.VISIBLE);
-            delegate.stop();
-        }
     }
 
     public void release() {
-        delegate = null;
+        stop();
     }
 }

modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml

@@ -86,11 +86,11 @@
         android:id="@+id/tvFaultHelpEventTime"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/dp_24"
         android:alpha="0.59"
-        android:textColor="@color/v2x_FFF_666"
+        android:textColor="@color/v2x_FFF_999"
         android:textSize="@dimen/dp_29"
         app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_marginBottom="@dimen/dp_24"
         app:layout_constraintStart_toStartOf="@+id/tvFaultHelpName"
         app:layout_constraintTop_toBottomOf="@id/tvFaultHelpName"
         tools:text="15:30发布求助信息" />