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
This commit is contained in:
tongchenfei
2020-09-17 17:45:49 +08:00
parent 7a3d7cdeca db77e51f65
commit 4ecb34dd5a
57 changed files with 169 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
modules/mogo-module-tanlu/src/main/res/drawable/tanlu_alert_window_bg.xml Normal file
View File

@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<!-- 边 -->
<item>
<shape android:shape="rectangle">
<padding
android:bottom="2dp"
android:left="2dp"
android:right="2dp"
android:top="2dp" />
<solid android:color="#00000000" />
<corners android:radius="@dimen/dp_30" />
</shape>
</item>
<item>
<shape android:shape="rectangle">
<padding
android:bottom="2dp"
android:left="2dp"
android:right="2dp"
android:top="2dp" />
<solid android:color="#00000000" />
<corners android:radius="@dimen/dp_30" />
</shape>
</item>
<!-- 中心背景 -->
<item>
<shape android:shape="rectangle">
<corners android:radius="@dimen/dp_30" />
<gradient
android:angle="135"
android:endColor="#3F4057"
android:startColor="#5E6079"
android:type="linear"
android:useLevel="true" />
</shape>
</item>
</layer-list>

3
modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler_new.xml
View File

@@ -2,8 +2,9 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="@dimen/tanlu_module_card_height">
android:layout_height="wrap_content">
<!-- android:background="@drawable/tanlu_gradual_change_bg"-->
<com.mogo.module.tanlu.view.RoundLayout
android:id="@+id/media_layout"
android:layout_width="@dimen/tanlu_module_card_video_width"

6
modules/mogo-module-tanlu/src/main/res/layout/tanlu_main_media_recycler_new.xml
View File

@@ -3,14 +3,14 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="@dimen/tanlu_module_card_height"
android:layout_alignParentRight="true"
android:background="@drawable/tanlu_top_bg">
android:background="@drawable/tanlu_alert_window_bg">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/tanlu_rloop_recycleview"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:listitem="@layout/tanlu_item_main_media_recycler_new"
/>
<!-- tools:listitem="@layout/tanlu_item_main_media_recycler_new"-->
</RelativeLayout>

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

@@ -78,6 +78,7 @@
<!--new-->
<dimen name="tanlu_module_card_width">642px</dimen>
<dimen name="tanlu_module_card_height">186px</dimen>
<dimen name="tanlu_module_card_inner_height">176px</dimen>
<dimen name="tanlu_module_card_video_width">250px</dimen>
<dimen name="tanlu_module_card_video_height">172px</dimen>
<dimen name="tanlu_module_close_height">45px</dimen>
@@ -92,7 +93,7 @@
<dimen name="tanlu_head_image_size">28px</dimen>
<dimen name="tanlu_image_size">56px</dimen>
<dimen name="tanlu_button_radius_size">3px</dimen>
<dimen name="tanlu_button_radius_size">6px</dimen>
<dimen name="tanlu_normal_image_radius_size">16px</dimen>
</resources>

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

@@ -78,13 +78,14 @@
<!--new-->
<dimen name="tanlu_module_card_width">1233px</dimen>
<dimen name="tanlu_module_card_height">326px</dimen>
<dimen name="tanlu_module_card_inner_height">306px</dimen>
<dimen name="tanlu_module_card_video_width">480px</dimen>
<dimen name="tanlu_module_card_video_height">280px</dimen>
<dimen name="tanlu_module_card_video_height">290px</dimen>
<dimen name="tanlu_module_close_height">80px</dimen>
<dimen name="tanlu_module_card_margin_top">19px</dimen>
<dimen name="tanlu_module_card_margin_left">12px</dimen>
<dimen name="tanlu_module_margin_right">12px</dimen>
<dimen name="tanlu_module_margin_right">24px</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>
@@ -92,7 +93,7 @@
<dimen name="tanlu_head_image_size">50px</dimen>
<dimen name="tanlu_image_size">90px</dimen>
<dimen name="tanlu_button_radius_size">6px</dimen>
<dimen name="tanlu_button_radius_size">10px</dimen>
<dimen name="tanlu_normal_image_radius_size">30px</dimen>
</resources>

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

