xml同步

app/src/main/res/layout-large/activity_banner.xml

@@ -17,8 +17,8 @@
         android:layout_alignParentRight="true"
         android:layout_marginRight="@dimen/textsize_20"
         android:layout_marginTop="@dimen/dp_40"
-        android:layout_width="@dimen/textsize_20"
-        android:layout_height="@dimen/textsize_20"
+        android:layout_width="@dimen/dp_40"
+        android:layout_height="@dimen/dp_40"
         android:src="@drawable/fullscreen">
     </ImageView>
     <LinearLayout
@@ -38,7 +38,7 @@
         <TextView
             android:gravity="center"
             android:layout_gravity="center"
-            android:textSize="20dp"
+            android:textSize="30dp"
             android:text="返回"
             android:textColor="#DF77CE"
             android:layout_width="wrap_content"

app/src/main/res/layout-large/activity_index.xml

@@ -130,12 +130,13 @@
     <TextView
         android:id="@+id/btn_get"
         android:text="播放SOP"
-        android:layout_marginLeft="20dp"
-        android:layout_marginRight="20dp"
+        android:layout_marginLeft="30dp"
+        android:layout_marginRight="30dp"
         android:layout_width="match_parent"
-        android:layout_height="50dp"
+        android:layout_height="70dp"
         android:layout_below="@id/include_menuactionbar"
         android:gravity="center"
+        android:textSize="25dp"
         android:layout_marginTop="@dimen/dp_10"
         android:layout_marginBottom="@dimen/textsize_20"
         android:background="@drawable/bg_button">
@@ -204,7 +205,6 @@
 
                     </LinearLayout>
                     <com.uas.esop.view.SwitchView
-                        android:visibility="gone"
                         android:id="@+id/sound_monitor_Vibration_sv"
                         android:layout_width="40dp"
                         android:layout_height="25dp"
@@ -397,6 +397,8 @@
                                         android:id="@+id/index_position_resource"
                                         style="@style/EditTextLineStyle"
                                         android:layout_width="match_parent"
+                                        android:layout_height="60dp"
+                                        android:textSize="25dp"
                                         android:hint="输入产品索引SOP"
                                         android:imeOptions="actionSend" />
 
@@ -419,7 +421,7 @@
                     <TextView
                         android:id="@+id/index_edit"
                         android:layout_width="match_parent"
-                        android:layout_height="50dp"
+                        android:layout_height="70dp"
                         android:layout_marginTop="@dimen/dp_10"
                         android:layout_marginLeft="30dp"
                         android:layout_marginRight="30dp"
@@ -427,6 +429,7 @@
                         android:background="@drawable/bg_button"
                         android:gravity="center"
                         android:textColor="@color/white"
+                        android:textSize="25dp"
                         android:text="搜索"
                         android:src="@drawable/search_48" />
                 </LinearLayout>
@@ -439,6 +442,7 @@
                     tools:ignore="NotSibling">
                     <TextView
                         android:text="当前获取文件:"
+                        android:textSize="30dp"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content">
                     </TextView>
@@ -449,12 +453,14 @@
                         android:layout_height="wrap_content">
                         <TextView
                             android:text="文件版本:"
+                            android:textSize="25dp"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content">
                         </TextView>
                         <TextView
                             android:id="@+id/tv_pscode"
                             android:text=""
+                            android:textSize="25dp"
                             android:layout_marginLeft="@dimen/dp_10"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content">
@@ -467,12 +473,14 @@
                         android:layout_height="wrap_content">
                         <TextView
                             android:text="产品:"
+                            android:textSize="25dp"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content">
                         </TextView>
                         <TextView
                             android:id="@+id/tv_ps_prodcode"
                             android:text=""
+                            android:textSize="25dp"
                             android:layout_marginLeft="@dimen/dp_10"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content">
@@ -480,6 +488,7 @@
                         <TextView
                             android:id="@+id/tv_pr_detail"
                             android:text=""
+                            android:textSize="25dp"
                             android:layout_marginLeft="@dimen/dp_10"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content">
@@ -487,6 +496,7 @@
                         <TextView
                             android:id="@+id/tv_pr_spec"
                             android:text=""
+                            android:textSize="25dp"
                             android:layout_marginLeft="@dimen/dp_10"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
@@ -503,12 +513,14 @@
                         android:layout_height="wrap_content">
                         <TextView
                             android:text="工序:"
+                            android:textSize="25dp"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content">
                         </TextView>
                         <TextView
                             android:id="@+id/tv_ps_stepcode"
                             android:text=""
+                            android:textSize="25dp"
                             android:layout_marginLeft="@dimen/dp_10"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content">
@@ -521,6 +533,7 @@
                         android:layout_height="wrap_content">
                         <TextView
                             android:text="下载地址:"
