使項目兼容AndroidX,修复SOP播放图片时分辨率太小,不清晰问题.

app/src/main/java/com/uas/standard_esop/activity/IndexActivity.java

@@ -1423,6 +1423,7 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
         } else {
             CommonUtil.toastNoRepeat(this, getString(R.string.no_camera_detected));
         }
+        //无用注释
     }
 
     @Override

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

@@ -23,7 +23,7 @@
             android:layout_height="wrap_content"
             app:srlAccentColor="@android:color/darker_gray" />
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/common_select_rv"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -12,4 +13,4 @@
         tools:ignore="MissingConstraints" />
 
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -18,7 +18,7 @@
         android:imeOptions="actionSend"
         android:gravity="left"
         />
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/common_select_rv"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />

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

@@ -4,7 +4,7 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/item_jlt_search_whcode_rv"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />

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

@@ -6,7 +6,7 @@
     android:focusableInTouchMode="true"
     android:orientation="vertical">
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/first_last_manage_add_rv"
         android:layout_width="match_parent"
         android:layout_height="0dp"

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

@@ -4,7 +4,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/first_last_manage_sub_rv"
         android:layout_width="match_parent"
         android:layout_height="0dp"

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

@@ -24,7 +24,7 @@
             android:layout_height="wrap_content"
             app:srlAccentColor="@android:color/darker_gray" />
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/gd_work_start_rv"
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />

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

@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     >
-     <android.support.v4.widget.NestedScrollView
+     <androidx.core.widget.NestedScrollView
          android:layout_width="match_parent"
          android:layout_height="match_parent">
          <LinearLayout
@@ -141,14 +141,14 @@
 
              </LinearLayout>
 
-             <android.support.v7.widget.RecyclerView
+             <androidx.recyclerview.widget.RecyclerView
                  android:id="@+id/rv_content"
                  android:layout_width="match_parent"
                  android:layout_height="wrap_content"
                  android:layout_marginTop="5dp"
                  android:layout_marginBottom="5dp"
                  tools:listitem="@layout/item_hepi">
-             </android.support.v7.widget.RecyclerView>
+             </androidx.recyclerview.widget.RecyclerView>
              <Button
                  android:id="@+id/btn_confirm"
                  style="@style/ButtonStyle"
@@ -166,7 +166,7 @@
 
          </LinearLayout>
 
-     </android.support.v4.widget.NestedScrollView>
+     </androidx.core.widget.NestedScrollView>
 
 
 

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

@@ -1,8 +1,8 @@
 <?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="match_parent"
-    android:orientation="vertical">
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
 
     <ScrollView
         android:layout_width="match_parent"

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

@@ -26,7 +26,7 @@
             android:layout_height="wrap_content"
             app:srlAccentColor="@android:color/darker_gray" />
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/feeded_rv"
             android:layout_width="match_parent"
             android:layout_height="match_parent"

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

@@ -36,7 +36,7 @@
             android:textColor="@color/text_blue" />
     </LinearLayout>
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/pda_wms_in_done_list_rv"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />

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

@@ -15,7 +15,7 @@
         android:visibility="gone"
         tools:text="采购验收单" />
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/pda_wms_in_todo_list_rv"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />

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

@@ -39,7 +39,7 @@
         android:orientation="vertical"
         android:visibility="gone">
 
-        <android.support.v4.widget.NestedScrollView
+        <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
@@ -50,7 +50,7 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
 
-                <android.support.v7.widget.RecyclerView
+                <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/product_check_result_rv"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -145,14 +145,14 @@
                             android:textColor="@color/black" />
                     </LinearLayout>
 
-                    <android.support.v7.widget.RecyclerView
+                    <androidx.recyclerview.widget.RecyclerView
                         android:id="@+id/product_check_spotcheck_rv"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content" />
                 </LinearLayout>
             </LinearLayout>
 
-        </android.support.v4.widget.NestedScrollView>
+        </androidx.core.widget.NestedScrollView>
 
         <LinearLayout
             android:layout_width="match_parent"

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

@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/quality_manage_rv"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />

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

@@ -4,12 +4,12 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rv_content"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-    </android.support.v7.widget.RecyclerView>
+    </androidx.recyclerview.widget.RecyclerView >
 
 
 </LinearLayout>

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

@@ -13,7 +13,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" >
 
-        <include layout="@layout/refresh_head" />
+
         <!-- 支持所有实现Pullable接口的View -->
 
         <com.uas.standard_esop.view.PullableListView

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

@@ -49,7 +49,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent" >
 
-
                 <!-- 支持所有实现Pullable接口的View -->
 
                 <com.uas.standard_esop.view.PullableListView

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