@@ -77,22 +77,23 @@
<!--new-->
<dimen name="tanlu_module_card_width">1060px</dimen>
<dimen name="tanlu_module_card_height">326px</dimen>
<dimen name="tanlu_module_card_height">330px</dimen>
<dimen name="tanlu_module_card_inner_height">306px</dimen>
<dimen name="tanlu_module_card_video_width">421px</dimen>
<dimen name="tanlu_module_card_video_height">280px</dimen>
<dimen name="tanlu_module_card_video_height">290px</dimen>
<dimen name="tanlu_module_close_height">80px</dimen>
<dimen name="tanlu_module_card_margin_top">19px</dimen>
<dimen name="tanlu_module_card_margin_left">5px</dimen>
<dimen name="tanlu_module_margin_right">0px</dimen>
<dimen name="tanlu_module_margin_left">30px</dimen>
<dimen name="tanlu_module_card_margin_left">13px</dimen>
<dimen name="tanlu_module_margin_right">24px</dimen>
<dimen name="tanlu_module_margin_left">15px</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>
<dimen name="tanlu_head_image_size">50px</dimen>
<dimen name="tanlu_image_size">98px</dimen>
<dimen name="tanlu_button_radius_size">6px</dimen>
<dimen name="tanlu_button_radius_size">10px</dimen>
<dimen name="tanlu_normal_image_radius_size">30px</dimen>
</resources>

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

@@ -78,6 +78,7 @@
<!--new-->
<dimen name="tanlu_module_card_width">642px</dimen>
<dimen name="tanlu_module_card_height">186px</dimen>
<dimen name="tanlu_module_card_inner_height">176px</dimen>
<dimen name="tanlu_module_card_video_width">250px</dimen>
<dimen name="tanlu_module_card_video_height">172px</dimen>
<dimen name="tanlu_module_close_height">45px</dimen>
@@ -92,7 +93,7 @@
<dimen name="tanlu_head_image_size">28px</dimen>
<dimen name="tanlu_image_size">56px</dimen>
<dimen name="tanlu_button_radius_size">3px</dimen>
<dimen name="tanlu_button_radius_size">6px</dimen>
<dimen name="tanlu_normal_image_radius_size">16px</dimen>
</resources>

2
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
View File

