修改延迟检测动效样式和云教练loading样式

accompanySDK/src/main/res/drawable/shape_accompany_loading_progress_drawable.xml

@@ -1,38 +1,24 @@
 <?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:height="10dp"
-        android:gravity="center_vertical">
+    <item android:id="@android:id/background">
         <shape>
-            <!-- 圆角 -->
-            <corners android:radius="5dp" />
-            <!--            背景色-->
-            <solid android:color="#54A3CFBD" />
-            <size android:height="10dp" />
+            <corners android:radius="4dip" />
+            <!--            <solid android:color="@color/color_eeeeee"/>-->
+            <stroke android:color="@color/white" android:width="1dp"/>
         </shape>
     </item>
-    <!--    滑动条-->
-    <item
-        android:id="@android:id/progress"
-        android:height="10dp"
-        android:gravity="center_vertical">
-        <clip>
-            <bitmap
-                android:layout_width="match_parent"
-                android:src="@drawable/icon_accompany_loading_progress_bg" />
-        </clip>
+    <item android:id="@android:id/progress">
         <!--        <clip>-->
         <!--            <shape>-->
-        <!--                &lt;!&ndash; 圆角 &ndash;&gt;-->
-        <!--                <corners android:radius="2dp" />-->
-        <!--                <gradient android:startColor="@color/main_style_color"-->
-        <!--                    android:endColor="@color/main_style_color"/>-->
-        <!--                &lt;!&ndash;            背景色&ndash;&gt;-->
-        <!--&lt;!&ndash;                <solid android:color="@color/color_2dc7aa"/>&ndash;&gt;-->
-        <!--                <size android:height="4dp"/>-->
+        <!--                <corners android:radius="4dip" />-->
+        <!--                <solid android:color="@color/color_4877ff"/>-->
         <!--            </shape>-->
         <!--        </clip>-->
+
+        <!--
+   -->
+        <scale android:scaleWidth="100%"
+            android:drawable="@drawable/progress_bar_ffffff_4dp"/>
     </item>
 </layer-list>

accompanySDK/src/main/res/layout/ac_custom_delay_check_layout.xml

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout 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="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/cs_root"
-    xmlns:tools="http://schemas.android.com/tools">
+    android:clipChildren="false"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
     <ImageView
         android:id="@+id/iv_bg"
@@ -15,16 +16,17 @@
 
     <com.airbnb.lottie.LottieAnimationView
         android:id="@+id/view_anim2"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
         android:layout_gravity="center"
-        app:layout_constraintLeft_toLeftOf="parent"
+        android:adjustViewBounds="true"
         app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:lottie_autoPlay="true"
+        app:lottie_clipToCompositionBounds="false"
         app:lottie_imageAssetsFolder="acc_lottie/accompany/images/"
         app:lottie_loop="true"
-        app:lottie_clipToCompositionBounds="false"
         app:lottie_rawRes="@raw/ac_delaycheck_shooting_star_anim" />
 
 
@@ -36,38 +38,39 @@
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:lottie_autoPlay="true"
+        android:adjustViewBounds="true"
+        app:lottie_clipToCompositionBounds="false"
         app:lottie_imageAssetsFolder="acc_lottie/accompany/images/"
         app:lottie_loop="true"
-        app:lottie_clipToCompositionBounds="true"
         app:lottie_rawRes="@raw/ac_delaycheck_bottom_bg_anim" />
 
     <com.airbnb.lottie.LottieAnimationView
         android:id="@+id/view_anim1"
         android:layout_width="96dp"
         android:layout_height="87dp"
-        android:layout_marginStart="11dp"
-        app:layout_constraintLeft_toRightOf="@+id/iv_center"
         android:layout_gravity="center"
+        android:layout_marginStart="11dp"
         android:layout_marginTop="41dp"
+        app:layout_constraintLeft_toRightOf="@+id/iv_center"
         app:layout_constraintTop_toTopOf="parent"
         app:lottie_autoPlay="true"
+        app:lottie_clipToCompositionBounds="false"
         app:lottie_imageAssetsFolder="acc_lottie/accompany/images/"
         app:lottie_loop="true"
-        app:lottie_clipToCompositionBounds="false"
         app:lottie_rawRes="@raw/ac_delaycheck_bubble_anim" />
 
     <com.airbnb.lottie.LottieAnimationView
         android:id="@+id/view_anim4"
         android:layout_width="96dp"
         android:layout_height="180dp"
-        android:layout_marginStart="11dp"
-        app:layout_constraintRight_toRightOf="parent"
         android:layout_gravity="center"
+        android:layout_marginStart="11dp"
         app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
         app:lottie_autoPlay="true"