@@ -174,7 +174,6 @@
                         android:layout_alignParentRight="true"
                         android:visibility="gone" />
                 </RelativeLayout>
-
                 <RelativeLayout
                     android:visibility="gone"
                     android:id="@+id/setting_monitor_rl"
@@ -198,8 +197,6 @@
                         android:layout_alignParentRight="true"
                         android:visibility="gone" />
                 </RelativeLayout>
-
-
                 <RelativeLayout
                     android:id="@+id/setting_default_rl"
                     style="@style/SettingListItemStyle">

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

@@ -11,7 +11,7 @@
         android:layout_height="wrap_content"
         app:srlAccentColor="@android:color/darker_gray" />
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/storage_detail_list_rv"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />

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

@@ -18,7 +18,7 @@
             android:layout_height="wrap_content"
             app:srlAccentColor="@android:color/darker_gray" />
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/storage_out_temporary_detail_list_rv"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />

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

@@ -11,6 +11,7 @@
     <TextView
         android:id="@+id/actionbar"
         style="@style/ActionBarTextView"
+        android:textSize="30dp"
         tools:text="标题"/>
     <ImageView
         android:id="@+id/iv_setting"

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

@@ -5,83 +5,83 @@
     android:layout_margin="12dp"
     android:background="@color/background"
     android:orientation="vertical">
-    <TextView
-        android:visibility="gone"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:padding="14dp"
-        android:text="请采集岗位资源" />
+        <TextView
+            android:visibility="gone"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:padding="14dp"
+            android:text="请采集岗位资源" />
 
-    <LinearLayout
-        android:layout_marginTop="@dimen/dp_10"
-        android:id="@+id/line_top"
-        android:layout_width="match_parent"
-        android:layout_height="36dp"
-        android:background="@color/white"
-        android:orientation="horizontal">
+        <LinearLayout
+            android:layout_marginTop="@dimen/dp_10"
+            android:id="@+id/line_top"
+            android:layout_width="match_parent"
+            android:layout_height="36dp"
+            android:background="@color/white"
+            android:orientation="horizontal">
 
-        <com.uas.standard_esop.view.ClearableEditText
-            android:id="@+id/edit_et"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_marginLeft="16dp"
-            android:layout_marginRight="16dp"
-            android:layout_weight="1"
-            android:background="@drawable/bg_line_edittext"
-            android:gravity="center_vertical"
-            android:hint="请输入要搜索的站点资源"
-            android:padding="5dp"
-            android:textSize="14sp"/>
+            <com.uas.standard_esop.view.ClearableEditText
+                android:id="@+id/edit_et"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="16dp"
+                android:layout_marginRight="16dp"
+                android:layout_weight="1"
+                android:background="@drawable/bg_line_edittext"
+                android:gravity="center_vertical"
+                android:hint="请输入要搜索的站点资源"
+                android:padding="5dp"
+                android:textSize="14sp"/>
 
-        <ImageView
-            android:visibility="gone"
-            android:id="@+id/search_im"
-            android:layout_width="46dp"
-            android:layout_height="match_parent"
-            android:layout_marginRight="10dp"
-            android:background="@drawable/bg_button"
-            android:src="@drawable/search_48" />
-    </LinearLayout>
-    <android.support.v7.widget.RecyclerView
-        android:id="@+id/rv_ip_port_data"
-        android:layout_centerHorizontal="true"
-        android:layout_width="match_parent"
-        android:layout_marginLeft="@dimen/dp_10"
-        android:layout_marginRight="@dimen/dp_10"
-        android:layout_below="@+id/line_top"
-        android:layout_height="200dp">
-    </android.support.v7.widget.RecyclerView>
-    <LinearLayout
-        android:layout_below="@+id/rv_ip_port_data"
-        android:layout_centerHorizontal="true"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        android:layout_marginBottom="10dp">
+            <ImageView
+                android:visibility="gone"
+                android:id="@+id/search_im"
+                android:layout_width="46dp"
+                android:layout_height="match_parent"
+                android:layout_marginRight="10dp"
+                android:background="@drawable/bg_button"
+                android:src="@drawable/search_48" />
+        </LinearLayout>
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/rv_ip_port_data"
+            android:layout_centerHorizontal="true"
+            android:layout_width="match_parent"
+            android:layout_marginLeft="@dimen/dp_10"
+            android:layout_marginRight="@dimen/dp_10"
+            android:layout_below="@+id/line_top"
+            android:layout_height="200dp">
+        </androidx.recyclerview.widget.RecyclerView >
+        <LinearLayout
+            android:layout_below="@+id/rv_ip_port_data"
+            android:layout_centerHorizontal="true"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:layout_marginBottom="10dp">
 
