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

Merge remote-tracking branch 'origin/qa_1.1.6' into qa_1.1.6

Browse Source
This commit is contained in:
wangcongtao
2020-09-28 20:11:41 +08:00
parent 0d84238be4 e3708d7197
commit 01ee94f55c
24 changed files with 37 additions and 42 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="1.8" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
</project>

2
gradle.properties
View File

@@ -102,7 +102,7 @@ CRASHREPORT_NOOP_VERSION=2.0.0
######## 外部依赖引用
# 车聊聊
CARCHATTING_VERSION=1.8.7
CARCHATTING_VERSION=1.9.5
# 车聊聊接口
CARCHATTINGPROVIDER_VERSION=1.4.1
# loglib

BIN
modules/mogo-module-common/src/main/res/drawable-mdpi/icon_heart_choose.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 721 B

BIN
modules/mogo-module-common/src/main/res/drawable-mdpi/icon_heart_second.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 740 B

BIN
modules/mogo-module-common/src/main/res/drawable-mdpi/icon_heart_unchoose.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 496 B

BIN
modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_choose.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_second.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_unchoose.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

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

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="heart_ratingbar_width">17px</dimen>
<dimen name="heart_ratingbar_height">14px</dimen>
<dimen name="heart_ratingbar_width">20px</dimen>
<dimen name="heart_ratingbar_height">16px</dimen>
<dimen name="v2x_panel_loading_top">120px</dimen>
<dimen name="v2x_share_btn_width">150px</dimen>
<dimen name="v2x_share_btn_height">48px</dimen>

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

@@ -1054,8 +1054,8 @@
<dimen name="sp_48">48px</dimen>
<dimen name="module_common_shadow_width">-10px</dimen>
<dimen name="module_common_shadow_width_pos">10px</dimen>
<dimen name="heart_ratingbar_width">31.9px</dimen>
<dimen name="heart_ratingbar_height">26px</dimen>
<dimen name="heart_ratingbar_width">36px</dimen>
<dimen name="heart_ratingbar_height">30px</dimen>
<dimen name="v2x_panel_loading_top">300px</dimen>
<dimen name="v2x_share_btn_width">281px</dimen>
<dimen name="v2x_share_btn_height">90px</dimen>

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

@@ -1045,8 +1045,8 @@
<dimen name="sp_48">26.2500px</dimen>
<dimen name="module_common_shadow_width">-8px</dimen>
<dimen name="module_common_shadow_width_pos">8px</dimen>
<dimen name="heart_ratingbar_width">16px</dimen>
<dimen name="heart_ratingbar_height">20px</dimen>
<dimen name="heart_ratingbar_width">20px</dimen>
<dimen name="heart_ratingbar_height">16px</dimen>
<dimen name="v2x_panel_loading_top">120px</dimen>
<dimen name="v2x_share_btn_width">150px</dimen>
<dimen name="v2x_share_btn_height">48px</dimen>

4
modules/mogo-module-common/src/main/res/values/styles.xml
View File

@@ -18,10 +18,10 @@
<style name="customHeartHeartRatingBarStyle" parent="@style/Widget.AppCompat.RatingBar">
<item name="android:minHeight">@dimen/heart_ratingbar_height</item>
<item name="android:maxHeight">@dimen/heart_ratingbar_height</item>
<item name="android:maxWidth">@dimen/heart_ratingbar_width</item>
<item name="android:minWidth">@dimen/heart_ratingbar_width</item>
<item name="android:minHeight">@dimen/heart_ratingbar_height</item>
<item name="android:maxHeight">@dimen/heart_ratingbar_height</item>
<item name="android:numStars">5</item>
<item name="android:rating">1</item>
<item name="android:stepSize">0.5</item>

2
modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
View File

@@ -400,10 +400,8 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
long guideRecordTime = SharedPrefsMgr.getInstance(AbsMogoApplication.getApp()).getLong(getSPGuideRecord(), 0);
Logger.d(TAG, " isGreaterThanOneDay interval = " + (System.currentTimeMillis() - guideRecordTime) + "---currentTime = " + System.currentTimeMillis() + "---guideRecordTime =" + guideRecordTime);
if ((System.currentTimeMillis() - guideRecordTime) > ONE_DAY_TIME) {
Logger.d(TAG, "--------1------");
isGreaterThanOneDay = true;
} else {
Logger.d(TAG, "--------2------");
isGreaterThanOneDay = false;
}

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

