提交人：jtm

提交内容:界面优化

BusinessCommon/src/main/res/layout/dialog_download_failure.xml

@@ -1,55 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:tools="http://schemas.android.com/tools"
     tools:background="#666">
 
     <LinearLayout
-        android:layout_width="@dimen/convert_810px"
+        android:layout_width="@dimen/convert_500px"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:orientation="vertical"
+        android:background="@drawable/bg_download_fail"
         android:gravity="center_horizontal"
-        android:paddingBottom="@dimen/convert_81px"
-        android:background="@drawable/bg_download_fail">
+        android:orientation="vertical"
+        android:paddingBottom="@dimen/convert_64px">
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/convert_69px"
+            android:includeFontPadding="false"
             android:text="@string/error"
-            android:textSize="@dimen/convert_54px"
             android:textColor="#E60012"
-            android:includeFontPadding="false"
-            android:layout_marginTop="@dimen/convert_90px"/>
+            android:textSize="@dimen/convert_36px" />
 
         <View
             android:id="@+id/view_download_fail"
-            android:layout_width="@dimen/convert_240px"
-            android:layout_height="@dimen/convert_167px"
-            android:layout_marginTop="@dimen/convert_86px"
-            android:background="@drawable/ic_download_failure"/>
+            android:layout_width="@dimen/convert_82px"
+            android:layout_height="@dimen/convert_56px"
+            android:layout_marginTop="@dimen/convert_42px"
+            android:background="@drawable/ic_download_failure" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/download_failed"
-            android:textSize="@dimen/convert_54px"
-            android:textColor="#6B6B6B"
+            android:layout_marginTop="@dimen/convert_30px"
             android:includeFontPadding="false"
-            android:layout_marginTop="@dimen/convert_35px"/>
+            android:text="@string/download_failed"
+            android:textColor="@color/color_1A1A1A"
+            android:textSize="@dimen/convert_30px" />
 
         <TextView
             android:id="@+id/tv_ok"
-            android:layout_width="@dimen/convert_270px"
-            android:layout_height="@dimen/convert_120px"
-            android:background="@drawable/bg_cook_step_ok"
+            android:layout_width="@dimen/convert_200px"
+            android:layout_height="@dimen/convert_60px"
+            android:layout_marginTop="@dimen/convert_63px"
+            android:background="@drawable/bg_orange_button"
+            android:gravity="center"
             android:text="@string/ok"
             android:textColor="#ffffff"
-            android:gravity="center"
-            android:textSize="@dimen/convert_54px"
-            android:layout_marginTop="@dimen/convert_71px"/>
+            android:textSize="@dimen/convert_30px" />
 
     </LinearLayout>
 

BusinessCommon/src/main/res/layout/dialog_recipe_update.xml

@@ -7,14 +7,14 @@
     tools:background="#000">
 
     <RelativeLayout
-        android:layout_width="@dimen/convert_780px"
+        android:layout_width="@dimen/convert_500px"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:background="@drawable/bg_white_button"
-        android:paddingStart="@dimen/convert_78px"
-        android:paddingTop="@dimen/convert_90px"
-        android:paddingEnd="@dimen/convert_78px"
-        android:paddingBottom="@dimen/convert_72px">
+        android:paddingStart="@dimen/convert_37px"
+        android:paddingTop="@dimen/convert_87px"
+        android:paddingEnd="@dimen/convert_37px"
+        android:paddingBottom="@dimen/convert_64px">
 
 
         <TextView
@@ -22,83 +22,80 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_centerHorizontal="true"
+            android:layout_marginBottom="@dimen/convert_43px"
             android:gravity="center"
             android:lineHeight="@dimen/convert_60px"
             android:text="@string/update_recipe_title"
             android:textColor="#F30101"
-            android:layout_marginBottom="@dimen/convert_43px"
-            android:textSize="@dimen/convert_45px" />
+            android:textSize="@dimen/convert_36px" />
 
         <RelativeLayout
             android:id="@+id/tips_ic"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_below="@id/tv_title"
             android:layout_centerHorizontal="true"
-            android:gravity="center"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content">
+            android:gravity="center">
+
             <ImageView
                 android:id="@+id/loading"
