首件/巡检报告增加是否合格功能,修改打印功能,修复打印不出数据问题,调整为打印纸数据为后端控制.

app/build.gradle

@@ -48,7 +48,7 @@ android {
                     fileName = "华研车间程序UAS_MES_STORAGE_RELEASE_${releaseInfo}.apk"
                 } else if (variant.buildType.name.equals('debug')) {
                     def debugInfo = getVersionName()
-                    fileName = "UAS_MES_STORAGE_DEBUG_${debugInfo}.apk"
+                    fileName = "华研车间程序UAS_MES_STORAGE_DEBUG_${debugInfo}.apk"
                 }
                 outputFileName = fileName
             }

app/src/main/java/com/uas/hystorage/fragment/ReportPageFra.java

@@ -5,10 +5,8 @@ import android.app.Activity;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.database.Cursor;
-import android.graphics.Color;
 import android.net.Uri;
 import android.os.Bundle;
-import android.os.Handler;
 import android.provider.MediaStore;
 import android.support.v4.app.ActivityCompat;
 import android.support.v7.widget.LinearLayoutManager;
@@ -18,6 +16,8 @@ import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
 import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -28,12 +28,9 @@ import com.android.volley.Request;
 import com.android.volley.toolbox.StringRequest;
 import com.google.gson.Gson;
 import com.uas.hystorage.R;
-import com.uas.hystorage.activity.SampleDeliveryListAct;
 import com.uas.hystorage.adapter.AnnexAdapter;
 import com.uas.hystorage.bean.AnnexBean;
 import com.uas.hystorage.bean.AnnexInfo;
-import com.uas.hystorage.bean.InspectionPaintBean;
-import com.uas.hystorage.bean.SampleDeliveryBean;
 import com.uas.hystorage.global.GloableParams;
 import com.uas.hystorage.interfaces.ProgressListener;
 import com.uas.hystorage.listener.MyEditorActionListener;
@@ -44,32 +41,17 @@ import com.uas.hystorage.util.FastjsonUtil;
 import com.uas.hystorage.util.HttpCallback;
 import com.uas.hystorage.util.HttpParams;
 import com.uas.hystorage.util.MyLog;
-import com.uas.hystorage.util.OKHttpUitls;
 import com.uas.hystorage.util.OnDownloadListener;
 import com.uas.hystorage.util.UploadUtils;
 import com.uas.hystorage.util.VollyRequest;
 import com.uas.hystorage.util.YLDownload;
 import com.uas.hystorage.view.ClearableEditText;
 import com.uas.hystorage.view.business.ProgressPopup;
-import com.umeng.commonsdk.debug.E;
-import com.uuzuche.lib_zxing.activity.CodeUtils;
 
-import org.json.JSONException;
-import org.w3c.dom.Text;
-
-import java.io.BufferedInputStream;
-import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.regex.Matcher;
@@ -115,11 +97,13 @@ public class ReportPageFra extends BaseFragment {
     private String sr_laboratoryattach;
     private String sr_qcremark;
     private String sr_laboratoryremark;
+    private String SR_IFOK = "0";     //是否合格
     private List<AnnexInfo> imageQCUrlList;
     private List<AnnexInfo> imageTestUrlList;
     private int numberOfTimes = 0;  //下载完成次数
     private String pathQc;
     private String pathTest;
+    private CheckBox cb_is_qualified;
 
     @Override
     protected int getLayout() {
@@ -139,6 +123,7 @@ public class ReportPageFra extends BaseFragment {
         cet_beizhu2 = root.findViewById(R.id.cet_beizhu2);
         bt_gengxin = root.findViewById(R.id.bt_gengxin);
         tv_updater_info = root.findViewById(R.id.tv_updater_info);
+        cb_is_qualified = root.findViewById(R.id.cb_is_qualified);
 
     }
 
@@ -186,6 +171,19 @@ public class ReportPageFra extends BaseFragment {
                 startActivityForResult(Intent.createChooser(intent, "Select Images"), REQUEST_CODE2);
             }
         });
