报工去除推送相关人员功能, 去除列表物料规格3

app/src/main/java/com/uas/baigang_workshop_workstation/fragment/GdTimeReportFragmentNew2.java

@@ -3,7 +3,6 @@ package com.uas.baigang_workshop_workstation.fragment;
 import android.annotation.SuppressLint;
 import android.app.AlertDialog;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.graphics.drawable.BitmapDrawable;
 import android.os.Bundle;
@@ -192,21 +191,23 @@ public class GdTimeReportFragmentNew2 extends BaseFragment {
         });
 
         reportingWorkAdapter.setReportingWorkListener((baogong, baofei, beizhu, yichanggongshi, gongdanhao, position) -> {
-            new AlertDialog.Builder(mActivity).setTitle("提示")
-                    .setMessage("是否推送相关人员?")
-                    .setPositiveButton("确认", new DialogInterface.OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dialog, int which) {
-                            initGetPersonnelID(baogong,gongdanhao,baofei, beizhu, yichanggongshi,position);
-                        }
-                    })
-                    .setNegativeButton("取消",
-                            new DialogInterface.OnClickListener() {
-                                @Override
-                                public void onClick(DialogInterface dialog, int which) {
-                                    setReportingWork(baogong, baofei, beizhu, yichanggongshi, position);
-                                }
-                            }).create().show();
+//            new AlertDialog.Builder(mActivity).setTitle("提示")
+//                    .setMessage("是否推送相关人员?")
+//                    .setPositiveButton("确认", new DialogInterface.OnClickListener() {
+//                        @Override
+//                        public void onClick(DialogInterface dialog, int which) {
+//                            initGetPersonnelID(baogong,gongdanhao,baofei, beizhu, yichanggongshi,position);
+//                        }
+//                    })
+//                    .setNegativeButton("取消",
+//                            new DialogInterface.OnClickListener() {
+//                                @Override
+//                                public void onClick(DialogInterface dialog, int which) {
+//                                    setReportingWork(baogong, baofei, beizhu, yichanggongshi, position);
+//                                }
+//                            }).create().show();
+
+            setReportingWork(baogong, baofei, beizhu, yichanggongshi, position);
         });
 
         search_im.setOnClickListener(new View.OnClickListener() {

app/src/main/java/com/uas/baigang_workshop_workstation/fragment/PreProcessingReportFragment.java

@@ -159,6 +159,10 @@ public class PreProcessingReportFragment extends BaseFragment implements View.On
             }
         });
 
+    }
+
+    @Override
+    protected void initDatas() {
         Bundle bundle = getArguments();
         if (bundle != null) {
             sc_code = bundle.getString(Constants.FLAG.SC_CODE);
@@ -166,10 +170,7 @@ public class PreProcessingReportFragment extends BaseFragment implements View.On
         }
 
         tv_ma_code.setText(ma_code);
-    }
 
-    @Override
-    protected void initDatas() {
         mFeededList = new ArrayList<>();
         myAdapter = new SelectAdapter(mFeededList);
         mRecyclerView = root.findViewById(R.id.feeded_rv);
@@ -179,7 +180,7 @@ public class PreProcessingReportFragment extends BaseFragment implements View.On
         mRecyclerView.setItemAnimator(new DefaultItemAnimator());
         setAdapter(mFeededList);
         mRecyclerView.setAdapter(myAdapter);
-//        getNewVersionMsg(ma_code);
+        getNewVersionMsg(ma_code);
     }
 
     private void getNewVersionMsg(String ma_code) {
@@ -575,7 +576,7 @@ public class PreProcessingReportFragment extends BaseFragment implements View.On
             ((ListItemViewHolder) holder).tv_liaocode.setText("物料编号："+mList.get(i).getMM_PRODCODE());
             ((ListItemViewHolder) holder).tv_liaotetall.setText("物料名称："+mList.get(i).getPR_DETAIL());
             ((ListItemViewHolder) holder).tv_liaospec.setText("物料规格："+mList.get(i).getPR_SPEC());
-            ((ListItemViewHolder) holder).tv_name_work_order.setText("物料规格3："+mList.get(i).getPR_SPEC3_USER());
+           ((ListItemViewHolder) holder).tv_name_work_order.setText("物料规格3："+mList.get(i).getPR_SPEC3_USER());
 
             ((ListItemViewHolder) holder).checkBox.setChecked(isItemChecked(i));
 //            if (i%2==0){

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

@@ -50,6 +50,7 @@
                 android:text="11234123ee21234er"></TextView>
 
             <TextView
+                android:visibility="gone"
                 android:id="@+id/tv_name_work_order"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"

build.gradle

@@ -64,8 +64,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 8,
-            versionName      : "v1.0.7"
+            versionCode      : 9,
+            versionName      : "v1.0.8"
     ]
 
     depsVersion = [