蓝牙打印字体大小调整自适应接口返回值，增加拆批入口

app/src/main/java/com/uas/uas_mes_standard/fragment/WHBatchContentFragment.java

@@ -10,7 +10,6 @@ import android.widget.TextView;
 
 import com.uas.uas_mes_standard.R;
 import com.uas.uas_mes_standard.tools.DataSourceManager;
-import com.uas.uas_mes_standard.util.LogUtil;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -76,7 +75,6 @@ public class WHBatchContentFragment extends BaseFragment implements AdapterView.
             case R.string.title_breakbatch:
                 getFragmentManager().beginTransaction().addToBackStack(null)
                         .replace(R.id.container_function_fragment, new WHBreakingBatchFragment()).commit();
-                LogUtil.e("msg", "1");
                 break;
             //合并批次
             case R.string.title_combinebatch:

app/src/main/java/com/uas/uas_mes_standard/global/GloableParams.java

@@ -772,7 +772,7 @@ public class GloableParams {
     public static final String GRIDNAME_BOM_CHECK = "BOM校验";
     public static final String[] storageGridNames = {
             GRIDNAME_GOOD_SEARCH,
-//            GRIDNAME_BATCH_OPRATION,
+            GRIDNAME_BATCH_OPRATION,
 //            GRIDNAME_STORAGE_TRANSFER,
             GRIDNAME_MODIFY_QUANTITY,
 //            GRIDNAME_WORK_INVENTORY,
@@ -780,7 +780,7 @@ public class GloableParams {
             GRIDNAME_BOM_CHECK};
     public static final int[] storageGridImgs = {
             R.drawable.storage_good_search,
-//            R.drawable.storage_bach_operation,
+            R.drawable.storage_bach_operation,
 //            R.drawable.storage_transfer,
             R.drawable.storage_work_inventory,
             R.drawable.ic_modify_quantity,

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

@@ -2,13 +2,13 @@ package com.uas.uas_mes_standard.util;
 
 import android.content.Context;
 import android.text.TextUtils;
+import android.util.Log;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.uas.uas_mes_standard.tools.SharedPreUtil;
-
 import com.uas.uas_mes_standard.bluebooths.PrintHelper;
+import com.uas.uas_mes_standard.tools.SharedPreUtil;
 
 public class PrintUtils {
 
@@ -43,10 +43,10 @@ public class PrintUtils {
                         double barHeight = FastjsonUtil.getDouble(templateObject, "LP_HEIGHT");
                         int barHeightInt = (int) (barHeight * dpi / 25.4);
                         int fontSize = FastjsonUtil.getInt(templateObject, "LP_SIZE");
+//                        String lp_font = FastjsonUtil.getText(templateObject, "LP_FONT");//字体类型
                         String printKey = FastjsonUtil.getText(templateObject, "LP_NAME");
-
                         String printText = FastjsonUtil.getText(dataJson, printKey);
-
+                        Log.e("printText",printText);
                         if (!TextUtils.isEmpty(printText)) {
                             switch (valuetype) {
                                 case "barcode":
@@ -55,7 +55,7 @@ public class PrintUtils {
                                             .setY(printY)
                                             .setHeight(barHeightInt - (int) (2 * dpi / 25.4))
                                             .setCodeTextFont(4)
-                                            .setCodeTextSize(2)
+                                            .setCodeTextSize(fontSize)
                                             .build();
                                     break;
                                 case "text":
@@ -68,6 +68,7 @@ public class PrintUtils {
                                             .setY(printY)
                                             .setBold(1)
                                             .setTextFont(textFont)
+                                            .setTextSize(fontSize)
                                             .build();
                                     break;
                                 case "qrcode"://打印二维码