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

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

Browse Source
This commit is contained in:
wangcongtao
2020-09-25 17:18:38 +08:00
parent 784efe81b4 c486752f7f
commit a073a7b0f1
10 changed files with 109 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/em4/AndroidManifest.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:sharedUserId="android.uid.system"
package="com.mogo.launcher">
package="com.mogo.launcher">
<!-- android:sharedUserId="android.uid.system"-->
</manifest>

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

@@ -74,6 +74,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Random;
import static com.mogo.module.common.utils.SPConst.getSPGuideRecord;
import static com.mogo.module.common.utils.SPConst.getSpGuide;
import static com.mogo.module.share.constant.ShareConstants.KEY_CLICK_SHARE_BUTTON;
import static com.mogo.module.share.constant.ShareConstants.KEY_CLICK_SHARE_TIME;
@@ -382,8 +383,8 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
debugTopView();
boolean isShowGuide = SharedPrefsMgr.getInstance(AbsMogoApplication.getApp()).getBoolean(getSpGuide(), false);
Logger.d(TAG, " isShowGuide = " + isShowGuide);
if (isShowGuide) {
Logger.d(TAG, " isShowGuide = " + isShowGuide + " --isGreaterThanOneDay = " + isGreaterThanOneDay());
if (isShowGuide && isGreaterThanOneDay()) {
UiThreadHandler.postDelayed(() -> {
playShareOuterGuideVoice();
}, 5_000L
@@ -391,6 +392,20 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
}
}
private boolean isGreaterThanOneDay() {
boolean isGreaterThanOneDay;
long guideRecordTime = SharedPrefsMgr.getInstance(AbsMogoApplication.getApp()).getLong(getSPGuideRecord(), 0);
Logger.d(TAG, " isGreaterThanOneDay interval = " + (System.currentTimeMillis() - guideRecordTime));
if ((System.currentTimeMillis() - guideRecordTime) > ONE_DAY_TIME) {
isGreaterThanOneDay = true;
} else {
isGreaterThanOneDay = false;
}
return isGreaterThanOneDay;
}
Random random = new Random();
/**

2
modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java
View File

@@ -635,7 +635,7 @@ public class TopViewAnimHelper {
}
private int computeNaviMarginTop(int height) {
int result = (int) (height - (getDimen(R.dimen.module_ext_top_over_navi_height)));
int result = (int) (height - (getDimen(R.dimen.module_ext_top_over_navi_height))-getDimen(R.dimen.module_common_shadow_width_pos));
Logger.d(TAG, "computeNaviMarginTop: " + height + " result: " + result);
return result;
}

BIN
modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_window_alert_bg.9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_window_alert_bg.9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

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

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="module_media_music_state_location">468px</dimen>
<dimen name="module_media_music_state_location_x">581px</dimen>
<dimen name="module_media_music_state_location">467px</dimen>
<dimen name="module_media_music_state_location_x">573px</dimen>
<!-- lcc start-->
<dimen name="module_media_back_width">352px</dimen>
@@ -61,7 +61,7 @@
<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">332px</dimen>
<dimen name="module_media_pop_window_width">338px</dimen>
<dimen name="module_media_pop_window_height">82px</dimen>
<dimen name="module_media_pop_window_inner_height">60px</dimen>
<dimen name="module_media_pop_window_inner_padding">18px</dimen>

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

@@ -84,7 +84,7 @@
<dimen name="tanlu_module_close_height">45px</dimen>
<dimen name="tanlu_module_card_margin_top">13px</dimen>
<dimen name="tanlu_module_card_margin_left">6px</dimen>
<dimen name="tanlu_module_card_margin_left">8px</dimen>
<dimen name="tanlu_module_margin_right">7px</dimen>
<dimen name="tanlu_module_margin_left">17px</dimen>
<dimen name="tanlu_module_margin_top">3px</dimen>

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

@@ -67,9 +67,9 @@
android:maxLines="1"
android:textColor="@color/v2x_FFF_333"
android:textSize="@dimen/dp_36"
app:layout_constraintEnd_toStartOf="@+id/ivEventHead"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintEnd_toStartOf="@+id/ivEventHead"
app:layout_constraintStart_toStartOf="@+id/tvEventTypeTitle"
app:layout_constraintTop_toBottomOf="@+id/tvEventTypeTitle"
tools:text="东城区北三环中路辅路小黄庄路口" />

2
modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail.xml
View File

@@ -24,7 +24,7 @@
android:layout_width="@dimen/dp_88"
android:layout_height="@dimen/dp_88"
android:layout_marginEnd="@dimen/dp_28"
android:layout_marginBottom="@dimen/dp_65"
android:layout_marginBottom="@dimen/dp_40"
android:background="@drawable/icon_window_close2"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent" />

82
modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml Normal file
View File

@@ -0,0 +1,82 @@
<?xml version="1.0" encoding="UTF-8"?>
<resources>
<dimen name="module_main_v2x_animation_width">445px</dimen>
<dimen name="module_v2x_search_marginLeft">18px</dimen>
<dimen name="module_v2x_operation_panel_share_goneMarginRight">20px</dimen>
<dimen name="module_v2x_event_window_height">190px</dimen>
<dimen name="module_v2x_event_window_height_ground">250px</dimen>
<dimen name="module_v2x_push_img_height">190px</dimen>
<dimen name="module_v2x_push_img_container_height">210px</dimen>
<dimen name="module_v2x_fatigue_driving_window_height_ground">136px</dimen>
<dimen name="module_v2x_event_icon_size">82px</dimen>
<dimen name="module_v2x_event_button_size">54px</dimen>
<dimen name="module_v2x_event_button_size_detail">64px</dimen>
<dimen name="module_v2x_event_image_height">156px</dimen>
<dimen name="module_v2x_event_image_width">234px</dimen>
<dimen name="module_v2x_event_distance_text">34px</dimen>
<dimen name="module_v2x_event_distance_title">22px</dimen>
<dimen name="module_v2x_history_event_icon_size">40px</dimen>
<dimen name="module_v2x_surrounding_item_bottom_size">6px</dimen>
<dimen name="module_v2x_live_window_height">150px</dimen>
<dimen name="module_v2x_map_left">550px</dimen>
<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">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>
<dimen name="module_v2x_surrounding_empty_tv_margin_top">15px</dimen>
<dimen name="module_v2x_surrounding_empty_bt_width">150px</dimen>
<dimen name="module_v2x_surrounding_empty_bt_height">48px</dimen>
<dimen name="module_v2x_surrounding_empty_bt_margin_top">32px</dimen>
<dimen name="module_v2x_surrounding_root_margin_left">28px</dimen>
<dimen name="module_v2x_surrounding_margin_left">28px</dimen>
<dimen name="module_v2x_surrounding_empty_image_height">190px</dimen>
<dimen name="module_v2x_surrounding_item_width">238px</dimen>
<dimen name="module_v2x_surrounding_item_height">170px</dimen>
<dimen name="module_v2x_surrounding_item_bottom">43px</dimen>
<dimen name="module_v2x_surrounding_item_bottom_image_height">26px</dimen>
<dimen name="module_v2x_surrounding_item_marigin_left">12px</dimen>
<dimen name="module_v2x_surrounding_item_marigin_bottom_left">8px</dimen>
<dimen name="module_v2x_panel_surrounding_marginbottom">2px</dimen>
<dimen name="module_v2x_panel_surrounding_stance">30px</dimen>
<dimen name="module_v2x_surrounding_top">34px</dimen>
<dimen name="module_v2x_surrounding_list_margin_left">12px</dimen>
<dimen name="module_v2x_surrounding_item_margin_left">16px</dimen>
<dimen name="module_v2x_surrounding_refresh_bt_radius">24px</dimen>
<dimen name="module_v2x_surrounding_top_textsize">18px</dimen>
<dimen name="module_v2x_surrounding_item_bottom_left_textsize">20px</dimen>
<dimen name="module_v2x_surrounding_item_bottom_right_textsize">16px</dimen>
<dimen name="module_v2x_panel_width">82px</dimen>
<dimen name="module_v2x_panel_icon_cor">16px</dimen>
<dimen name="share_empty_icon_width">117px</dimen>
<dimen name="v2x_loading_ani_width">50px</dimen>
<dimen name="v2x_index_rating_top">17px</dimen>
<dimen name="share_top_text_size">16px</dimen>
<dimen name="share_des_num_size">36px</dimen>
<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_btn_middle_padding">29px</dimen>
<dimen name="v2x_panel_btn_translationY">-8px</dimen>
<dimen name="module_v2x_panel_tab_height">84px</dimen>
<dimen name="share_item_text_size">16px</dimen>
<dimen name="share_item_padding">20px</dimen>
</resources>