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

fixed conflict

Browse Source
This commit is contained in:
lixiaopeng
2020-02-27 21:25:47 +08:00
parent d9e6792091
commit 8f62dd40e1
314 changed files with 8091 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/loading_bg.xml Normal file
View File

@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<rotate xmlns:android="http://schemas.android.com/apk/res/android"
android:fromDegrees="0"
android:pivotX="50%"
android:pivotY="50%"
android:toDegrees="1080.0">
<shape
android:shape="ring"
android:thickness="4mm"
android:useLevel="false">
<gradient
android:endColor="@color/color_545362"
android:startColor="@color/color_171F7FFF"
android:type="sweep"/>
</shape>
</rotate>

6
modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/selector_bg_btn_enlarge.xml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@mipmap/main_enlarge_btn_press" android:state_pressed="true" />
<item android:drawable="@mipmap/main_enlarge_btn_normal" android:state_pressed="false" />
<item android:drawable="@mipmap/main_enlarge_btn_normal" />
</selector>

6
modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/selector_bg_btn_pause.xml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- <item android:drawable="@mipmap/main_video_pause_btn_press" android:state_pressed="true" />-->
<item android:drawable="@drawable/main_video_pause_btn_normal" android:state_pressed="false" />
<item android:drawable="@drawable/main_video_pause_btn_normal" />
</selector>

6
modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/selector_bg_btn_play.xml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- <item android:drawable="@mipmap/main_video_play_btn_press" android:state_pressed="true" />-->
<item android:drawable="@drawable/main_video_play_btn_normal" android:state_pressed="false" />
<item android:drawable="@drawable/main_video_play_btn_normal" />
</selector>

6
modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/selector_bg_solid_left_page_up.xml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/main_solid_left_page_up_press" android:state_pressed="true"/>
<item android:drawable="@drawable/main_solid_left_page_up_normal" android:state_pressed="false"/>
<item android:drawable="@drawable/main_solid_left_page_up_normal"/>
</selector>

6
modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/selector_bg_solid_right_page_up.xml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/main_solid_right_page_up_press" android:state_pressed="true"/>
<item android:drawable="@drawable/main_solid_right_page_up_normal" android:state_pressed="false"/>
<item android:drawable="@drawable/main_solid_right_page_up_normal"/>
</selector>

7
modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/shape_bg_222533.xml Normal file
View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="@dimen/dp_10" />
<stroke android:color="@color/color_59FFFFFF"
android:width="@dimen/dp_2"/>
<!-- <solid android:color="@color/color_DADAE2"/>-->
</shape>

5
modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/shape_bg_222533_10px.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="@dimen/dp_20" />
<solid android:color="@color/color_F8F8F8"/>
</shape>

8
modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/shape_bg_222533_6px_bottom.xml Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:topLeftRadius="0dp"
android:topRightRadius="0dp"
android:bottomLeftRadius="6dp"
android:bottomRightRadius="6dp"/>
<solid android:color="@color/color_222533"/>
</shape>

5
modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/shape_bg_222533_9px.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="10dp" />
<solid android:color="@color/color_222533"/>
</shape>

6
modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/shape_bg_99191c25_4px.xml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="4dp"/>
<solid android:color="@color/color_99191C25"/>
</shape>

28
modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/small_video_seekbar_style.xml Normal file
View File

@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@android:id/background">
<shape>
<solid android:color="#59000000"/>
<corners android:radius="4dp" />
</shape>
</item>
<item android:id="@android:id/secondaryProgress">
<clip>
<shape>
<solid android:color="#40ffffff"/>
</shape>
</clip>
</item>
<item android:id="@android:id/progress">
<clip>
<shape>
<solid android:color="#FF0000"/>
<corners android:radius="5dp" />
<!--在gradient这里设置不同的颜色就会产生渐变的效果-->
<gradient
android:startColor="#1AFFFFFF"
android:endColor="#CCFFFFFF"/>
</shape>
</clip>
</item>
</layer-list>

9
modules/mogo-module-tanlu/build/intermediates/packaged_res/debug/drawable/tanlu_gradual_change_bg.xml Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
android:angle="270"
android:endColor="#323346"
android:startColor="#6E7091" />
<corners android:radius="@dimen/dp_20" />
</shape>