+                            android:textSize="25dp"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content">
                         </TextView>

app/src/main/res/layout-large/index_actionbar.xml

@@ -11,12 +11,13 @@
     <TextView
         android:id="@+id/actionbar"
         style="@style/ActionBarTextView"
+        android:textSize="30dp"
         tools:text="标题"/>
     <ImageView
         android:id="@+id/iv_setting"
         style="@style/ActionBarRightButton"
-        android:layout_width="@dimen/width_24"
-        android:layout_height="@dimen/height_24"
+        android:layout_width="@dimen/dp_40"
+        android:layout_height="@dimen/dp_40"
         android:layout_gravity="center_vertical"
         android:layout_marginRight="100dp"
         android:background="@mipmap/newsettingimage"

app/src/main/res/layout-large/popwin_whbatch_breakpackage.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-   android:layout_width="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <RelativeLayout
@@ -60,7 +61,8 @@
                 android:id="@+id/btn_print"
                 android:layout_toLeftOf="@id/btn_dialog_confirm_ok"
                 style="@style/PopwinCancleButtonStyle"
-                android:text="@string/text_btn_print"/>
+                android:text="@string/text_btn_print"
+                tools:ignore="NotSibling" />
         </RelativeLayout>
     </RelativeLayout>
 </RelativeLayout>

app/src/main/res/layout-large/recyclerview_item.xml

@@ -6,6 +6,7 @@
     android:orientation="horizontal">
 
     <LinearLayout
+        android:layout_marginRight="5dp"
         android:layout_marginTop="5dp"
         android:orientation="horizontal"
         android:layout_width="match_parent"
@@ -32,7 +33,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:textSize="15sp"
+                android:textSize="25dp"
                 android:text="1111111"
                 android:id="@+id/text"
                 android:gravity="left"

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

@@ -15,13 +15,12 @@
     <ImageView
         android:id="@+id/iv_setting"
         style="@style/ActionBarRightButton"
-        android:layout_width="@dimen/width_24"
-        android:layout_height="@dimen/height_24"
+        android:layout_width="@dimen/dp_40"
+        android:layout_height="@dimen/dp_40"
         android:layout_gravity="center_vertical"
-        android:layout_marginRight="70dp"
+        android:layout_marginRight="100dp"
         android:background="@mipmap/newsettingimage"
         />
-
     <ImageView
         android:id="@+id/btn_actionbar_scan_iv"
         style="@style/ActionBarRightButton"
@@ -29,6 +28,7 @@
         android:layout_height="@dimen/height_24"
         android:layout_gravity="center_vertical"
         android:layout_marginRight="15dp"
+        android:visibility="gone"
         android:background="@drawable/ic_scan_barcode"
         />
 </RelativeLayout>

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

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-   android:layout_width="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <RelativeLayout
@@ -60,7 +61,8 @@
                 android:id="@+id/btn_print"
                 android:layout_toLeftOf="@id/btn_dialog_confirm_ok"
                 style="@style/PopwinCancleButtonStyle"
-                android:text="@string/text_btn_print"/>
+                android:text="@string/text_btn_print"
+                tools:ignore="NotSibling" />
         </RelativeLayout>
     </RelativeLayout>
 </RelativeLayout>

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

@@ -32,7 +32,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:textSize="15sp"
+                android:textSize="25dp"
                 android:text="1111111"
                 android:id="@+id/text"
                 android:gravity="left"

build.gradle

@@ -57,8 +57,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 14,
-            versionName      : "v1.4"
+            versionCode      : 15,
+            versionName      : "v1.5"
     ]
 
     depsVersion = [

pda_libs/pulltoreflashlibrary/build/generated/source/buildConfig/debug/com/handmark/pulltorefresh/library/BuildConfig.java

@@ -13,6 +13,6 @@ public final class BuildConfig {
   public static final String APPLICATION_ID = "com.handmark.pulltorefresh.library";
   public static final String BUILD_TYPE = "debug";
   public static final String FLAVOR = "";
-  public static final int VERSION_CODE = 14;
-  public static final String VERSION_NAME = "v1.4";
+  public static final int VERSION_CODE = 15;
+  public static final String VERSION_NAME = "v1.5";
 }

pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageDebugResources/compile-file-map.properties

@@ -1,4 +1,4 @@
-#Mon Jun 19 09:05:52 CST 2023
+#Tue Jan 16 15:16:28 CST 2024
 D\:\\AndroidData\\uas-esop\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_top.xml=D\:\\AndroidData\\uas-esop\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_out_to_top.xml
 D\:\\AndroidData\\uas-esop\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_bottom.xml=D\:\\AndroidData\\uas-esop\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_out_to_bottom.xml
 D\:\\AndroidData\\uas-esop\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_bottom.xml=D\:\\AndroidData\\uas-esop\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_in_from_bottom.xml