@@ -13,6 +13,7 @@ import androidx.recyclerview.widget.RecyclerView;
import com.mogo.commons.mvp.MvpFragment;
import com.mogo.module.v2x.R;
import com.mogo.module.v2x.SpacesItemDecoration;
import com.mogo.module.v2x.adapter.V2XShareEventAdapter;
import com.mogo.module.v2x.entity.panel.V2XShareEventDescription;
import com.mogo.module.v2x.entity.panel.V2XShareEventItem;
@@ -61,6 +62,7 @@ public class V2XShareEventsFragment extends MvpFragment<V2XShareEventsFragment,
private void initRecyclerView() {
recyclerView = mRootView.findViewById(R.id.road_case_share_list);
recyclerView.addItemDecoration(new SpacesItemDecoration(24));
adapter = new V2XShareEventAdapter(getActivity(), dataArrayList, this);
recyclerView.setAdapter(adapter);
LinearLayoutManager linearLayoutManager =

6
modules/mogo-module-v2x/src/main/res/drawable/v2x_alert_window_bg.xml
View File

@@ -9,7 +9,7 @@
android:right="2dp"
android:top="2dp" />
<solid android:color="#00000000" />
<corners android:radius="@dimen/dp_30" />
<corners android:radius="@dimen/dp_26" />
</shape>
</item>
<item>
@@ -20,13 +20,13 @@
android:right="2dp"
android:top="2dp" />
<solid android:color="#00000000" />
<corners android:radius="@dimen/dp_30" />
<corners android:radius="@dimen/dp_26" />
</shape>
</item>
<!-- 中心背景 -->
<item>
<shape android:shape="rectangle">
<corners android:radius="@dimen/dp_30" />
<corners android:radius="@dimen/dp_26" />
<gradient
android:angle="135"
android:endColor="#3F4057"

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

@@ -133,7 +133,7 @@
android:layout_width="@dimen/module_v2x_event_button_size_detail"
android:layout_height="@dimen/module_v2x_event_button_size_detail"
android:layout_marginLeft="@dimen/dp_10"
android:padding="@dimen/dp_10"
android:padding="@dimen/dp_15"
android:src="@drawable/selector_live_btn"
android:visibility="gone"
app:layout_constraintStart_toStartOf="parent"
@@ -144,7 +144,7 @@
android:id="@+id/ivEventReportTrue"
android:layout_width="@dimen/module_v2x_event_button_size_detail"
android:layout_height="@dimen/module_v2x_event_button_size_detail"
android:padding="@dimen/dp_10"
android:padding="@dimen/dp_15"
android:scaleType="fitXY"
android:src="@drawable/icon_report_true"
android:visibility="gone"
@@ -157,7 +157,7 @@
android:id="@+id/ivEventReportErr"
android:layout_width="@dimen/module_v2x_event_button_size_detail"
android:layout_height="@dimen/module_v2x_event_button_size_detail"
android:padding="@dimen/dp_10"
android:padding="@dimen/dp_15"
android:src="@drawable/icon_report_err"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@+id/ivEventLive"
@@ -169,7 +169,7 @@
android:id="@+id/ivEventCallChart"
android:layout_width="@dimen/module_v2x_event_button_size_detail"
android:layout_height="@dimen/module_v2x_event_button_size_detail"
android:padding="@dimen/dp_10"
android:padding="@dimen/dp_15"
android:src="@drawable/selector_talk_btn"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@+id/ivEventLive"
@@ -181,7 +181,7 @@
android:id="@+id/ivEventEventNav"
android:layout_width="@dimen/module_v2x_event_button_size_detail"
android:layout_height="@dimen/module_v2x_event_button_size_detail"
android:padding="@dimen/dp_10"
android:padding="@dimen/dp_15"
android:src="@drawable/selector_nav_btn"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@+id/ivEventLive"
@@ -193,7 +193,7 @@
android:id="@+id/ivEventZan"
android:layout_width="@dimen/module_v2x_event_button_size_detail"
android:layout_height="@dimen/module_v2x_event_button_size_detail"
android:padding="@dimen/dp_10"
android:padding="@dimen/dp_15"
android:src="@drawable/v2x_event_icon_zan"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@+id/ivEventLive"

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

@@ -9,7 +9,7 @@
<com.mogo.module.v2x.view.V2XLiveGSYVideoView
android:id="@+id/videoPlayer"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="@dimen/module_v2x_live_window_height"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"

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

@@ -19,7 +19,7 @@
android:paddingLeft="20px"
android:paddingTop="10px"
android:text="小窍门：分享路况，点赞其他车主，有助于提高热心指数"
android:textColor="#FFFFFF"
android:textColor="#CCFFFFFF"
android:textSize="@dimen/share_top_text_size">
</TextView>

8
modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml
View File

@@ -6,14 +6,14 @@
android:layout_height="wrap_content"
android:layout_marginLeft="20px"
android:layout_marginRight="20px"
android:layout_marginBottom="14px"
android:layout_marginBottom="@dimen/dp_14"
android:background="@drawable/bg_v2x_event_list_item">
<TextView
android:id="@+id/road_case_style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginLeft="@dimen/dp_36"
android:layout_marginTop="@dimen/dp_24"
android:background="@drawable/bg_v2x_event_type_read"
android:gravity="center"
@@ -80,7 +80,7 @@
android:lines="1"
android:text="东城区北三环附近维多欧美"
android:textColor="@color/v2x_FFF_333"
android:textSize="@dimen/dp_34" />
android:textSize="@dimen/dp_32" />
<TextView
android:id="@+id/road_case_share_time"
@@ -94,5 +94,5 @@
android:gravity="left"
android:text="时间:"
android:textColor="@color/v2x_FFF_666"
android:textSize="@dimen/dp_30" />
android:textSize="@dimen/share_item_text_size" />
</RelativeLayout>

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

@@ -11,7 +11,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="@dimen/dp_30"
app:roundLayoutRadius="@dimen/dp_40">
app:roundLayoutRadius="@dimen/dp_28">
<com.mogo.module.v2x.view.TextureVideoView
android:id="@+id/vvCarAnimation"

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

@@ -4,12 +4,12 @@
<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">170px</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">122px</dimen>
<dimen name="module_v2x_fatigue_driving_window_height_ground">136px</dimen>
<dimen name="module_v2x_event_icon_size">82px</dimen>
@@ -76,5 +76,6 @@
<dimen name="v2x_panel_btn_translationY">-8px</dimen>
<dimen name="module_v2x_panel_tab_height">84px</dimen>
<dimen name="v2x_panel_loading_top">120px</dimen>
<dimen name="share_item_text_size">16px</dimen>
</resources>

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

@@ -64,7 +64,7 @@
<dimen name="v2x_share_btn_width">281px</dimen>
<dimen name="v2x_share_btn_height">90px</dimen>
<dimen name="v2x_index_rating_top">28px</dimen>
<dimen name="share_top_text_size">30px</dimen>
<dimen name="share_top_text_size">28px</dimen>
<dimen name="share_des_num_size">67.5px</dimen>
<dimen name="share_index_des_size">30px</dimen>
<dimen name="share_empty_btn_padding">40px</dimen>
@@ -75,5 +75,6 @@
<dimen name="v2x_panel_btn_image_width">114px</dimen>
<dimen name="module_v2x_panel_tab_height">158px</dimen>
<dimen name="v2x_panel_loading_top">300px</dimen>
<dimen name="share_item_text_size">26px</dimen>
</resources>

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

@@ -4,12 +4,12 @@
<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">170px</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">122px</dimen>
<dimen name="module_v2x_fatigue_driving_window_height_ground">136px</dimen>
<dimen name="module_v2x_event_icon_size">82px</dimen>