-        <Button
-            android:id="@+id/sure_tv"
-            android:layout_width="0dp"
-            android:layout_height="36dp"
-            android:layout_margin="12dp"
-            android:layout_weight="1"
-            android:background="@drawable/selector_confirm_bg"
-            android:gravity="center"
-            android:text="确定"
-            android:textColor="@color/white" />
+            <Button
+                android:id="@+id/sure_tv"
+                android:layout_width="0dp"
+                android:layout_height="36dp"
+                android:layout_margin="12dp"
+                android:layout_weight="1"
+                android:background="@drawable/selector_confirm_bg"
+                android:gravity="center"
+                android:text="确定"
+                android:textColor="@color/white" />
 
-        <Button
-            android:id="@+id/cancle_tv"
-            android:layout_width="0dp"
-            android:layout_height="36dp"
-            android:layout_margin="12dp"
-            android:layout_weight="1"
-            android:background="@drawable/selector_cancel_bg"
-            android:gravity="center"
-            android:text="取消"
-            android:textColor="@color/selector_cancel_text_color" />
-    </LinearLayout>
+            <Button
+                android:id="@+id/cancle_tv"
+                android:layout_width="0dp"
+                android:layout_height="36dp"
+                android:layout_margin="12dp"
+                android:layout_weight="1"
+                android:background="@drawable/selector_cancel_bg"
+                android:gravity="center"
+                android:text="取消"
+                android:textColor="@color/selector_cancel_text_color" />
+        </LinearLayout>
 
 
 

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

@@ -43,7 +43,7 @@
             android:background="@drawable/bg_button"
             android:src="@drawable/search_48" />
     </LinearLayout>
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rv_ip_port_data"
         android:layout_centerHorizontal="true"
         android:layout_width="match_parent"
@@ -52,7 +52,7 @@
         android:layout_below="@+id/line_top"
         android:layout_height="200dp"
         android:layout_marginTop="30dp">
-    </android.support.v7.widget.RecyclerView>
+    </androidx.recyclerview.widget.RecyclerView >
     <LinearLayout
         android:layout_below="@+id/rv_ip_port_data"
         android:layout_centerHorizontal="true"

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

@@ -25,7 +25,7 @@
             android:imeOptions="actionSend" />
     </LinearLayout>
     <com.uas.standard_esop.view.SwitchView
-        android:id="@+id/sound_monitor_Vibration_sv"
+        android:id="@+id/sound_setting_Vibration_sv"
         android:layout_width="40dp"
         android:layout_height="25dp"
         android:layout_below="@+id/line_ip_port"

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

@@ -20,7 +20,7 @@
         android:textSize="16sp"
         android:text="请选择" />
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/pop_common_check_content_rv"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

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

@@ -5,7 +5,7 @@
     android:orientation="vertical"
     android:background="@color/white">
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/common_list_menu_rv"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />

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

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--入库单搜索PopWin 备料单搜索PopWin 飞达搜索PopWin-->
 <LinearLayout 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"
     android:id="@+id/ll_inmake_search"
@@ -49,7 +50,8 @@
             android:layout_marginLeft="16dp"
             android:layout_marginRight="16dp"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="match_parent"
+            tools:ignore="MissingClass">
 
 
             <!-- 支持所有实现Pullable接口的View -->

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

@@ -3,13 +3,13 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/white"
     android:orientation="vertical"
+    android:background="@color/white"
     tools:ignore="MissingDefaultResource">
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/common_select_rvs"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="wrap_content" />
 
 
 </LinearLayout>

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

@@ -46,7 +46,7 @@
                     app:srlAccentColor="@android:color/darker_gray" />
             </com.scwang.smartrefresh.layout.SmartRefreshLayout>
 
-            <android.support.v7.widget.RecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/fuzzy_rv"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />

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

@@ -1,4 +1,4 @@
-#Fri Aug 16 15:03:15 CST 2024
+#Fri Aug 16 17:21:21 CST 2024
 D\:\\GongSi\\AS_XiangMu\\ESOP-STANDARD\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\default_ptr_rotate.png=D\:\\GongSi\\AS_XiangMu\\ESOP-STANDARD\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\default_ptr_rotate.png
 D\:\\GongSi\\AS_XiangMu\\ESOP-STANDARD\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\default_ptr_flip.png=D\:\\GongSi\\AS_XiangMu\\ESOP-STANDARD\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\default_ptr_flip.png
 D\:\\GongSi\\AS_XiangMu\\ESOP-STANDARD\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\default_ptr_flip.png=D\:\\GongSi\\AS_XiangMu\\ESOP-STANDARD\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\default_ptr_flip.png