logd加载动画优化

app/src/main/res/layout/dialog_loading.xml

@@ -20,7 +20,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
         android:text="@string/uploading"
-        android:textColor="@color/black"
+        android:textColor="@color/green"
         android:textSize="16sp"/>
 
 </LinearLayout>

app/src/main/res/layout/home_menu_fragment.xml

@@ -134,7 +134,7 @@
         </LinearLayout>
 
 
-        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+        <com.ckkj.defense_device.view.PullRefreshLayout
             android:id="@+id/swipeRefreshLayout"
             android:layout_width="match_parent"
             android:layout_marginLeft="12dp"
@@ -152,11 +152,11 @@
                 android:layout_marginTop="8dp"
                 android:layout_marginEnd="12dp"
                 android:clipToPadding="false"
-                android:nestedScrollingEnabled="false"
+                android:overScrollMode="never"
                 android:paddingBottom="16dp"
                 android:background="@android:color/transparent"
                 tools:listitem="@layout/item_device" />
-        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+        </com.ckkj.defense_device.view.PullRefreshLayout>
 
         <LinearLayout
             android:id="@+id/layoutNoPermission"

app/src/main/res/layout/layout_refresh_header.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center_horizontal"
+    android:orientation="vertical"
+    android:paddingTop="24dp"
+    android:paddingBottom="20dp">
+
+    <ImageView
+        android:id="@+id/ivRefreshIcon"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:src="@mipmap/setting" />
+
+    <TextView
+        android:id="@+id/tvRefreshHint"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:text="@string/refresh_hint_pull"
+        android:textColor="@color/green"
+        android:textSize="13sp" />
+</LinearLayout>

app/src/main/res/values-zh/strings.xml

@@ -512,4 +512,11 @@
     <string name="cancel_account_btn">注销</string>
     <string name="confirm_cancel_account_user_account">确定注销该用户吗？</string>
 
+    <!-- HomeMenuFragment 列表刷新 -->
+    <string name="no_more_data">没有更多了</string>
+    <string name="refreshing">正在刷新…</string>
+    <string name="refresh_hint_pull">下拉刷新</string>
+    <string name="refresh_hint_release">松开刷新</string>
+    <string name="refresh_hint_refreshing">正在刷新…</string>
+
 </resources>

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

@@ -519,4 +519,11 @@
     <string name="current_account">Current Account</string>
     <string name="cancel_account_btn">Cancel</string>
     <string name="confirm_cancel_account_user_account">Confirm Cancel Account User Account</string>
+
+    <!-- Home Menu refresh / load more -->
+    <string name="no_more_data">No more data</string>
+    <string name="refreshing">Refreshing…</string>
+    <string name="refresh_hint_pull">Pull down to refresh</string>
+    <string name="refresh_hint_release">Release to refresh</string>
+    <string name="refresh_hint_refreshing">Refreshing…</string>
 </resources>