Quellcode durchsuchen

打包release测试

liukai vor 8 Monaten
Ursprung
Commit
ff5895ec2c

+ 2 - 1
app/proguard-rules.pro

@@ -109,7 +109,8 @@
 
 # 数据 Entity 类
 ######
-
+-keep class vn.hongyegroup.yybusiness.entity.** { *; }
+-keep class com.android.basiclib.bean.** { *; }
 
 # Guarded by a NoClassDefFoundError try/catch and only used when on the classpath.
 -dontwarn kotlin.Unit

+ 5 - 5
app/src/main/java/vn/hongyegroup/yybusiness/ui/MainActivity.kt

@@ -167,6 +167,10 @@ class MainActivity : BaseVVDActivity<MainViewModel, ActivityMainBinding>() {
 //            onRefresh()
 //        }
 
+        mBinding.llRefreshBox.click {
+            onRefresh()
+        }
+
         //退出登录事件
         mBinding.btnLogout.click {
             AreYouSureUtil.showPopup(mActivity, "Are you sure you need to exit the system?") {
@@ -199,11 +203,7 @@ class MainActivity : BaseVVDActivity<MainViewModel, ActivityMainBinding>() {
 
         //重置
         mBinding.btnReset.click {
-
-            AreYouSureUtil.showPopup(mActivity, "Are you sure you want to reset the filtering options?") {
-                resetFilteringOption()
-            }
-
+            resetFilteringOption()
         }
     }
 

BIN
app/src/main/res/drawable-xhdpi/refresh_icon.png


+ 22 - 5
app/src/main/res/layout/activity_main.xml

@@ -23,7 +23,7 @@
         android:gravity="center_vertical"
         android:orientation="horizontal"
         android:paddingLeft="@dimen/d_15dp"
-        android:paddingRight="@dimen/d_15dp">
+        android:paddingRight="@dimen/d_10dp">
 
 
         <LinearLayout
@@ -62,21 +62,38 @@
 
         </LinearLayout>
 
-        <Button
+        <TextView
             android:id="@+id/btn_reset"
             android:layout_width="wrap_content"
             android:layout_height="@dimen/d_35dp"
             android:layout_marginLeft="@dimen/d_10dp"
             android:background="@drawable/shape_button_bg_round"
             android:gravity="center"
-            android:paddingLeft="@dimen/d_11dp"
-            android:paddingRight="@dimen/d_11dp"
+            android:paddingLeft="@dimen/d_12dp"
+            android:paddingRight="@dimen/d_12dp"
             android:text="@string/reset"
             android:textAllCaps="false"
             android:textColor="@color/white"
             android:textSize="@dimen/d_15sp"
             android:textStyle="normal" />
 
+
+        <FrameLayout
+            android:id="@+id/ll_refresh_box"
+            android:layout_marginLeft="@dimen/d_10dp"
+            android:layout_width="@dimen/d_35dp"
+            android:layout_height="@dimen/d_35dp"
+            android:background="@drawable/shape_button_bg_circle">
+
+
+            <ImageView
+                android:layout_width="@dimen/d_20dp"
+                android:layout_height="@dimen/d_20dp"
+                android:layout_gravity="center"
+                android:src="@drawable/refresh_icon" />
+
+        </FrameLayout>
+
         <FrameLayout
             android:id="@+id/btn_logout"
             android:layout_width="@dimen/d_35dp"
@@ -147,7 +164,7 @@
         <FrameLayout
             android:id="@+id/fl_load_box"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="match_parent">
 
             <me.yokeyword.indexablerv.IndexableLayout
                 android:id="@+id/indexableLayout"