-                android:visibility="gone"
-                android:layout_width="@dimen/convert_100px"
-                android:layout_height="@dimen/convert_100px"
+                android:layout_width="@dimen/convert_60px"
+                android:layout_height="@dimen/convert_60px"
                 android:layout_centerHorizontal="true"
+                android:layout_marginBottom="@dimen/convert_41px"
                 android:gravity="center"
-                android:layout_marginBottom="@dimen/convert_43px"
+                android:visibility="gone"
                 app:srcCompat="@drawable/ic_recipe_update_loading" />
 
             <ImageView
                 android:id="@+id/success"
-                android:visibility="gone"
-                android:layout_width="@dimen/convert_100px"
-                android:layout_height="@dimen/convert_100px"
+                android:layout_width="@dimen/convert_60px"
+                android:layout_height="@dimen/convert_60px"
                 android:layout_centerHorizontal="true"
+                android:layout_marginBottom="@dimen/convert_41px"
                 android:gravity="center"
-                android:layout_marginBottom="@dimen/convert_43px"
+                android:visibility="gone"
                 app:srcCompat="@drawable/ic_recipe_update_success" />
         </RelativeLayout>
 
 
-
         <TextView
             android:id="@+id/tv_msg"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_below="@id/tips_ic"
             android:layout_centerHorizontal="true"
             android:gravity="center"
-            android:lineHeight="@dimen/convert_80px"
+            android:lineHeight="@dimen/convert_50px"
             android:text="有的食谱数据包，24个食谱,一共423MB，是否下载"
             android:textColor="#C1BFBF"
-            android:layout_below="@id/tips_ic"
-            android:textSize="@dimen/convert_36px" />
+            android:textSize="@dimen/convert_30px" />
 
         <TextView
-            android:layout_marginTop="@dimen/convert_80px"
             android:id="@+id/tv_yes"
-            android:layout_width="@dimen/convert_270px"
-            android:layout_height="@dimen/convert_120px"
-            android:background="@drawable/bg_tare_button"
+            android:layout_width="@dimen/convert_200px"
+            android:layout_height="@dimen/convert_60px"
+            android:layout_below="@id/tv_msg"
+            android:layout_marginTop="@dimen/convert_80px"
+            android:background="@drawable/bg_orange_button"
             android:gravity="center"
             android:text="@string/update"
             android:textColor="#fff"
-            android:textSize="@dimen/convert_54px"
-            android:layout_marginBottom="@dimen/convert_20px"
-            android:layout_below="@id/tv_msg"/>
+            android:textSize="@dimen/convert_30px" />
 
         <TextView
             android:id="@+id/tv_cancel"
-            android:layout_width="@dimen/convert_270px"
-            android:layout_height="@dimen/convert_120px"
+            android:layout_width="@dimen/convert_200px"
+            android:layout_height="@dimen/convert_60px"
             android:layout_below="@id/tv_msg"
             android:layout_alignParentEnd="true"
             android:layout_marginTop="@dimen/convert_80px"
-            android:layout_marginBottom="@dimen/convert_20px"
-            android:background="@drawable/bg_white_button"
+            android:background="@drawable/bg_ee8f08_stoke"
             android:elevation="@dimen/convert_4px"
             android:gravity="center"
             android:text="@string/no"
             android:textColor="#FB900C"
-            android:textSize="@dimen/convert_54px" />
-
+            android:textSize="@dimen/convert_30px" />
 
 
     </RelativeLayout>

BusinessMain/src/main/java/com/develop/main/ui/RecipesFragment.kt

@@ -43,6 +43,8 @@ class RecipesFragment : CommonBVMFragment<FragmentCommeListBinding, HomeViewMode
     private var currentHotWord = ""
     private var categoryCode: String = ""
 
+    private var lastPos = 0
+
     private val filterPopupWindow by lazy {
         CommonPopupWindow.ViewBuilder<FilterSortViewLayout>().width(dp417).height(dp549)
             .outsideTouchable(true).focusable(true).alpha(0.5f).clippingEnabled(false)

libThirdPart/build.gradle

@@ -35,6 +35,7 @@ dependencies {
     // ------------------------------数据库-------------------------------------
     api 'androidx.room:room-common:2.4.2'
     api 'androidx.room:room-runtime:2.4.2'
+    implementation files('libs/commons-lang3-3.12.0.jar')
     kapt  "androidx.room:room-compiler:2.4.2"
 
     // ------------------------------优化策略-------------------------------------