修改为通过请求接口获取SOP文件，UI优化

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

@@ -54,6 +54,7 @@ import com.google.gson.Gson;
 import com.scwang.smartrefresh.layout.api.RefreshLayout;
 import com.uas.standard_esop.R;
 import com.uas.standard_esop.application.PdaApplication;
+import com.uas.standard_esop.bean.BeanSop;
 import com.uas.standard_esop.bean.CloseEventBusBean;
 import com.uas.standard_esop.bean.IpAndPortBean;
 import com.uas.standard_esop.bean.LineCodeEntity;
@@ -150,6 +151,7 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
     private LinearLayout line_login_post;
     private RecyclerView ra_dataurl;
     private ArrayList<ResourcefileBean.DataBean.UrlBean> urlBeanList;
+    private ArrayList<BeanSop> urlBeantwoList;
     private SelectAdapter pdfOrImageAdapter;
     private String ss_nametext;
     private String ss_codetext;
@@ -203,6 +205,7 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
     private ImageView iv_login_post;
     private String tvSS_brdip;
     private String tvSS_brdport;
+    private BeanSop urlBean;
 
     @Override
     protected void onDestroy() {
@@ -374,6 +377,7 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
             }
         });
         urlBeanList = new ArrayList<>();
+        urlBeantwoList = new ArrayList<>();
         pdfOrImageAdapter = new SelectAdapter(urlBeanList);
 //        ra_dataurl.addItemDecoration(new DividerItemDecoration(this, LinearLayout.HORIZONTAL));
 //        ra_dataurl.setLayoutManager(new LinearLayoutManager(this));
@@ -885,6 +889,7 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
             }
         });
     }
+    //获取数据
     private void getSourcePunchInfo() {
         if (tv_dc_line.getText().toString().trim().isEmpty()){
             return;
@@ -894,7 +899,7 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
             return;
         }
 
-        progressDialog.show();
+//        progressDialog.show();
         VollyRequest.getInstance().stringRequest(mStringRequest,
                 new HttpParams.Builder()
                         .url(GloableParams.ADDRESS_SPM_GETSOPRELEASE)
@@ -907,7 +912,63 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
                     @Override
                     public void onSuccess(int flag, Object o) throws Exception {
                         progressDialog.dismiss();
-                        setdataDisplay(o.toString());
+                        JSONArray dataArray = FastjsonUtil.getJSONArray(o.toString(),"data");
+                        LogUtil.edayin("stringtextsss=======",o.toString()+"");
+                        urlBeantwoList.clear();
+                        for (Object index : dataArray){
+                            JSONObject data = (JSONObject) index;
+                            urlBean = new BeanSop(data.getString("PATH")
+                                    ,data.getString("FILENAME"));
+                            urlBeantwoList.add(urlBean);
+                        }
+                        list = new ArrayList<>();
+                        for (int i=0;i<urlBeantwoList.size();i++){
+                            BeanSop urlBean = urlBeantwoList.get(i);
+                            String filename = urlBean.getFilename().replace(".jpg","");
+                            if (StringUtil.isEmpty(urlBean.getPath())){
+                                CommonUtil.toastNoRepeat(IndexActivity.this,"数据为空");
+                                return;
+                            }
+                            if (filename.equals(at_gvtext.getText().toString().trim())){
+                                String path = urlBean.getPath();
+                                String str2 = new String(Base64.decode(path.getBytes(),Base64.DEFAULT));
+                                Log.e("str2==",str2);
+                                list.add(str2);
+                            }
+
+                        }
+                        if (urlBeantwoList.size()>0) {
+
+                            String filenametcp=null;
+                            for (int i=0;i<urlBeantwoList.size();i++){
+                                BeanSop urlBean = urlBeantwoList.get(i);
+                                filenametcp = urlBean.getFilename();
+                            }
+                            if (StringUtil.isEmpty(filenametcp)) {
+                                CommonUtil.toastNoRepeat(IndexActivity.this, "未有 "+at_gvtext.getText().toString().trim()+" 匹配数据");
+                                return;
+                            }
+                            //                getPdfOrImage("");
+                            if (filenametcp.contains(".pdf") || filenametcp.contains(".PDF")) {
+                                Intent intent = new Intent(IndexActivity.this, PdfsActivity.class);
+                                intent.putStringArrayListExtra("lists", list);
+                                intent.putExtra("filename", filenametcp);
+                                startActivity(intent);
+                            } else if (filenametcp.contains(".PNG") || filenametcp.contains(".JPG") || filenametcp.contains(".webp") || filenametcp.contains(".jpeg")
+                                    || filenametcp.contains(".png") || filenametcp.contains(".jpg") || filenametcp.contains(".WEBP") || filenametcp.contains(".JPEG")) {
+                                Intent intent = new Intent(IndexActivity.this, BannerActivity.class);
+                                intent.putStringArrayListExtra("lists", list);
+                                startActivity(intent);
+                            } else if (filenametcp.contains(".MP4") || filenametcp.contains(".mp4")){
+                                Intent intent = new Intent(IndexActivity.this, VideoActivity.class);
+                                intent.putStringArrayListExtra("lists", list);
+                                startActivity(intent);
+                            }else {
+                                CommonUtil.toastNoRepeat(IndexActivity.this, "此文件无法打开");
+                            }
+
+                        }
+//                        setdataDisplay(o.toString());
                     }
                     @Override
                     public void onFail(int flag, String failStr) throws Exception {
@@ -1179,7 +1240,7 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
                 em_name_port.setText(ss_brdport);
                 sound_monitor_vibration_sv.setClickable(true);
                 at_gvtext.setText(ss_nametext);
-                getchangeTcpdata();
+//                getchangeTcpdata();
                 closeListPopupWindow();
             }
         });
