yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# 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
This commit is contained in:
董宏宇
2020-09-16 16:44:55 +08:00
parent cb35854b49 d423a6dc07
commit 2f57b905bb
23 changed files with 68 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/misc.xml generated
View File

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

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

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

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

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

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

@@ -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" />

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

@@ -73,8 +73,8 @@
<ImageView
android:id="@+id/ivUserHeadImg"
android:layout_width="@dimen/module_ext_height"
android:layout_height="@dimen/module_ext_height"
android:layout_width="@dimen/module_ext_user_avator_size"
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"

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

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

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

@@ -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_share_width">120px</dimen>
<dimen name="module_ext_operation_panel_move2_height">140px</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>

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

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

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

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

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

@@ -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"

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

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

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

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

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

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

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

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

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

@@ -1,63 +1,64 @@
package com.mogo.module.v2x.utils.animation;
import android.graphics.drawable.AnimationDrawable;
import android.util.Log;
import android.os.Handler;
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(() -> {
final AnimationDrawable drawable = new AnimationDrawable();
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();
});
});
INTERVAL = duration;
start();
}
@Override
synchronized public void start() {
if (delegate != null && !isStarted) {
targetImageView.setVisibility(View.VISIBLE);
isStarted = true;
delegate.start();
}
isStarted = true;
mHandler.sendEmptyMessage( MSG_LOOP );
targetImageView.setVisibility(View.VISIBLE);
}
@Override
synchronized public void stop() {
if (delegate != null && isStarted) {
isStarted = false;
delegate.stop();
targetImageView.setVisibility(View.INVISIBLE);
}
isStarted = false;
mHandler.removeMessages( MSG_LOOP );
targetImageView.setVisibility(View.INVISIBLE);
}
public void soptWithError(){
if (delegate != null && isStarted) {
isStarted = false;
delegate.stop();
}
stop();
targetImageView.setVisibility(View.VISIBLE);
}
public void release() {
delegate = null;
stop();
}
}

BIN
modules/mogo-module-v2x/src/main/res/drawable-ldpi/loading_image.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 144 KiB

BIN
modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_icon_live_logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 12 KiB

BIN
modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_icon_live_logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
modules/mogo-module-v2x/src/main/res/drawable-xhdpi/loading_image.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 144 KiB

BIN
modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_live_logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

BIN
modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_close.png Normal file → Executable file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
modules/mogo-module-v2x/src/main/res/drawable/loading_image.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 144 KiB

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

@@ -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发布求助信息" />