Merge branch 'master' into dev_hour_rank

2022-08-29 09:44:46 +08:00
parent 55ccb03b4a 513d6d19eb
commit 308ceeb28c
102 changed files with 3632 additions and 1015 deletions
--- a/live/src/main/res/drawable/bg_fast_meg.xml
+++ b/live/src/main/res/drawable/bg_fast_meg.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:width="112dp" android:height="25dp">
+        <shape android:shape="rectangle">
+            <solid android:color="#33000000"  />
+            <corners android:radius="12dp" />
+        </shape>
+    </item>
+</selector>
--- a/live/src/main/res/drawable/bg_guard_info.xml
+++ b/live/src/main/res/drawable/bg_guard_info.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:width="365dp" android:height="333dp">
+        <shape android:shape="rectangle">
+            <solid android:color="#ffffffff" />
+            <corners android:radius="16dp" />
+        </shape>
+    </item>
+</selector>
--- a/live/src/main/res/drawable/bg_guard_up_title.xml
+++ b/live/src/main/res/drawable/bg_guard_up_title.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:width="182dp" android:height="32dp">
+        <shape android:shape="rectangle">
+            <solid android:color="#ff9e7afd" />
+            <corners android:radius="16dp" />
+        </shape>
+    </item>
+</selector>
--- a/live/src/main/res/drawable/guardian_img_bg.png
+++ b/live/src/main/res/drawable/guardian_img_bg.png
--- a/live/src/main/res/drawable/guardian_img_wings.png
+++ b/live/src/main/res/drawable/guardian_img_wings.png
--- a/live/src/main/res/drawable/img_diamond.png
+++ b/live/src/main/res/drawable/img_diamond.png
--- a/live/src/main/res/drawable/img_guard_bottom.png
+++ b/live/src/main/res/drawable/img_guard_bottom.png
--- a/live/src/main/res/drawable/img_k_selected.png
+++ b/live/src/main/res/drawable/img_k_selected.png
--- a/live/src/main/res/drawable/img_k_uncheck.png
+++ b/live/src/main/res/drawable/img_k_uncheck.png
--- a/live/src/main/res/drawable/img_venosa.png
+++ b/live/src/main/res/drawable/img_venosa.png
--- a/live/src/main/res/drawable/live_loading.gif
+++ b/live/src/main/res/drawable/live_loading.gif
--- a/live/src/main/res/drawable/loading_00000.png
+++ b/live/src/main/res/drawable/loading_00000.png
--- a/live/src/main/res/drawable/loading_00001.png
+++ b/live/src/main/res/drawable/loading_00001.png
--- a/live/src/main/res/drawable/loading_00002.png
+++ b/live/src/main/res/drawable/loading_00002.png
--- a/live/src/main/res/drawable/loading_00003.png
+++ b/live/src/main/res/drawable/loading_00003.png
--- a/live/src/main/res/drawable/loading_00004.png
+++ b/live/src/main/res/drawable/loading_00004.png
--- a/live/src/main/res/drawable/loading_00005.png
+++ b/live/src/main/res/drawable/loading_00005.png
--- a/live/src/main/res/drawable/loading_00006.png
+++ b/live/src/main/res/drawable/loading_00006.png
--- a/live/src/main/res/drawable/loading_00007.png
+++ b/live/src/main/res/drawable/loading_00007.png
--- a/live/src/main/res/drawable/loading_00008.png
+++ b/live/src/main/res/drawable/loading_00008.png
--- a/live/src/main/res/drawable/loading_00009.png
+++ b/live/src/main/res/drawable/loading_00009.png
--- a/live/src/main/res/drawable/loading_00010.png
+++ b/live/src/main/res/drawable/loading_00010.png
--- a/live/src/main/res/drawable/loading_00011.png
+++ b/live/src/main/res/drawable/loading_00011.png
--- a/live/src/main/res/drawable/loading_00012.png
+++ b/live/src/main/res/drawable/loading_00012.png
--- a/live/src/main/res/drawable/loading_00013.png
+++ b/live/src/main/res/drawable/loading_00013.png
--- a/live/src/main/res/drawable/loading_00014.png
+++ b/live/src/main/res/drawable/loading_00014.png
--- a/live/src/main/res/drawable/loading_00015.png
+++ b/live/src/main/res/drawable/loading_00015.png
--- a/live/src/main/res/drawable/loading_animation.xml
+++ b/live/src/main/res/drawable/loading_animation.xml
@@ -2,13 +2,53 @@
 <animation-list xmlns:android="http://schemas.android.com/apk/res/android">

    <item
-        android:drawable="@drawable/img_loading_01"
-        android:duration="350" />
+        android:drawable="@drawable/loading_00000"
+        android:duration="100" />
    <item
-        android:drawable="@drawable/img_loading_02"
-        android:duration="350" />
+        android:drawable="@drawable/loading_00001"
+        android:duration="100" />
    <item
-        android:drawable="@drawable/img_loading_03"
-        android:duration="350" />
+        android:drawable="@drawable/loading_00002"
+        android:duration="100" />
+    <item
+        android:drawable="@drawable/loading_00003"
+        android:duration="100" />
+    <item
+        android:drawable="@drawable/loading_00004"
+        android:duration="100" />
+    <item
+        android:drawable="@drawable/loading_00005"
+        android:duration="100" />
+    <item
+        android:drawable="@drawable/loading_00006"
+        android:duration="100" />
+    <item
+        android:drawable="@drawable/loading_00007"
+        android:duration="100" />
+    <item
+        android:drawable="@drawable/loading_00008"
+        android:duration="100" />
+    <item
+        android:drawable="@drawable/loading_00009"
+        android:duration="100" />
+    <item
+        android:drawable="@drawable/loading_00010"
+        android:duration="100" />
+    <item
+        android:drawable="@drawable/loading_00011"
+        android:duration="100" />
+    <item
+        android:drawable="@drawable/loading_00012"
+        android:duration="100" />
+    <item
+        android:drawable="@drawable/loading_00013"
+        android:duration="100" />
+    <item
+        android:drawable="@drawable/loading_00014"
+        android:duration="100" />
+    <item
+        android:drawable="@drawable/loading_00015"
+        android:duration="100" />
+

 </animation-list>
--- a/live/src/main/res/drawable/sh_img_title.png
+++ b/live/src/main/res/drawable/sh_img_title.png