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

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

@@ -83,8 +83,6 @@
         android:layout_height="@dimen/module_ext_operation_panel_move2_height"
         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" />
@@ -94,6 +92,7 @@
         android:layout_width="@dimen/module_ext_operation_panel_share_width"
         android:layout_height="@dimen/module_ext_operation_panel_share_height"
         android:layout_marginBottom="@dimen/module_ext_operation_panel_share_marginBottom"
+        android:layout_marginEnd="@dimen/module_common_shadow_width_pos"
         android:background="@drawable/module_ext_dw_upload_road_condition_bkg"
         app:layout_constraintBottom_toTopOf="@+id/module_entrance_id_move2_current_location"
         app:layout_constraintRight_toRightOf="@+id/module_entrance_id_move2_current_location"

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

@@ -13,7 +13,6 @@
         android:paddingStart="@dimen/module_ext_weather_container_paddingLeft"
         android:paddingEnd="@dimen/module_ext_weather_container_paddingRight"
         android:visibility="invisible"
-        android:translationY="@dimen/module_common_shadow_width"
         app:layout_goneMarginLeft="@dimen/module_ext_notice_margin_start"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintLeft_toRightOf="@+id/module_ext_id_msg"
@@ -43,7 +42,6 @@
         android:layout_width="@dimen/module_ext_height"
         android:layout_height="@dimen/module_ext_height"
         android:layout_marginStart="@dimen/module_ext_notice_margin_start"
-        android:translationY="@dimen/module_common_shadow_width"
         android:layout_marginEnd="@dimen/module_ext_msg_marginRight"
         android:background="@drawable/module_ext_shadow_bkg"
         android:visibility="gone"
@@ -75,6 +73,8 @@
         android:id="@+id/ivUserHeadImg"
         android:layout_width="@dimen/module_ext_user_avator_size"
         android:layout_height="@dimen/module_ext_user_avator_size"
+        android:layout_marginRight="@dimen/module_common_shadow_width_pos"
+        android:layout_marginTop="@dimen/module_common_shadow_width_pos"
         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/dimens.xml

@@ -157,5 +157,4 @@
     <dimen name="module_ext_layout_padding">10px</dimen>
     <dimen name="module_ext_layout_paddingRight">2px</dimen>
     <dimen name="module_ext_layout_paddingBottom">2px</dimen>
-
 </resources>

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

@@ -20,7 +20,7 @@
     <dimen name="module_main_header_fragment_container_marginTop">30px</dimen>
     <dimen name="module_main_header_fragment_container_marginLeft">830px</dimen>
     <dimen name="module_main_id_entrance_fragment_container_marginLeft">800px</dimen>
-    <dimen name="module_main_entrance_fragment_container_padding">30px</dimen>
+    <dimen name="module_main_entrance_fragment_container_padding">20px</dimen>
     <dimen name="module_main_entrance_fragment_container_padding_top">30px</dimen>
 
     <dimen name="module_main_id_left_panel_fragment_container_width">340px</dimen>

modules/mogo-module-media/src/main/res/drawable/module_media_window_alert_bg.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <gradient
-        android:angle="180"
-        android:startColor="#5E6079"
-        android:endColor="#3F4057"
-        android:type="linear" />
-
-    <corners
-        android:bottomLeftRadius="@dimen/module_media_window_corner"
-        android:bottomRightRadius="@dimen/module_media_window_corner"
-        android:topLeftRadius="@dimen/module_media_window_corner"
-        android:topRightRadius="@dimen/module_media_window_corner" />
-</shape>

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

@@ -61,8 +61,8 @@
     <dimen name="module_media_share_fragment_tv2_margin_top">4px</dimen>
     <dimen name="module_media_share_fragment_img_radius">6px</dimen>
 
-    <dimen name="module_media_pop_window_width">580px</dimen>
-    <dimen name="module_media_pop_window_height">120px</dimen>
+    <dimen name="module_media_pop_window_width">600px</dimen>
+    <dimen name="module_media_pop_window_height">140px</dimen>
     <dimen name="module_media_pop_window_inner_height">112px</dimen>
     <dimen name="module_media_pop_window_inner_padding">30px</dimen>
     <dimen name="module_media_pop_window_anim_img_size">90px</dimen>

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

@@ -61,8 +61,8 @@
     <dimen name="module_media_share_fragment_tv2_margin_top">2px</dimen>
     <dimen name="module_media_share_fragment_img_radius">3.2px</dimen>
 
-    <dimen name="module_media_pop_window_width">322px</dimen>
-    <dimen name="module_media_pop_window_height">66.7px</dimen>
+    <dimen name="module_media_pop_window_width">332px</dimen>
+    <dimen name="module_media_pop_window_height">76.7px</dimen>
     <dimen name="module_media_pop_window_inner_height">60px</dimen>
     <dimen name="module_media_pop_window_inner_padding">18px</dimen>
     <dimen name="module_media_pop_window_anim_img_size">48px</dimen>

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