+        app:lottie_clipToCompositionBounds="false"
         app:lottie_imageAssetsFolder="acc_lottie/accompany/images/"
         app:lottie_loop="true"
-        app:lottie_clipToCompositionBounds="false"
         app:lottie_rawRes="@raw/ac_delaycheck_right_anim" />
 
 
@@ -75,13 +78,13 @@
         android:id="@+id/view_anim5"
         android:layout_width="220dp"
         android:layout_height="162dp"
-        app:layout_constraintLeft_toLeftOf="parent"
         android:layout_gravity="center"
         app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
         app:lottie_autoPlay="true"
+        app:lottie_clipToCompositionBounds="false"
         app:lottie_imageAssetsFolder="acc_lottie/accompany/images/"
         app:lottie_loop="true"
-        app:lottie_clipToCompositionBounds="false"
         app:lottie_rawRes="@raw/ac_delaycheck_left_anim" />
 
     <ImageView
@@ -90,22 +93,22 @@
         android:layout_height="wrap_content"
         android:paddingStart="27dp"
         android:paddingTop="17dp"
-        android:src="@drawable/ac_icon_back"
+        android:src="@drawable/icon_accompany_back"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
     <ImageView
-        app:layout_constraintBottom_toBottomOf="parent"
         android:id="@+id/iv_tip"
         android:layout_width="0dp"
-        app:layout_constraintWidth_percent="0.418"
         android:layout_height="wrap_content"
-        android:adjustViewBounds="true"
         android:layout_marginBottom="27dp"
-        app:layout_constraintVertical_chainStyle="packed"
+        android:adjustViewBounds="true"
         android:src="@drawable/ac_icon_delay_check_tip1"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent" />
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintVertical_chainStyle="packed"
+        app:layout_constraintWidth_percent="0.418" />
 
     <View
         android:id="@+id/view_retry"
@@ -117,32 +120,32 @@
 
 
     <ImageView
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        android:src="@drawable/ac_check_prepare"
         android:id="@+id/iv_center"
         android:layout_width="0dp"
+        android:layout_height="wrap_content"
         android:adjustViewBounds="true"
-        app:layout_constraintWidth_percent="0.367"
-        android:layout_height="wrap_content"/>
+        android:src="@drawable/ac_check_prepare"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintWidth_percent="0.367" />
 
 
     <LinearLayout
-        tools:visibility="visible"
-        android:visibility="gone"
         android:id="@+id/ll_earphone_tip"
-        android:layout_marginTop="24dp"
-        app:layout_constraintTop_toTopOf="parent"
         android:layout_width="wrap_content"
         android:layout_height="38dp"
+        android:layout_marginTop="24dp"
         android:background="@drawable/acc_shape_70000000_19dp"
         android:gravity="center_vertical"
         android:orientation="horizontal"
         android:paddingStart="11dp"
         android:paddingEnd="7dp"
+        android:visibility="gone"
         app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent">
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:visibility="visible">
 
         <ImageView
             android:layout_width="wrap_content"

accompanySDK/src/main/res/layout/accompany_loading_layout.xml

@@ -20,12 +20,14 @@
         android:layout_width="0dp"
         app:layout_constraintWidth_percent="0.37"
         android:layout_height="wrap_content"
+        android:adjustViewBounds="true"
         android:layout_marginBottom="20dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:lottie_autoPlay="false"
+        app:lottie_imageAssetsFolder="lottie/accompany/images/"
         app:lottie_clipToCompositionBounds="false"
         app:lottie_loop="true"
         app:lottie_rawRes="@raw/accompany_loading" />
@@ -36,18 +38,19 @@
         android:layout_height="wrap_content"
         android:layout_marginBottom="13dp"
         android:text="@string/accompany_loading_tip"
-        android:textColor="@color/color_777777"
+        android:textColor="@color/white"
         android:textSize="14dp"
         app:layout_constraintBottom_toTopOf="@+id/progress"
         app:layout_constraintLeft_toLeftOf="@+id/progress"
         app:layout_constraintRight_toRightOf="@+id/progress" />
 
+
     <ProgressBar
         android:id="@+id/progress"
         style="@style/Widget.AppCompat.ProgressBar.Horizontal"
         android:layout_width="0dp"
         app:layout_constraintWidth_percent="0.36"
-        android:layout_height="wrap_content"
+        android:layout_height="8dp"
         android:layout_marginStart="34dp"
         android:layout_marginTop="16dp"
         android:layout_marginEnd="34dp"

accompanySDK/src/main/res/values/strings.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="accompany_loading_tip">正在努力加载中，请稍等...</string>
+    <string name="accompany_loading_tip">小酷正在努力加载,请稍等...</string>
 </resources>