@@ -146,7 +146,7 @@
<dimen name="module_entrance_id_uploading_height">58px</dimen>
<dimen name="module_map_id_navi_next_info_distance_marginTop">3dp</dimen>
<dimen name="module_map_id_navi_next_info_road_marginBottom">10px</dimen>
<dimen name="module_map_id_navi_next_info_road_marginBottom_small">4px</dimen>
<dimen name="module_map_id_navi_next_info_road_marginBottom_small">6px</dimen>
<dimen name="module_map_id_navi_next_info_distance_marginStart">6px</dimen>
<dimen name="module_ext_display_overview_icon_marginTop">10px</dimen>

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

@@ -17,7 +17,7 @@
<dimen name="cards_container_shadow_dp_margin_top">319px</dimen>
<dimen name="module_main_apps_fragment_container_width">110px</dimen>
<dimen name="module_main_apps_fragment_container_padding">10px</dimen>
<dimen name="module_main_apps_fragment_container_padding">6px</dimen>
<dimen name="module_main_header_fragment_container_marginTop">15px</dimen>
<dimen name="module_main_header_fragment_container_marginLeft">460px</dimen>
<dimen name="module_main_id_entrance_fragment_container_marginLeft">444px</dimen>

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

@@ -17,7 +17,7 @@
<dimen name="cards_container_shadow_dp_margin_top">319px</dimen>
<dimen name="module_main_apps_fragment_container_width">110px</dimen>
<dimen name="module_main_apps_fragment_container_padding">10px</dimen>
<dimen name="module_main_apps_fragment_container_padding">6px</dimen>
<dimen name="module_main_header_fragment_container_marginTop">15px</dimen>
<dimen name="module_main_header_fragment_container_marginLeft">460px</dimen>
<dimen name="module_main_id_entrance_fragment_container_marginLeft">444px</dimen>

35
modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java
View File

@@ -209,28 +209,29 @@ public class ShareControl implements IMogoShareManager, IMogoIntentListener,
AIAssist.getInstance(mContext).registerUnWakeupCommand(UNWAKE_UPLOAD_REAL_TIME_TRAFFIC,
UPLOAD_REAL_TIME_TRAFFIC, ShareControl.this);
if (!DebugConfig.isLauncher()) {
ServiceApisManager.serviceApis.getStatusManagerApi().registerStatusChangedListener(TAG, StatusDescriptor.MAIN_PAGE_RESUME, new IMogoStatusChangedListener() {
@Override
public void onStatusChanged(StatusDescriptor descriptor, boolean isTrue) {
if (!isTrue) {
dismissShareDialog();
}
// if (!DebugConfig.isLauncher()) {
ServiceApisManager.serviceApis.getStatusManagerApi().registerStatusChangedListener(TAG,
StatusDescriptor.MAIN_PAGE_RESUME, new IMogoStatusChangedListener() {
@Override
public void onStatusChanged(StatusDescriptor descriptor, boolean isTrue) {
if (!isTrue) {
dismissShareDialog();
}
});
}
}
});
// }
// if (!DebugConfig.isLauncher()) {
ServiceApisManager.serviceApis.getStatusManagerApi().registerStatusChangedListener(TAG,
StatusDescriptor.ACC_STATUS, new IMogoStatusChangedListener() {
@Override
public void onStatusChanged(StatusDescriptor descriptor, boolean isTrue) {
if (isTrue) {
queryShareConfigRetryTime = 0;
queryShareButtonConfig();
}
}
});
@Override
public void onStatusChanged(StatusDescriptor descriptor, boolean isTrue) {
if (isTrue) {
queryShareConfigRetryTime = 0;
queryShareButtonConfig();
}
}
});
// 获取分享框配置信息
queryShareConfigRetryTime = 0;

10
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java
View File