+
+        cb_is_qualified.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                if (buttonView.isPressed()) {
+                    if (isChecked) {
+                        SR_IFOK = "-1";
+                    }else {
+                        SR_IFOK = "0";
+                    }
+                }
+            }
+        });
     }
 
     @Override
@@ -194,7 +192,6 @@ public class ReportPageFra extends BaseFragment {
         pathTest = Constants.CONSTANT.APP_DIR_NAME + getActivity().getPackageName() + "/imageTest/";
         deleteFile();
 
-
         cet_danhao.requestFocus();
         Bundle arguments = getArguments();
         if (arguments != null) {
@@ -331,6 +328,7 @@ public class ReportPageFra extends BaseFragment {
         params.put("sr_laboratoryattach", fujianStr2);
         params.put("sr_laboratoryremark", cet_beizhu2.getText().toString().trim());
         params.put("sr_sendtype", sr_sendtype);
+        params.put("sr_ifok", SR_IFOK);
         String data = JSON.toJSONString(params);
         progressDialog.show();
         VollyRequest.getInstance().stringRequest(mStringRequest,
@@ -390,6 +388,16 @@ public class ReportPageFra extends BaseFragment {
                                 sr_laboratoryattach = dataObject.getString("SR_LABORATORYATTACH") == null ? "" : dataObject.getString("SR_LABORATORYATTACH");
                                 sr_qcremark = dataObject.getString("SR_QCREMARK") == null ? "" : dataObject.getString("SR_QCREMARK");
                                 sr_laboratoryremark = dataObject.getString("SR_LABORATORYREMARK") == null ? "" : dataObject.getString("SR_LABORATORYREMARK");
+                                SR_IFOK = dataObject.getString("SR_IFOK") == null ? "" : dataObject.getString("SR_IFOK");
+                                if (!TextUtils.isEmpty(SR_IFOK)) {
+                                    if (SR_IFOK.equals("-1")) {
+                                        cb_is_qualified.setChecked(true);
+                                    }else if (SR_IFOK.equals("0")) {
+                                        cb_is_qualified.setChecked(false);
+                                    }else {
+                                        cb_is_qualified.setChecked(false);
+                                    }
+                                }
                                 cet_beizhu1.setText(sr_qcremark);
                                 cet_beizhu2.setText(sr_laboratoryremark);
                                 //先删除文件在下载

app/src/main/java/com/uas/hystorage/util/PrintUtils.java

@@ -28,33 +28,28 @@ public class PrintUtils {
             //     * @param v      纵向分辨率
             //     * @param height 最大高度----实际的打印纸张的高度
             //     * @param qty    重复打印次数
-            int offset = 6,
-//                    h = 400,
-//                    v = 800,
-//                    height = 400,
-                                        h = 400,
-                                        v = 800,
-                                        height = 400,
-                    qty = 1;
+            //            int offset = 6,
+            //                    h = 400,
+            //                    v = 800,
+            //                    height = 400,
+            //                    qty = 1;
 
             JSONArray templateArray = JSON.parseArray(printTemplate);
+            JSONObject templateObj = templateArray.getJSONObject(0);
+            //la_offset 偏移值
+            //la_h    横向分辨率
+            //la_y   纵向分辨率
+            //la_height  最大高度
+            int la_offset = FastjsonUtil.getInt(templateObj, "LA_OFFSET") == 0 ? 6 : FastjsonUtil.getInt(templateObj, "LA_OFFSET");
+            int la_h = FastjsonUtil.getInt(templateObj, "LA_H") == 0 ? 400 : FastjsonUtil.getInt(templateObj, "LA_H");
+            int la_y = FastjsonUtil.getInt(templateObj, "LA_Y") == 0 ? 800 : FastjsonUtil.getInt(templateObj, "LA_Y");
+            int la_height = FastjsonUtil.getInt(templateObj, "LA_HEIGHT") == 0 ? 300 : FastjsonUtil.getInt(templateObj, "LA_HEIGHT");
+            int la_qty = FastjsonUtil.getInt(templateObj, "LA_QTY") == 0 ? 1 : FastjsonUtil.getInt(templateObj, "LA_QTY");
             if (templateArray != null && templateArray.size() > 0) {
-                PrintHelper printHelper = new PrintHelper(offset, h, v, height, qty);
+                PrintHelper printHelper = new PrintHelper(la_offset, la_h, la_y, la_height, la_qty);
                 for (int i = 0; i < templateArray.size(); i++) {
                     JSONObject templateObject = templateArray.getJSONObject(i);
                     if (templateObject != null) {
-                        //la_offset 偏移值
-                        //la_h    横向分辨率
-                        //la_y   纵向分辨率
-                        //la_height  最大高度
-                        //la_qty  重复打印次数
-                        int la_offset = FastjsonUtil.getInt(templateObject, "LA_OFFSET") == 0 ? 6:FastjsonUtil.getInt(templateObject, "LA_OFFSET");
-                        int la_h = FastjsonUtil.getInt(templateObject, "LA_H") == 0 ? 400:FastjsonUtil.getInt(templateObject, "LA_H");
-                        int la_y = FastjsonUtil.getInt(templateObject, "LA_Y") == 0 ? 800:FastjsonUtil.getInt(templateObject, "LA_Y");
-                        int la_height = FastjsonUtil.getInt(templateObject, "LA_HEIGHT") == 0 ? 300:FastjsonUtil.getInt(templateObject, "LA_HEIGHT");
-                        int la_qty = FastjsonUtil.getInt(templateObject, "LA_QTY") == 0 ? 1:FastjsonUtil.getInt(templateObject, "LA_QTY");
-                        printHelper = new PrintHelper(la_offset, la_h, la_y, la_height, la_qty);
-
                         String valuetype = FastjsonUtil.getText(templateObject, "LP_VALUETYPE");
                         double leftrate = FastjsonUtil.getDouble(templateObject, "LP_LEFTRATE");
                         int printX = (int) (leftrate * dpi / 25.4);

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

@@ -55,7 +55,7 @@
             android:layout_marginStart="10dp"
             android:layout_marginEnd="10dp"
             android:layout_marginBottom="30dp"
-            android:layout_marginTop="20dp"
+            android:layout_marginTop="10dp"
             android:scrollbars="none"
             android:scrollingCache="false" />
 

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

@@ -46,6 +46,26 @@
 
             </LinearLayout>
 
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="40dp"
+                android:orientation="horizontal"
+                android:gravity="center_vertical"
+                android:layout_marginTop="5dp"
+                >
+
+               <CheckBox
+                   android:id="@+id/cb_is_qualified"
+                   android:layout_width="wrap_content"
+                   android:layout_height="wrap_content"
+                   android:text="是否合格"
+                   android:textSize="16sp"
+                   android:textColor="@color/red"
+                   />
+
+            </LinearLayout>
+
+
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"

app/src/main/res/values/strings.xml

@@ -1,7 +1,7 @@
 <resources>
-    <string name="app_name">UAS-MES</string>
+    <string name="app_name">华研UAS-MES</string>
     <string name="app_name_mes">华研UAS-MES</string>
-    <string name="app_name_test">UAS-MES</string>
+    <string name="app_name_test">华研UAS-MES</string>
     <string name="hello_world">Hello world!</string>
     <string name="action_settings">Settings</string>
     <string name="title_activity_connect_server_fragment">ConnectServerFragment</string>

build.gradle

@@ -58,8 +58,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 34,
-            versionName      : "v1.2.4"
+            versionCode      : 35,
+            versionName      : "v1.2.5"
     ]
 
     depsVersion = [