@@ -2056,7 +2117,7 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
             @Override
             public boolean handleMessage(Message msg) {
                 String stringtext = msg.obj.toString();
-                setdataDisplay(stringtext);
+//                setdataDisplay(stringtext);
 //                new Thread(new Runnable() {
 //                    @Override
 //                    public void run() {
@@ -2091,53 +2152,12 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
     }
     public void setdataDisplay(String stringtextsss){//获取数据
 
-        LogUtil.edayin("stringtextsss=======",stringtextsss+"");
-//        if (badJson){
-            SharedPreUtil.removeString(this,"stringtexttcp");
-            SharedPreUtil.saveString(IndexActivity.this,"stringtexttcp", stringtextsss);
             if (!stringtextsss.isEmpty()) {
                 list = new ArrayList<>();
-                Gson gson = new Gson();
-                ResourcefileBean loginData = gson.fromJson(stringtextsss, ResourcefileBean.class);
-                ResourcefileBean.DataBean data = loginData.getData();
-                tv_pscode.setText(data.getPs_code());
-                li_codedata = data.getLi_code();
-                urlBeanList.clear();
-                List<ResourcefileBean.DataBean.UrlBean> url = data.getUrl();
-                if (url.isEmpty()){
-                    CommonUtil.toastNoRepeat(IndexActivity.this,"数据为空");
-                    return;
-                }
-                for (int i=0;i<url.size();i++){
-                    ResourcefileBean.DataBean.UrlBean urlBean = url.get(i);
-                    String filename = urlBean.getFilename().replace(".jpg","");
-                    if (StringUtil.isEmpty(tv_dc_line.getText().toString().trim())){
-                        if (filename.equals(at_gvtext.getText().toString().trim())){
-                            String path = urlBean.getPath();
-                            String str2 = new String(Base64.decode(path.getBytes(),Base64.DEFAULT));
-                            list.add(str2);
-                            urlBeanList.add(urlBean);
-                        }
-
-
-                    }else {
-                        if (filename.equals(at_gvtext.getText().toString().trim())&&li_codedata.equals(tv_dc_line.getText().toString().trim())){
-                            String path = urlBean.getPath();
-                            String str2 = new String(Base64.decode(path.getBytes(),Base64.DEFAULT));
-                            list.add(str2);
-                            urlBeanList.add(urlBean);
-                        }
-                    }
-
-
-                }
-//                pdfOrImageAdapter.setmList(urlBeanList);
-                pdfOrImageAdapter.notifyDataSetChanged();
-
                 String filenametcp=null;
 //                List<ResourcefileBean.DataBean.UrlBean> urlBeanList = pdfOrImageAdapter.getmList();
-                for (int i=0;i<urlBeanList.size();i++){
-                    ResourcefileBean.DataBean.UrlBean urlBean = urlBeanList.get(i);
+                for (int i=0;i<urlBeantwoList.size();i++){
+                    BeanSop urlBean = urlBeantwoList.get(i);
                     filenametcp = urlBean.getFilename();
                 }
                 if (StringUtil.isEmpty(filenametcp)) {

app/src/main/java/com/uas/standard_esop/bean/BeanSop.java

@@ -0,0 +1,42 @@
+package com.uas.standard_esop.bean;
+
+import java.io.Serializable;
+
+/**
+ * Created by cjh-sail on 2024-08-14
+ */
+public class BeanSop implements Serializable {
+
+    private String  sr_id;
+    private String path;
+    private String filename;
+
+    public BeanSop(String path, String filename) {
+        this.path = path;
+        this.filename = filename;
+    }
+
+    public String getSr_id() {
+        return sr_id;
+    }
+
+    public void setSr_id(String sr_id) {
+        this.sr_id = sr_id;
+    }
+
+    public String getPath() {
+        return path;
+    }
+
+    public void setPath(String path) {
+        this.path = path;
+    }
+
+    public String getFilename() {
+        return filename;
+    }
+
+    public void setFilename(String filename) {
+        this.filename = filename;
+    }
+}

app/src/main/res/drawable/bg_chang_focus.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <solid android:color="@color/white"/>
+            <corners android:radius="0dip"/>
+            <stroke
+                android:width="0.5dp"
+                android:color="@color/gray1" />
+        </shape>
+    </item>
+</layer-list>

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

@@ -6,6 +6,7 @@
     android:layout_height="match_parent"
     android:orientation="horizontal"
     tools:context=".activity.BannerActivity"
+    android:background="@color/white"
     tools:ignore="MissingDefaultResource">
     <RelativeLayout
         android:layout_weight="1"
@@ -48,7 +49,7 @@
             <TextView
                 android:gravity="center"
                 android:layout_gravity="center"
-                android:textSize="30dp"
+                android:textSize="@dimen/textsize_20"
                 android:text="返回"
                 android:textColor="#DF77CE"
                 android:layout_width="wrap_content"
@@ -56,40 +57,58 @@
             </TextView>
         </LinearLayout>
     </RelativeLayout>
+    <View
+        android:layout_width="1dp"
+        android:layout_height="match_parent"
+        android:background="@color/color_dark_grey">
+    </View>
     <LinearLayout
         android:layout_weight="3"
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/gray_list">
+        android:background="@color/white">
         <LinearLayout
+            android:layout_marginTop="70dp"
             android:orientation="vertical"
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
-            <ImageView
-                android:id="@+id/iv_pepole"
-                android:layout_width="200dp"
-                android:layout_height="200dp"
-                android:background="@drawable/bg_imageview_rauide"
+            <LinearLayout
+                android:layout_width="120dp"
+                android:layout_height="140dp"
+                android:layout_margin="@dimen/dp_10"
                 android:layout_gravity="center"
-                android:layout_margin="@dimen/dp_10">
-            </ImageView>
+                android:background="@drawable/bg_chang_focus">
+                <ImageView
+                    android:id="@+id/iv_pepole"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="center"
+                    android:scaleType="fitXY">
+                </ImageView>
+            </LinearLayout>
+
             <TextView
                 android:id="@+id/iv_name"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:textSize="@dimen/textsize_20"
+                android:layout_marginLeft="@dimen/textsize_20"
                 android:text="姓名">
             </TextView>
             <TextView
+                android:layout_marginTop="5dp"
                 android:id="@+id/iv_jin"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:textSize="@dimen/textsize_20"
+                android:layout_marginLeft="@dimen/textsize_20"
                 android:text="技能">
             </TextView>
         </LinearLayout>
         <LinearLayout
+            android:layout_marginLeft="@dimen/textsize_20"
+            android:layout_marginRight="@dimen/textsize_20"
             android:layout_marginTop="5dp"
             android:orientation="horizontal"
             android:layout_width="match_parent"
@@ -133,7 +152,7 @@
             android:background="@drawable/bg_button"
             android:gravity="center"
             android:textColor="@color/white"
-            android:textSize="25dp"
+            android:textSize="@dimen/textsize_20"
             android:text="获取人员信息"
             android:src="@drawable/search_48"
             android:layout_marginTop="30dp"/>

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

@@ -396,7 +396,7 @@
                                 android:background="@drawable/bg_button"
                                 android:gravity="center"
                                 android:textColor="@color/white"
-                                android:textSize="25dp"
+                                android:textSize="@dimen/textsize_20"
                                 android:text="搜索"
                                 android:src="@drawable/search_48"
                                 android:layout_weight="1"/>
@@ -409,7 +409,7 @@
                                 android:layout_height="@dimen/dp_40"
                                 android:layout_below="@id/include_menuactionbar"
                                 android:gravity="center"
-                                android:textSize="25dp"
+                                android:textSize="@dimen/textsize_20"
                                 android:background="@drawable/bg_button"
                                 android:layout_weight="1">
                             </TextView>
@@ -663,18 +663,27 @@
                     android:orientation="horizontal"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:textSize="@dimen/textsize_20"
+                        android:text="自动获取SOP">
+                    </TextView>
                     <com.uas.standard_esop.view.SwitchView
                         android:id="@+id/sound_monitor_Vibration_sv"
                         android:layout_width="40dp"
                         android:layout_height="25dp"
                         android:layout_marginLeft="@dimen/textsize_20"
                         android:layout_centerVertical="true"
+                        android:layout_gravity="center"
                         android:visibility="gone"/>
                     <ImageView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:id="@+id/sound_monitor_Vibration_sv2"
                         android:layout_marginLeft="@dimen/textsize_20"
+                        android:layout_gravity="center"
                         android:background="@drawable/bg_index_ok_error"
                         android:layout_centerVertical="true">
                     </ImageView>

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

@@ -21,7 +21,7 @@
             android:text=""
             android:layout_width="0dp"
             android:layout_weight="5"
-            android:textSize="30dp"
+            android:textSize="@dimen/textsize_20"
             android:layout_height="wrap_content"
             />
 
@@ -31,7 +31,7 @@
             android:gravity="left"
             android:layout_width="0dp"
             android:layout_weight="6"
-            android:textSize="30dp"
+            android:textSize="@dimen/textsize_20"
             android:layout_height="wrap_content"
             />
     </LinearLayout>

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

@@ -33,7 +33,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:textSize="25dp"
+                android:textSize="@dimen/textsize_20"
                 android:text="1111111"
                 android:id="@+id/text"
                 android:gravity="left"

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

@@ -6,6 +6,7 @@
     android:layout_height="match_parent"
     android:orientation="horizontal"
     tools:context=".activity.BannerActivity"
+    android:background="@color/white"
     tools:ignore="MissingDefaultResource">
     <RelativeLayout
         android:layout_weight="1"
@@ -48,7 +49,7 @@
             <TextView
                 android:gravity="center"
                 android:layout_gravity="center"
-                android:textSize="30dp"
+                android:textSize="@dimen/textsize_20"
                 android:text="返回"
                 android:textColor="#DF77CE"
                 android:layout_width="wrap_content"
@@ -56,40 +57,58 @@
             </TextView>
         </LinearLayout>
     </RelativeLayout>
+    <View
+        android:layout_width="1dp"
+        android:layout_height="match_parent"
+        android:background="@color/color_dark_grey">
+    </View>
     <LinearLayout
         android:layout_weight="3"
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/gray_list">
+        android:background="@color/white">
         <LinearLayout
+            android:layout_marginTop="70dp"
             android:orientation="vertical"
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
-            <ImageView
-                android:id="@+id/iv_pepole"
-                android:layout_width="200dp"
-                android:layout_height="200dp"
-                android:background="@drawable/bg_imageview_rauide"
+            <LinearLayout
+                android:layout_width="120dp"
+                android:layout_height="140dp"
+                android:layout_margin="@dimen/dp_10"
                 android:layout_gravity="center"
-                android:layout_margin="@dimen/dp_10">
-            </ImageView>
+                android:background="@drawable/bg_chang_focus">
+                <ImageView
+                    android:id="@+id/iv_pepole"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="center"
+                    android:scaleType="fitXY">
+                </ImageView>
+            </LinearLayout>
+
             <TextView
                 android:id="@+id/iv_name"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:textSize="@dimen/textsize_20"
+                android:layout_marginLeft="@dimen/textsize_20"
                 android:text="姓名">
             </TextView>
             <TextView
+                android:layout_marginTop="5dp"
                 android:id="@+id/iv_jin"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:textSize="@dimen/textsize_20"
+                android:layout_marginLeft="@dimen/textsize_20"
                 android:text="技能">
             </TextView>
         </LinearLayout>
         <LinearLayout
+            android:layout_marginLeft="@dimen/textsize_20"
+            android:layout_marginRight="@dimen/textsize_20"
             android:layout_marginTop="5dp"
             android:orientation="horizontal"
             android:layout_width="match_parent"
@@ -133,7 +152,7 @@
             android:background="@drawable/bg_button"
             android:gravity="center"
             android:textColor="@color/white"
-            android:textSize="25dp"
+            android:textSize="@dimen/textsize_20"
             android:text="获取人员信息"
             android:src="@drawable/search_48"
             android:layout_marginTop="30dp"/>

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

@@ -663,6 +663,13 @@
                     android:orientation="horizontal"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:textSize="@dimen/textsize_20"
+                        android:text="自动获取SOP">
+                    </TextView>
                     <com.uas.standard_esop.view.SwitchView
                         android:id="@+id/sound_monitor_Vibration_sv"
                         android:layout_width="40dp"
@@ -737,7 +744,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:textColor="#333333"
-                            android:textSize="@dimen/space_top_line_15"
+                            android:textSize="@dimen/textsize_20"
                             android:text=")"
                             />
                     </LinearLayout>

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

@@ -17,10 +17,11 @@
 
         <TextView
             android:id="@+id/macode_Tv"
-            android:gravity="left"
+            android:gravity="right"
             android:text=""
             android:layout_width="0dp"
             android:layout_weight="5"
+            android:textSize="@dimen/textsize_20"
             android:layout_height="wrap_content"
             />
 
@@ -30,6 +31,7 @@
             android:gravity="left"
             android:layout_width="0dp"
             android:layout_weight="6"
+            android:textSize="@dimen/textsize_20"
             android:layout_height="wrap_content"
             />
     </LinearLayout>

app/src/main/res/layout/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="25dp"
+                android:textSize="@dimen/textsize_20"
                 android:text="1111111"
                 android:id="@+id/text"
                 android:gravity="left"

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

@@ -1,4 +1,4 @@
-#Tue Aug 06 17:33:59 CST 2024
+#Wed Aug 14 10:42:02 CST 2024
 D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_top.xml=D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_out_to_top.xml
 D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\default_ptr_rotate.png=D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\default_ptr_rotate.png
 D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_top.xml=D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable\\indicator_bg_top.xml