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

Merge branch 'dev' into demo/shunyi_v2v_merge

Browse Source 
# Conflicts:
#	app/src/main/java/com/mogo/launcher/MogoApplication.java
#	config.gradle
#	foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java
#	modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
#	modules/mogo-module-extensions/src/main/res/values-mdpi/dimens.xml
#	modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml
#	modules/mogo-module-extensions/src/main/res/values/dimens.xml
#	modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java
#	modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml
#	modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
#	modules/mogo-module-v2x/src/main/res/values/dimens.xml
#	services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java
#	services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java
#	upload.sh
This commit is contained in:
wangcongtao
2020-10-18 16:40:27 +08:00
parent d5abc0b598 83f78f8288
commit e092bb4489
479 changed files with 7101 additions and 8317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_description.xml
View File

@@ -3,8 +3,8 @@
android:shape="rectangle">
<corners android:radius="@dimen/dp_24"/>
<gradient
android:startColor="#5E6079"
android:endColor="#3F4057"
android:startColor="#B35E6079"
android:endColor="#B33F4057"
android:type="linear"
android:angle="180"/>

16
modules/mogo-module-v2x/src/main/res/drawable/share_rating_bar.xml
View File

@@ -1,16 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@android:id/background"
android:drawable="@drawable/icon_enthusiasm_unchoose">
</item>
<item
android:id="@android:id/secondaryProgress"
android:drawable="@drawable/icon_enthusiasm_second">
</item>
<item
android:id="@android:id/progress"
android:drawable="@drawable/icon_enthusiasm_choose">
</item>
</layer-list>

21
modules/mogo-module-v2x/src/main/res/drawable/v2xt_dw_common_corner_bkg_light.xml
View File

@@ -1,21 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="false">
<shape>
<corners android:radius="@dimen/dp_180" />
<gradient
android:angle="0"
android:endColor="#5CC1FF"
android:startColor="#256BFF" />
</shape>
</item>
<item android:state_pressed="true">
<shape>
<corners android:radius="@dimen/dp_180" />
<gradient
android:angle="0"
android:endColor="#5CC1FF"
android:startColor="#256BFF" />
</shape>
</item>
</selector>