@@ -72,34 +72,27 @@ public class V2XScenarioManager implements IV2XScenarioManager {
if (mV2XScenario == null) {
switch (v2XMessageEntity.getType()) {
case V2XMessageEntity.V2XTypeEnum.ALERT_ROAD_WARNING:
hidOtherPanel();
mV2XScenario = V2XRoadEventScenario.getInstance();
break;
case V2XMessageEntity.V2XTypeEnum.ALERT_SEEK_WARNING:
hidOtherPanel();
mV2XScenario = V2XSeekHelpScenario.getInstance();
break;
case V2XMessageEntity.V2XTypeEnum.ALERT_FATIGUE_DRIVING:
hidOtherPanel();
mV2XScenario = V2XFatigueDrivingScenario.getInstance();
break;
case V2XMessageEntity.V2XTypeEnum.ALERT_PUSH_WINDOW_WARNING:
hidOtherPanel();
mV2XScenario = V2XPushEventScenario.getInstance();
break;
case V2XMessageEntity.V2XTypeEnum.ALERT_PUSH_LIVE_CAR_WARNING:
hidOtherPanel();
mV2XScenario = V2XPushLiveCarScenario.getInstance();
break;
case V2XMessageEntity.V2XTypeEnum.ALERT_ANIMATION_WARNING:
hidOtherPanel();
mV2XScenario = V2XAnimationScenario.getInstance();
break;
case V2XMessageEntity.V2XTypeEnum.ALERT_CAR_FOR_HELP:
mV2XScenario = V2XCarForHelpScenario.getInstance();
break;
case V2XMessageEntity.V2XTypeEnum.ALERT_ILLEGAL_PARK_WARNING:
hidOtherPanel();
mV2XScenario = V2XIllegalParkScenario.getInstance();
break;
default:
@@ -111,6 +104,9 @@ public class V2XScenarioManager implements IV2XScenarioManager {
// 展示最新的消息
if (mV2XScenario != null) {
if (v2XMessageEntity.getType() != V2XMessageEntity.V2XTypeEnum.ALERT_CAR_FOR_HELP) {
hidOtherPanel();
}
mV2XScenario.init(v2XMessageEntity);
mV2XScenarioSet.put(v2XMessageEntity.getType(), mV2XScenario);
}

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

@@ -72,7 +72,7 @@
<dimen name="share_index_des_size">16px</dimen>
<dimen name="share_empty_btn_padding">20px</dimen>
<dimen name="shaer_refresh_padding">34px</dimen>
<dimen name="share_index_bottom_padding">15px</dimen>
<dimen name="share_index_bottom_padding">16px</dimen>
<dimen name="share_btn_middle_padding">29px</dimen>
<dimen name="v2x_panel_btn_translationY">-8px</dimen>
<dimen name="module_v2x_panel_tab_height">84px</dimen>

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

@@ -70,7 +70,7 @@
<dimen name="share_index_des_size">30px</dimen>
<dimen name="share_empty_btn_padding">40px</dimen>
<dimen name="shaer_refresh_padding">60px</dimen>
<dimen name="share_index_bottom_padding">36px</dimen>
<dimen name="share_index_bottom_padding">31px</dimen>
<dimen name="share_btn_middle_padding">54px</dimen>
<dimen name="v2x_panel_btn_translationY">-10px</dimen>
<dimen name="v2x_panel_btn_image_width">114px</dimen>

BIN
skin/mogo-skin-light/src/main/module-callchat-res/mipmap-ldpi/module_carchatting_user_cover_bg_light.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 30 KiB

BIN
skin/mogo-skin-light/src/main/module-callchat-res/mipmap-mdpi/module_carchatting_user_cover_bg_light.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 30 KiB

BIN
skin/mogo-skin-light/src/main/module-callchat-res/mipmap-xhdpi/module_carchatting_user_cover_bg_light.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 77 KiB

2
skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_alert_window_bg_light.xml
View File

@@ -29,7 +29,7 @@
<corners android:radius="@dimen/dp_26" />
<gradient
android:angle="135"
android:endColor="#E6F5F5F5"
android:endColor="#F5F5F5"
android:startColor="#FFFFFF"
android:type="linear"
android:useLevel="true" />