升级更新问题解决，SOP住界面逻辑改变

app/src/main/AndroidManifest.xml

@@ -7,7 +7,7 @@
 
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
     <application
         android:name=".application.PdaApplication"
         android:allowBackup="true"
@@ -65,7 +65,7 @@
             />
         <provider xmlns:tools="http://schemas.android.com/tools"
             android:name="android.support.v4.content.FileProvider"
-            android:authorities="com.uas.esop"
+            android:authorities="com.uas.esop.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true"
             tools:replace="android:authorities">

app/src/main/java/com/uas/esop/adapter/PdfOrImageAdapter.java

@@ -47,4 +47,11 @@ public class PdfOrImageAdapter extends BaseQuickAdapter<ResourcefileBean.DataBea
 //        helper.setText(R.id.remark_Tv,str2);
     }
 
+
+
+
+
+
+
+
 }

app/src/main/java/com/uas/esop/bean/ResourcefileBean.java

@@ -1,7 +1,7 @@
 package com.uas.esop.bean;
 
 import java.io.Serializable;
-import java.util.List;
+import java.util.ArrayList;
 
 /**
  * Created by cjh-sail on 2022-11-17
@@ -29,7 +29,7 @@ public class ResourcefileBean implements Serializable {
     private DataBean data;
     public static class DataBean implements Serializable {
         private String ps_code;
-        private List<UrlBean> url;
+        private ArrayList<UrlBean> url;
 
         public String getPs_code() {
             return ps_code;
@@ -39,11 +39,11 @@ public class ResourcefileBean implements Serializable {
             this.ps_code = ps_code;
         }
 
-        public List<UrlBean> getUrl() {
+        public ArrayList<UrlBean> getUrl() {
             return url;
         }
 
-        public void setUrl(List<UrlBean> url) {
+        public void setUrl(ArrayList<UrlBean> url) {
             this.url = url;
         }
 
@@ -52,6 +52,11 @@ public class ResourcefileBean implements Serializable {
             private String filename;
             private boolean isChecked;
 
+            public UrlBean(String path, String filename) {
+                this.path = path;
+                this.filename = filename;
+            }
+
             public boolean getIsChecked() {
                 return isChecked;
             }

app/src/main/java/com/uas/esop/fragment/VersionUpgradeFragment.java

@@ -227,7 +227,7 @@ public class VersionUpgradeFragment extends BaseFragment implements ProgressResp
                         Intent intent = new Intent(Intent.ACTION_VIEW);
                         if (Build.VERSION.SDK_INT >= 24) {
                             Uri apkUri = FileProvider.getUriForFile(mActivity,
-                                    "com.uas.pda_smart_sa.fileprovider", apk);
+                                    "com.uas.esop.fileprovider", apk);
                             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                             intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
                             intent.setDataAndType(apkUri, "application/vnd.android.package-archive");

app/src/main/java/com/uas/esop/util/Constants.java

@@ -20,7 +20,7 @@ public interface Constants {
 
         String AUTHORITY_SHOP = "Shop";
         String AUTHORITY_PRODINOUT = "ProdInOut";
-        String APK_FILE_PATH = Environment.getExternalStorageDirectory().getAbsolutePath() + "/uas_mes/apk";
+        String APK_FILE_PATH = Environment.getExternalStorageDirectory().getAbsolutePath() + "/esop/apk";
         String APK_FILE_NAME = "uas_esop.apk";
         // 修改首页应用 code;
         int REQUEST_CHANGE_APP = 100;

app/src/main/java/com/uas/esop/util/JsonUtilsflase.java

@@ -0,0 +1,32 @@
+package com.uas.esop.util;
+
+import android.text.TextUtils;
+
+import com.google.gson.JsonParseException;
+import com.google.gson.JsonParser;
+import com.google.gson.JsonSyntaxException;
+
+/**
+ * Created by cjh-sail on 2023-06-03
+ */
+public class JsonUtilsflase {
+    public static boolean isBadJson(String json) {
+        return !isGoodJson(json);
+    }
+
+    public static boolean isGoodJson(String json) {
+        if (TextUtils.isEmpty(json)) {
+            return false;
+        }
+
+        try {
+            new JsonParser().parse(json);
+            return true;
+        } catch (JsonSyntaxException e) {
+            return false;
+        } catch (JsonParseException e) {
+            return false;
+        }
+    }
+
+}

app/src/main/java/com/uas/esop/util/LogUtil.java

@@ -42,6 +42,41 @@ public class LogUtil {
         }
     }
 