@@ -18,15 +18,15 @@ public class V2XAnimationManager implements Animation {
     private final static int MSG_LOOP = 3004;
     private long INTERVAL = 100L;
 
-    private Handler mHandler = new Handler( Looper.getMainLooper() ) {
+    private Handler mHandler = new Handler(Looper.getMainLooper()) {
         @Override
-        public void handleMessage( Message msg ) {
-            super.handleMessage( msg );
-            switch ( msg.what ) {
+        public void handleMessage(Message msg) {
+            super.handleMessage(msg);
+            switch (msg.what) {
                 case MSG_LOOP:
-                    if ( isStarted ) {
+                    if (isStarted) {
 //                        targetImageView.setImageResource( AnimationResources.loadingRes[mStartIndex++ % AnimationResources.loadingRes.length] );
-                        mHandler.sendEmptyMessageDelayed( MSG_LOOP, INTERVAL );
+                        mHandler.sendEmptyMessageDelayed(MSG_LOOP, INTERVAL);
                     }
                     break;
             }
@@ -43,20 +43,26 @@ public class V2XAnimationManager implements Animation {
     @Override
     synchronized public void start() {
         isStarted = true;
-        mHandler.sendEmptyMessage( MSG_LOOP );
-        targetImageView.setVisibility(View.VISIBLE);
+        mHandler.sendEmptyMessage(MSG_LOOP);
+        if (targetImageView != null) {
+            targetImageView.setVisibility(View.VISIBLE);
+        }
     }
 
     @Override
     synchronized public void stop() {
         isStarted = false;
-        mHandler.removeMessages( MSG_LOOP );
-        targetImageView.setVisibility(View.INVISIBLE);
+        mHandler.removeMessages(MSG_LOOP);
+        if (targetImageView != null) {
+            targetImageView.setVisibility(View.INVISIBLE);
+        }
     }
 
-    public void soptWithError(){
+    public void soptWithError() {
         stop();
-        targetImageView.setVisibility(View.VISIBLE);
+        if (targetImageView != null) {
+            targetImageView.setVisibility(View.VISIBLE);
+        }
     }
 
     public void release() {

modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XNetworkLoadingView.java

@@ -34,8 +34,8 @@ public class V2XNetworkLoadingView extends RelativeLayout {
         LayoutInflater.from(context).inflate(R.layout.v2x_network_loading_item, this);
         initView();
         /*
-         添加动画图片资源
-         */
+        添加动画图片资源
+        * */
         setLoadingImage(AnimationResources.loadingRes);
     }
 

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

@@ -18,13 +18,12 @@
             <TextView
                 android:id="@+id/tv_brief"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
                 android:layout_marginLeft="@dimen/module_v2x_surrounding_margin_left"
                 android:text="周围5公里，共15条交通信息"
                 android:textColor="@color/v2x_white"
-                android:layout_marginBottom="2px"
+                android:layout_alignParentTop="true"
                 android:textSize="@dimen/module_v2x_surrounding_top_textsize" />
-
 <!--            android:layout_centerInParent="true"-->
             <TextView
                 android:id="@+id/tv_top_refresh"

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

@@ -6,7 +6,6 @@
     android:layout_width="@dimen/module_v2x_panel_width"
     android:layout_height="@dimen/module_v2x_panel_width"
     android:background="@drawable/module_v2x_shadow_bkg"
-    android:translationY="@dimen/v2x_panel_btn_translationY"
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toTopOf="parent">
 

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

@@ -31,7 +31,7 @@
     <dimen name="module_v2x_map_top">200px</dimen>
     <dimen name="module_v2x_map_right">200px</dimen>
     <dimen name="module_v2x_map_bottom">100px</dimen>
-    <dimen name="module_v2x_surrounding_top_height">40px</dimen>
+    <dimen name="module_v2x_surrounding_top_height">50px</dimen>
     <dimen name="module_v2x_surrounding_top_bt_width">90px</dimen>
     <dimen name="module_v2x_surrounding_top_bt_height">36px</dimen>
     <dimen name="module_v2x_surrounding_empty_iv_margin_top">40px</dimen>

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

@@ -28,7 +28,7 @@
     <dimen name="module_v2x_map_top">200px</dimen>
     <dimen name="module_v2x_map_right">200px</dimen>
     <dimen name="module_v2x_map_bottom">100px</dimen>
-    <dimen name="module_v2x_surrounding_top_height">80px</dimen>
+    <dimen name="module_v2x_surrounding_top_height">90px</dimen>
     <dimen name="module_v2x_surrounding_top_bt_width">162px</dimen>
     <dimen name="module_v2x_surrounding_top_bt_height">64px</dimen>
     <dimen name="module_v2x_surrounding_empty_iv_margin_top">80px</dimen>

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

@@ -29,7 +29,7 @@
     <dimen name="module_v2x_map_top">200px</dimen>
     <dimen name="module_v2x_map_right">200px</dimen>
     <dimen name="module_v2x_map_bottom">100px</dimen>
-    <dimen name="module_v2x_surrounding_top_height">80px</dimen>
+    <dimen name="module_v2x_surrounding_top_height">90px</dimen>
     <dimen name="module_v2x_surrounding_top_bt_width">162px</dimen>
     <dimen name="module_v2x_surrounding_top_bt_height">64px</dimen>
     <dimen name="module_v2x_surrounding_empty_iv_margin_top">80px</dimen>

skin/mogo-skin-light/src/main/module-media-res/drawable/module_media_window_alert_bg_light.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <gradient
-        android:angle="180"
-        android:startColor="#E5F5F5F5"
-        android:endColor="#FFFFFFFF"
-        android:type="linear" />
-
-    <corners
-        android:bottomLeftRadius="@dimen/module_media_window_corner"
-        android:bottomRightRadius="@dimen/module_media_window_corner"
-        android:topLeftRadius="@dimen/module_media_window_corner"
-        android:topRightRadius="@dimen/module_media_window_corner" />
-</shape>

skin/mogo-skin-light/src/main/module-share-res/drawable/module_share_btn_bg_light.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <size android:width="@dimen/dp_160" android:height="@dimen/dp_160" />
-            <gradient android:startColor="#F0F0F0" android:endColor="#D7D7D7" android:angle="-45"/>
-        </shape>
-    </item>
-</selector>