+    public static void edayin(String tag, String msg) {
+
+        if (tag == null || tag.length() == 0
+
+                || msg == null || msg.length() == 0)
+
+            return;
+
+        int segmentSize = 3 * 1024;
+
+        long length = msg.length();
+
+        if (length <= segmentSize ) {// 长度小于等于限制直接打印
+
+            Log.e(tag, msg);
+
+        }else {
+
+            while (msg.length() > segmentSize ) {// 循环分段打印日志
+
+                String logContent = msg.substring(0, segmentSize );
+
+                msg = msg.replace(logContent, "");
+
+                Log.e(tag, logContent);
+
+            }
+
+            Log.e(tag, msg);// 打印剩余日志
+
+        }
+
+    }
+
+
     /**
      * @param object
      * @param msg

app/src/main/java/com/uas/esop/util/QpushClient.java

@@ -99,47 +99,6 @@ public class QpushClient implements Runnable {
         }
     }
 
-    /**
-     * 测试连接
-     * @param mHostw
-     * @param mPortw
-     */
-    public void debugconnect(String mHostw,int mPortw){
-//        EventBus.getDefault().post(new TCPEventBusBean("111111"));
-        new Thread(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                mAddress = new InetSocketAddress(mHostw, mPortw);
-                if (mClientSocket == null) {
-                    mClientSocket = new Socket();
-                }
-
-                //尝试连接，若未连接，则设置尝试次数
-                while (!mClientSocket.isConnected() && mConnectCount < CONNECT_TRY_TIMES) {
-                    connect();
-                    if (!mClientSocket.isConnected()) {
-                        mConnectCount++;
-                        sleep(CONNECT_PERIOD);
-                    } else {
-                        mConnectCount = 0;//连接上，则恢复置0
-                    }
-                }
-                if (mClientSocket.isConnected()) {
-                    mHandler.obtainMessage(1, "debugtrue").sendToTarget();
-                    mHandler.removeCallbacksAndMessages(null);
-                    onDestory();
-                }
-                    }catch (Exception e){
-
-                }
-            }
-        }).start();
-
-
-
-    }
-
 
     private void connect() {
         try {
@@ -180,14 +139,14 @@ public class QpushClient implements Runnable {
 //        while (mClientSocket != null && mClientSocket.isConnected() && !mClientSocket.isClosed()) {
             try {
                 mReader = new BufferedReader(new InputStreamReader(mClientSocket.getInputStream(), SocketConfig.GBK));
-                while (isStartRecieveMsg) {
+//                while (isStartRecieveMsg) {
                     if (mReader.ready()) {
                             /*读取一行字符串，读取的内容来自于客户机
                             reader.readLine()方法是一个阻塞方法，
                             从调用这个方法开始，该线程会一直处于阻塞状态，
                             直到接收到新的消息，代码才会往下走*/
 //                        String data = mReader.readLine();
-                        char[] getData = new char[1024];
+                        char[] getData = new char[9999999];
 //                        mReader.read(getData, 0, getData.length);
                         int count = 0;
 //                        String data = String.valueOf(getData);
@@ -201,7 +160,6 @@ public class QpushClient implements Runnable {
                             break;
                         }
                         String datas = sb.toString();
-                        Log.e("datas=====",datas);
                         handlerMsg(datas);
 
 //                        onDestory();
@@ -213,7 +171,7 @@ public class QpushClient implements Runnable {
 //                    mClientSocket.setReuseAddress(true);
 
 
-                }
+
             } catch (InterruptedException ex) {
                 ex.printStackTrace();
             } catch (IOException e) {

app/src/main/java/com/uas/esop/view/MyLayoutManager.java

@@ -0,0 +1,53 @@
+package com.uas.esop.view;
+
+
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+
+/**
+ * 自动换行布局管理
+ * Created by cjh-sail on 2023-05-29
+ */
+public class MyLayoutManager extends RecyclerView.LayoutManager {
+    @Override
+    public RecyclerView.LayoutParams generateDefaultLayoutParams() {
+        return new RecyclerView.LayoutParams(
+                RecyclerView.LayoutParams.WRAP_CONTENT,
+                RecyclerView.LayoutParams.WRAP_CONTENT);
+    }
+
+    @Override
+    public void onLayoutChildren(RecyclerView.Recycler recycler, RecyclerView.State state) {
+//        super.onLayoutChildren(recycler, state);
+        detachAndScrapAttachedViews(recycler);
+        int sumWidth = getWidth();
+
+        int curLineWidth = 0, curLineTop = 0;
+        int lastLineMaxHeight = 0;
+        for (int i = 0; i < getItemCount(); i++) {
+            View view = recycler.getViewForPosition(i);
+
+            addView(view);
+            measureChildWithMargins(view, 0, 0);
+            int width = getDecoratedMeasuredWidth(view);
+            int height = getDecoratedMeasuredHeight(view);
+
+            curLineWidth += width;
+            if (curLineWidth <= sumWidth) {//不需要换行
+                layoutDecorated(view, curLineWidth - width, curLineTop, curLineWidth, curLineTop + height);
+                //比较当前行多有item的最大高度
+                lastLineMaxHeight = Math.max(lastLineMaxHeight, height);
+            } else {//换行
+                curLineWidth = width;
+                if (lastLineMaxHeight == 0) {
+                    lastLineMaxHeight = height;
+                }
+                //记录当前行top
+                curLineTop += lastLineMaxHeight;
+
+                layoutDecorated(view, 0, curLineTop, width, curLineTop + height);
+                lastLineMaxHeight = height;
+            }
+        }
+    }
+}

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

@@ -6,6 +6,7 @@
     android:background="@color/background_color_first"
     android:focusable="true"
     android:focusableInTouchMode="true"
+    android:id="@+id/rl_vanish"
     tools:ignore="MissingDefaultResource">
 
     <com.scwang.smartrefresh.layout.SmartRefreshLayout
@@ -126,22 +127,37 @@
         </Button>
 
     </LinearLayout>
+    <TextView
+        android:id="@+id/btn_get"
+        android:text="播放SOP"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:layout_below="@id/include_menuactionbar"
+        android:gravity="center"
+        android:layout_marginTop="@dimen/dp_10"
+        android:layout_marginBottom="@dimen/textsize_20"
+        android:background="@drawable/bg_button">
+    </TextView>
+
 
     <ScrollView
-        android:layout_below="@id/include_menuactionbar"
-        android:layout_centerInParent="true"
+        android:id="@+id/sv_vanish"
+        android:layout_below="@id/btn_get"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
         <RelativeLayout
             android:id="@+id/rela_dimss"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="wrap_content">
             <LinearLayout
                 android:id="@+id/lineone"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
                 <RelativeLayout
+                    android:visibility="gone"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
                     <LinearLayout
@@ -225,62 +241,10 @@
 
                 </RelativeLayout>
 
-            </LinearLayout>
-            <LinearLayout
-                android:id="@+id/linetwo"
-                android:orientation="horizontal"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/lineone"
-                android:layout_centerInParent="true">
-                <LinearLayout
-                    android:layout_marginLeft="@dimen/textsize_20"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:orientation="horizontal">
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="4dp"
-                        android:gravity="center_vertical">
-                        <LinearLayout
-                            android:layout_marginLeft="@dimen/dp_10"
-                            android:orientation="vertical"
-                            android:layout_width="0dp"
-                            android:layout_weight="1"
-                            android:layout_height="wrap_content">
-                            <com.uas.esop.view.ClearableEditText
-                                android:id="@+id/index_position_resource"
-                                style="@style/EditTextLineStyle"
-                                android:layout_width="match_parent"
-                                android:hint="输入产品索引SOP"
-                                android:imeOptions="actionSend" />
-                        </LinearLayout>
-
-
-                        <TextView
-                            android:visibility="gone"
-                            android:id="@+id/scname_tv"
-                            style="@style/valuetext"
-                            android:singleLine="true"
-                            android:ellipsize="end"
-                            android:layout_width="wrap_content"
-                            android:paddingLeft="@dimen/textsize_20" />
-                    </LinearLayout>
 
-                </LinearLayout>
+            </LinearLayout>
 
-                <ImageView
-                    android:id="@+id/index_edit"
-                    android:layout_width="20dp"
-                    android:layout_height="24dp"
-                    android:layout_gravity="center"
-                    android:layout_marginLeft="@dimen/dp_10"
-                    android:layout_marginRight="@dimen/textsize_20"
-                    android:src="@mipmap/magnifyingglass" />
 
-            </LinearLayout>
             <LinearLayout
                 android:visibility="gone"
                 android:id="@+id/linethree"
@@ -288,7 +252,6 @@
                 android:orientation="horizontal"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_below="@id/linetwo"
                 android:layout_centerInParent="true"
                 android:paddingLeft="20dp">
 
@@ -387,181 +350,209 @@
                     android:layout_marginLeft="@dimen/dp_10"/>
 
             </LinearLayout>
-            <LinearLayout
-                android:orientation="vertical"
-                android:id="@+id/line_ra_dataurl"
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/rv_datawork"
+                android:visibility="gone"
+                android:background="@color/white"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_below="@id/linethree"
-                android:layout_marginLeft="30dp"
-                android:layout_marginRight="30dp"
-                android:layout_marginTop="@dimen/dp_10"
+                android:layout_centerInParent="true">
+            </android.support.v7.widget.RecyclerView>
+            <RelativeLayout
+                android:orientation="horizontal"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-                <TextView
-                    android:text="当前获取文件:"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content">
-                </TextView>
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/lineone">
                 <LinearLayout
-                    android:orientation="horizontal"
+                    android:id="@+id/linetops"
+                    android:orientation="vertical"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
-                    <TextView
-                        android:text="文件版本:"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content">
-                    </TextView>
-                    <TextView
-                        android:id="@+id/tv_pscode"
-                        android:text=""
-                        android:layout_marginLeft="@dimen/dp_10"
-                        android:layout_width="wrap_content"
+                    <LinearLayout
+                        android:id="@+id/linetwo"
+                        android:orientation="horizontal"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content">
-                    </TextView>
+                        <LinearLayout
+                            android:layout_marginLeft="@dimen/textsize_20"
+                            android:layout_marginRight="@dimen/textsize_20"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:orientation="horizontal">
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="4dp"
+                                android:gravity="center_vertical">
+                                <LinearLayout
+                                    android:layout_marginLeft="@dimen/dp_10"
+                                    android:layout_marginRight="@dimen/dp_10"
+                                    android:orientation="vertical"
+                                    android:layout_width="0dp"
+                                    android:layout_weight="1"
+                                    android:layout_height="wrap_content">
+                                    <com.uas.esop.view.ClearableEditText
+                                        android:id="@+id/index_position_resource"
+                                        style="@style/EditTextLineStyle"
+                                        android:layout_width="match_parent"
+                                        android:hint="输入产品索引SOP"
+                                        android:imeOptions="actionSend" />
+
+                                </LinearLayout>
+                                <TextView
+                                    android:visibility="gone"
+                                    android:id="@+id/scname_tv"
+                                    style="@style/valuetext"
+                                    android:singleLine="true"
+                                    android:ellipsize="end"
+                                    android:layout_width="wrap_content"
+                                    android:paddingLeft="@dimen/textsize_20" />
+                            </LinearLayout>
+
+                        </LinearLayout>
+
 
+
+                    </LinearLayout>
+                    <TextView
+                        android:id="@+id/index_edit"
+                        android:layout_width="200dp"
+                        android:layout_height="@dimen/dp_40"
+                        android:layout_marginTop="@dimen/dp_10"
+                        android:layout_gravity="center"
+                        android:background="@drawable/bg_button"
+                        android:gravity="center"
+                        android:textColor="@color/white"
+                        android:text="搜索"
+                        android:src="@drawable/search_48" />
                 </LinearLayout>
                 <LinearLayout
-                    android:orientation="horizontal"
+                    android:layout_below="@+id/linetops"
+                    android:orientation="vertical"
+                    android:id="@+id/line_ra_dataurl"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
+                    android:layout_height="wrap_content"
+                    tools:ignore="NotSibling">
                     <TextView
-                        android:text="产品:"
-                        android:layout_width="wrap_content"
+                        android:text="当前获取文件:"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content">
                     </TextView>
-                    <TextView
-                        android:id="@+id/tv_ps_prodcode"
-                        android:text=""
-                        android:layout_marginLeft="@dimen/dp_10"
-                        android:layout_width="wrap_content"
+
+                    <LinearLayout
+                        android:orientation="horizontal"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content">
-                    </TextView>
-                    <TextView
-                        android:id="@+id/tv_pr_detail"
-                        android:text=""
-                        android:layout_marginLeft="@dimen/dp_10"
-                        android:layout_width="wrap_content"
+                        <TextView
+                            android:text="文件版本:"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content">
+                        </TextView>
+                        <TextView
+                            android:id="@+id/tv_pscode"
+                            android:text=""
+                            android:layout_marginLeft="@dimen/dp_10"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content">
+                        </TextView>
+
+                    </LinearLayout>
+                    <LinearLayout
+                        android:orientation="horizontal"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content">
-                    </TextView>
-                    <TextView
-                        android:id="@+id/tv_pr_spec"
-                        android:text=""
-                        android:layout_marginLeft="@dimen/dp_10"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:ellipsize="end"
-                        android:lines="1">
-                    </TextView>
+                        <TextView
+                            android:text="产品:"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content">
+                        </TextView>
+                        <TextView
+                            android:id="@+id/tv_ps_prodcode"
+                            android:text=""
+                            android:layout_marginLeft="@dimen/dp_10"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content">
+                        </TextView>
+                        <TextView
+                            android:id="@+id/tv_pr_detail"
+                            android:text=""
+                            android:layout_marginLeft="@dimen/dp_10"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content">
+                        </TextView>
+                        <TextView
+                            android:id="@+id/tv_pr_spec"
+                            android:text=""
+                            android:layout_marginLeft="@dimen/dp_10"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:ellipsize="end"
+                            android:lines="1">
+                        </TextView>
 
 
-                </LinearLayout>
-                <LinearLayout
-                    android:orientation="horizontal"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-                    <TextView
-                        android:text="工序:"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content">
-                    </TextView>
-                    <TextView
-                        android:id="@+id/tv_ps_stepcode"
-                        android:text=""
-                        android:layout_marginLeft="@dimen/dp_10"
-                        android:layout_width="wrap_content"
+                    </LinearLayout>
+                    <LinearLayout
+                        android:visibility="gone"
+                        android:orientation="horizontal"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content">
-                    </TextView>
+                        <TextView
+                            android:text="工序:"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content">
+                        </TextView>
+                        <TextView
+                            android:id="@+id/tv_ps_stepcode"
+                            android:text=""
+                            android:layout_marginLeft="@dimen/dp_10"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content">
+                        </TextView>
 
-                </LinearLayout>
-                <LinearLayout
-                    android:orientation="horizontal"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-                    <TextView
-                        android:text="下载地址:"
-                        android:layout_width="wrap_content"
+                    </LinearLayout>
+                    <LinearLayout
+                        android:orientation="horizontal"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content">
-                    </TextView>
-                    <android.support.v7.widget.RecyclerView
-                        android:id="@+id/ra_dataurl"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        >
-                    </android.support.v7.widget.RecyclerView>
+                        <TextView
+                            android:text="下载地址:"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content">
+                        </TextView>
+                        <android.support.v7.widget.RecyclerView
+                            android:id="@+id/ra_dataurl"
+                            android:layout_marginRight="30dp"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content">
+                        </android.support.v7.widget.RecyclerView>
 
+                    </LinearLayout>
                 </LinearLayout>
-            </LinearLayout>
+                <android.support.v7.widget.RecyclerView
+                    android:layout_below="@+id/linetops"
+                    android:id="@+id/rv_data"
+                    android:background="@color/white"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_centerInParent="true">
+                </android.support.v7.widget.RecyclerView>
+            </RelativeLayout>
 
 
 
-            <TextView
-                android:id="@+id/btn_get"
-                android:text="播放SOP"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
-                android:layout_width="match_parent"
-                android:layout_height="50dp"
-                android:layout_below="@id/line_ra_dataurl"
-                android:gravity="center"
-                android:layout_centerInParent="true"
-                android:layout_marginTop="100dp"
-                android:background="@drawable/bg_button">
-            </TextView>
 
 
-            <TextView
 
-                android:id="@+id/btn_sengMessage"
-                android:text="打开文件夹"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
-                android:layout_width="match_parent"
-                android:layout_height="50dp"
-                android:layout_below="@id/btn_get"
-                android:gravity="center"
-                android:layout_centerInParent="true"
-                android:layout_marginTop="@dimen/textsize_20"
-                android:visibility="gone"
-                android:background="@drawable/bg_button">
-            </TextView>
-            <TextView
-                android:visibility="gone"
-                android:id="@+id/tcp_text"
-                android:text="tcp服务端发送"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/btn_sengMessage"
-                android:gravity="center"
-                android:layout_centerInParent="true"
-                android:layout_marginTop="100dp"
-                android:layout_marginBottom="@dimen/textsize_20">
-            </TextView>
+        </RelativeLayout>
 
-            <android.support.v7.widget.RecyclerView
-                android:id="@+id/rv_data"
-                android:visibility="gone"
-                android:background="@color/white"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/linetwo"
-                android:layout_centerInParent="true">
-            </android.support.v7.widget.RecyclerView>
-            <android.support.v7.widget.RecyclerView
-                android:id="@+id/rv_datawork"
-                android:visibility="gone"
-                android:background="@color/white"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/linethree"
-                android:layout_centerInParent="true">
-            </android.support.v7.widget.RecyclerView>
 
-        </RelativeLayout>
 
-    </ScrollView>
 
 
+    </ScrollView>
 
 
     <include

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

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal">
+
+    <LinearLayout
+        android:layout_marginTop="5dp"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+        <CheckBox
+            android:layout_gravity="center_vertical"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/select_checkbox"/>
+        <LinearLayout
+            android:layout_gravity="center"
+            android:orientation="vertical"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
+            <ImageView
+                android:id="@+id/iv_personnel_data"
+                android:layout_width="150dp"
+                android:layout_height="150dp"
+                android:scaleType="centerCrop"
+                android:layout_gravity="center"
+                android:background="@drawable/bg_line_edittext">
+            </ImageView>
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:textSize="15sp"
+                android:text="1111111"
+                android:id="@+id/text"
+                android:gravity="left"
+                android:textColor="@color/blue"
+                tools:ignore="RtlCompat">
+            </TextView>
+            <TextView
+                android:visibility="gone"
+                android:layout_marginTop="5dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="left"
+                android:textSize="15sp"
+                android:text="111111"
+                android:id="@+id/tv_mi_desc"
+                android:gravity="left"
+                tools:ignore="RtlCompat">
+            </TextView>
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+
+
+
+</LinearLayout>

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

@@ -6,6 +6,7 @@
     android:background="@color/background_color_first"
     android:focusable="true"
     android:focusableInTouchMode="true"
+    android:id="@+id/rl_vanish"
     tools:ignore="MissingDefaultResource">
 
     <com.scwang.smartrefresh.layout.SmartRefreshLayout
@@ -126,22 +127,37 @@
         </Button>
 
     </LinearLayout>
+    <TextView
+        android:id="@+id/btn_get"
+        android:text="播放SOP"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:layout_below="@id/include_menuactionbar"
+        android:gravity="center"
+        android:layout_marginTop="@dimen/dp_10"
+        android:layout_marginBottom="@dimen/textsize_20"
+        android:background="@drawable/bg_button">
+    </TextView>
+
 
     <ScrollView
-        android:layout_below="@id/include_menuactionbar"
-        android:layout_centerInParent="true"
+        android:id="@+id/sv_vanish"
+        android:layout_below="@id/btn_get"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
         <RelativeLayout
             android:id="@+id/rela_dimss"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="wrap_content">
             <LinearLayout
                 android:id="@+id/lineone"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
                 <RelativeLayout
+                    android:visibility="gone"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
                     <LinearLayout
@@ -225,62 +241,10 @@
 
                 </RelativeLayout>
 
-            </LinearLayout>
-            <LinearLayout
-                android:id="@+id/linetwo"
-                android:orientation="horizontal"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/lineone"
-                android:layout_centerInParent="true">
-                <LinearLayout
-                    android:layout_marginLeft="@dimen/textsize_20"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:orientation="horizontal">
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="4dp"
-                        android:gravity="center_vertical">
-                        <LinearLayout
-                            android:layout_marginLeft="@dimen/dp_10"
-                            android:orientation="vertical"
-                            android:layout_width="0dp"
-                            android:layout_weight="1"
-                            android:layout_height="wrap_content">
-                            <com.uas.esop.view.ClearableEditText
-                                android:id="@+id/index_position_resource"
-                                style="@style/EditTextLineStyle"
-                                android:layout_width="match_parent"
-                                android:hint="输入产品索引SOP"
-                                android:imeOptions="actionSend" />
-                        </LinearLayout>
-
-
-                        <TextView
-                            android:visibility="gone"
-                            android:id="@+id/scname_tv"
-                            style="@style/valuetext"
-                            android:singleLine="true"
-                            android:ellipsize="end"
-                            android:layout_width="wrap_content"
-                            android:paddingLeft="@dimen/textsize_20" />
-                    </LinearLayout>
 
-                </LinearLayout>
+            </LinearLayout>
 
-                <ImageView
-                    android:id="@+id/index_edit"
-                    android:layout_width="20dp"
-                    android:layout_height="24dp"
-                    android:layout_gravity="center"
-                    android:layout_marginLeft="@dimen/dp_10"
-                    android:layout_marginRight="@dimen/textsize_20"
-                    android:src="@mipmap/magnifyingglass" />
 
-            </LinearLayout>
             <LinearLayout
                 android:visibility="gone"
                 android:id="@+id/linethree"
@@ -288,7 +252,6 @@
                 android:orientation="horizontal"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_below="@id/linetwo"
                 android:layout_centerInParent="true"
                 android:paddingLeft="20dp">
 
@@ -387,181 +350,209 @@
                     android:layout_marginLeft="@dimen/dp_10"/>
 
             </LinearLayout>
-            <LinearLayout
-                android:orientation="vertical"
-                android:id="@+id/line_ra_dataurl"
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/rv_datawork"
+                android:visibility="gone"
+                android:background="@color/white"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_below="@id/linethree"
-                android:layout_marginLeft="30dp"
-                android:layout_marginRight="30dp"
-                android:layout_marginTop="@dimen/dp_10"
+                android:layout_centerInParent="true">
+            </android.support.v7.widget.RecyclerView>
+            <RelativeLayout
+                android:orientation="horizontal"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-                <TextView
-                    android:text="当前获取文件:"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content">
-                </TextView>
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/lineone">
                 <LinearLayout
-                    android:orientation="horizontal"
+                    android:id="@+id/linetops"
+                    android:orientation="vertical"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
-                    <TextView
-                        android:text="文件版本:"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content">
-                    </TextView>
-                    <TextView
-                        android:id="@+id/tv_pscode"
-                        android:text=""
-                        android:layout_marginLeft="@dimen/dp_10"
-                        android:layout_width="wrap_content"
+                    <LinearLayout
+                        android:id="@+id/linetwo"
+                        android:orientation="horizontal"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content">
-                    </TextView>
+                        <LinearLayout
+                            android:layout_marginLeft="@dimen/textsize_20"
+                            android:layout_marginRight="@dimen/textsize_20"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:orientation="horizontal">
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="4dp"
+                                android:gravity="center_vertical">
+                                <LinearLayout
+                                    android:layout_marginLeft="@dimen/dp_10"
+                                    android:layout_marginRight="@dimen/dp_10"
+                                    android:orientation="vertical"
+                                    android:layout_width="0dp"
+                                    android:layout_weight="1"
+                                    android:layout_height="wrap_content">
+                                    <com.uas.esop.view.ClearableEditText
+                                        android:id="@+id/index_position_resource"
+                                        style="@style/EditTextLineStyle"
+                                        android:layout_width="match_parent"
+                                        android:hint="输入产品索引SOP"
+                                        android:imeOptions="actionSend" />
+
+                                </LinearLayout>
+                                <TextView
+                                    android:visibility="gone"
+                                    android:id="@+id/scname_tv"
+                                    style="@style/valuetext"
+                                    android:singleLine="true"
+                                    android:ellipsize="end"
+                                    android:layout_width="wrap_content"
+                                    android:paddingLeft="@dimen/textsize_20" />
+                            </LinearLayout>
+
+                        </LinearLayout>
+
 
+
+                    </LinearLayout>
+                    <TextView
+                        android:id="@+id/index_edit"
+                        android:layout_width="200dp"
+                        android:layout_height="@dimen/dp_40"
+                        android:layout_marginTop="@dimen/dp_10"
+                        android:layout_gravity="center"
+                        android:background="@drawable/bg_button"
+                        android:gravity="center"
+                        android:textColor="@color/white"
+                        android:text="搜索"
+                        android:src="@drawable/search_48" />
                 </LinearLayout>
                 <LinearLayout
-                    android:orientation="horizontal"
+                    android:layout_below="@+id/linetops"
+                    android:orientation="vertical"
+                    android:id="@+id/line_ra_dataurl"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
+                    android:layout_height="wrap_content"
+                    tools:ignore="NotSibling">
                     <TextView
-                        android:text="产品:"
-                        android:layout_width="wrap_content"
+                        android:text="当前获取文件:"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content">
                     </TextView>
-                    <TextView
-                        android:id="@+id/tv_ps_prodcode"
-                        android:text=""
-                        android:layout_marginLeft="@dimen/dp_10"
-                        android:layout_width="wrap_content"
+
+                    <LinearLayout
+                        android:orientation="horizontal"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content">
-                    </TextView>
-                    <TextView
-                        android:id="@+id/tv_pr_detail"
-                        android:text=""
-                        android:layout_marginLeft="@dimen/dp_10"
-                        android:layout_width="wrap_content"
+                        <TextView
+                            android:text="文件版本:"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content">
+                        </TextView>
+                        <TextView
+                            android:id="@+id/tv_pscode"
+                            android:text=""
+                            android:layout_marginLeft="@dimen/dp_10"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content">
+                        </TextView>
+
+                    </LinearLayout>
+                    <LinearLayout
+                        android:orientation="horizontal"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content">
-                    </TextView>
-                    <TextView
-                        android:id="@+id/tv_pr_spec"
-                        android:text=""
-                        android:layout_marginLeft="@dimen/dp_10"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:ellipsize="end"
-                        android:lines="1">
-                    </TextView>
+                        <TextView
+                            android:text="产品:"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content">
+                        </TextView>
+                        <TextView
+                            android:id="@+id/tv_ps_prodcode"
+                            android:text=""
+                            android:layout_marginLeft="@dimen/dp_10"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content">
+                        </TextView>
+                        <TextView
+                            android:id="@+id/tv_pr_detail"
+                            android:text=""
+                            android:layout_marginLeft="@dimen/dp_10"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content">
+                        </TextView>
+                        <TextView
+                            android:id="@+id/tv_pr_spec"
+                            android:text=""
+                            android:layout_marginLeft="@dimen/dp_10"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:ellipsize="end"
+                            android:lines="1">
+                        </TextView>
 
 
-                </LinearLayout>
-                <LinearLayout
-                    android:orientation="horizontal"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-                    <TextView
-                        android:text="工序:"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content">
-                    </TextView>
-                    <TextView
-                        android:id="@+id/tv_ps_stepcode"
-                        android:text=""
-                        android:layout_marginLeft="@dimen/dp_10"
-                        android:layout_width="wrap_content"
+                    </LinearLayout>
+                    <LinearLayout
+                        android:visibility="gone"
+                        android:orientation="horizontal"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content">
-                    </TextView>
+                        <TextView
+                            android:text="工序:"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content">
+                        </TextView>
+                        <TextView
+                            android:id="@+id/tv_ps_stepcode"
+                            android:text=""
+                            android:layout_marginLeft="@dimen/dp_10"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content">
+                        </TextView>
 
-                </LinearLayout>
-                <LinearLayout
-                    android:orientation="horizontal"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-                    <TextView
-                        android:text="下载地址:"
-                        android:layout_width="wrap_content"
+                    </LinearLayout>
+                    <LinearLayout
+                        android:orientation="horizontal"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content">
-                    </TextView>
-                    <android.support.v7.widget.RecyclerView
-                        android:id="@+id/ra_dataurl"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        >
-                    </android.support.v7.widget.RecyclerView>
+                        <TextView
+                            android:text="下载地址:"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content">
+                        </TextView>
+                        <android.support.v7.widget.RecyclerView
+                            android:id="@+id/ra_dataurl"
+                            android:layout_marginRight="30dp"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content">
+                        </android.support.v7.widget.RecyclerView>
 
+                    </LinearLayout>
                 </LinearLayout>
-            </LinearLayout>
+                <android.support.v7.widget.RecyclerView
+                    android:layout_below="@+id/linetops"
+                    android:id="@+id/rv_data"
+                    android:background="@color/white"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_centerInParent="true">
+                </android.support.v7.widget.RecyclerView>
+            </RelativeLayout>
 
 
 
-            <TextView
-                android:id="@+id/btn_get"
-                android:text="播放SOP"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
-                android:layout_width="match_parent"
-                android:layout_height="50dp"
-                android:layout_below="@id/line_ra_dataurl"
-                android:gravity="center"
-                android:layout_centerInParent="true"
-                android:layout_marginTop="100dp"
-                android:background="@drawable/bg_button">
-            </TextView>
 
 
-            <TextView
 
-                android:id="@+id/btn_sengMessage"
-                android:text="打开文件夹"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
-                android:layout_width="match_parent"
-                android:layout_height="50dp"
-                android:layout_below="@id/btn_get"
-                android:gravity="center"
-                android:layout_centerInParent="true"
-                android:layout_marginTop="@dimen/textsize_20"
-                android:visibility="gone"
-                android:background="@drawable/bg_button">
-            </TextView>
-            <TextView
-                android:visibility="gone"
-                android:id="@+id/tcp_text"
-                android:text="tcp服务端发送"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/btn_sengMessage"
-                android:gravity="center"
-                android:layout_centerInParent="true"
-                android:layout_marginTop="100dp"
-                android:layout_marginBottom="@dimen/textsize_20">
-            </TextView>
+        </RelativeLayout>
 
-            <android.support.v7.widget.RecyclerView
-                android:id="@+id/rv_data"
-                android:visibility="gone"
-                android:background="@color/white"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/linetwo"
-                android:layout_centerInParent="true">
-            </android.support.v7.widget.RecyclerView>
-            <android.support.v7.widget.RecyclerView
-                android:id="@+id/rv_datawork"
-                android:visibility="gone"
-                android:background="@color/white"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/linethree"
-                android:layout_centerInParent="true">
-            </android.support.v7.widget.RecyclerView>
 
-        </RelativeLayout>
 
-    </ScrollView>
 
 
+    </ScrollView>
 
 
     <include

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

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal">
+
+    <LinearLayout
+        android:layout_marginTop="5dp"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+        <CheckBox
+            android:layout_gravity="center_vertical"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/select_checkbox"/>
+        <LinearLayout
+            android:layout_gravity="center"
+            android:orientation="vertical"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
+            <ImageView
+                android:id="@+id/iv_personnel_data"
+                android:layout_width="150dp"
+                android:layout_height="150dp"
+                android:scaleType="centerCrop"
+                android:layout_gravity="center"
+                android:background="@drawable/bg_line_edittext">
+            </ImageView>
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:textSize="15sp"
+                android:text="1111111"
+                android:id="@+id/text"
+                android:gravity="left"
+                android:textColor="@color/blue"
+                tools:ignore="RtlCompat">
+            </TextView>
+            <TextView
+                android:visibility="gone"
+                android:layout_marginTop="5dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="left"
+                android:textSize="15sp"
+                android:text="111111"
+                android:id="@+id/tv_mi_desc"
+                android:gravity="left"
+                tools:ignore="RtlCompat">
+            </TextView>
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+
+
+
+</LinearLayout>

build.gradle

@@ -57,8 +57,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 10,
-            versionName      : "v1.0"
+            versionCode      : 14,
+            versionName      : "v1.4"
     ]
 
     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 = 10;
-  public static final String VERSION_NAME = "v1.0";
+  public static final int VERSION_CODE = 14;
+  public static final String VERSION_NAME = "v1.4";
 }

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

@@ -1,4 +1,4 @@
-#Tue May 23 16:21:23 CST 2023
+#Fri Jun 09 14:04:07 CST 2023
 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