预加工报工去除打印模板选项改到标签补打界面

app/src/main/java/com/uas/ruiziuasmes/fragment/LabeLreprintingFragment.java

@@ -9,6 +9,8 @@ import android.view.View;
 import android.view.inputmethod.EditorInfo;
 import android.widget.Button;
 import android.widget.LinearLayout;
+import android.widget.RadioButton;
+import android.widget.RadioGroup;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
@@ -48,7 +50,9 @@ public class LabeLreprintingFragment extends BaseFragment implements View.OnClic
     private TextView tv_hint1;
     private JSONArray dataArray;
     private Button btn_starts;
-
+    private RadioGroup rg_hui;
+    private RadioButton rb_ok;
+    private RadioButton rb_no;
     @Override
     protected int getLayout() {
         return R.layout.fragment_labe_lreprnting;
@@ -62,6 +66,9 @@ public class LabeLreprintingFragment extends BaseFragment implements View.OnClic
         line_hint = root.findViewById(R.id.line_hint);
         tv_hint1 = root.findViewById(R.id.tv_hint1);
         btn_starts = root.findViewById(R.id.btn_starts);
+        rg_hui = root.findViewById(R.id.rg_hui);
+        rb_ok = root.findViewById(R.id.rb_ok);
+        rb_no = root.findViewById(R.id.rb_no);
         storage_recharge_collect_ets.requestFocus();
 
     }
@@ -69,7 +76,8 @@ public class LabeLreprintingFragment extends BaseFragment implements View.OnClic
 
     @Override
     protected void initEvents() {
-        getPrintTemplate();
+        rb_ok.setChecked(true);
+        getPrintTemplate("Lotno!PDAPrint");
         storage_recharge_collect_ets.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
@@ -89,17 +97,31 @@ public class LabeLreprintingFragment extends BaseFragment implements View.OnClic
                 getgetinfo(storage_recharge_collect_ets.getText().toString().trim());
             }
         });
+        rg_hui.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
+            @SuppressLint("NonConstantResourceId")
+            @Override
+            public void onCheckedChanged(RadioGroup radioGroup, int checkid) {
+                switch (checkid){
+                    case R.id.rb_ok:
+                        getPrintTemplate("Lotno!PDAPrint");
+                        break;
+                    case R.id.rb_no:
+                        getPrintTemplate("PreBarcode");
+                        break;
 
+                }
+            }
+        });
 
     }
-    private void getPrintTemplate() {
+    private void getPrintTemplate(String caller) {
         VolleyRequest.getInstance().stringRequest(mStringRequest,
                 new HttpParams.Builder()
                         .url(GloableParams.ADDRESS_BARINFO_PRINTMODEL)
                         .method(Request.Method.GET)
                         .flag(0)
                         .tag("barinfoPrint")
-                        .addParam("caller", "Lotno!PDAPrint")//Barcode!PDAPrint仓库
+                        .addParam("caller", caller)//Barcode!PDAPrint仓库
                         .build(), new HttpCallback() {
                     @Override
                     public void onSuccess(int flag, Object o) throws Exception {

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

@@ -24,8 +24,6 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.PopupWindow;
-import android.widget.RadioButton;
-import android.widget.RadioGroup;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
@@ -88,9 +86,6 @@ public class PreProcessingReportFragment extends BaseFragment implements View.On
     private String macode;
     private String mouldcode;
     private String stringlotno;
-    private RadioGroup rg_hui;
-    private RadioButton rb_ok;
-    private RadioButton rb_no;
 
     @Override
     protected int getLayout() {
@@ -108,9 +103,6 @@ public class PreProcessingReportFragment extends BaseFragment implements View.On
         btn_oneprint = root.findViewById(R.id.btn_oneprint);
         ol_remark_et = root.findViewById(R.id.ol_remark_et);
         iv_search = root.findViewById(R.id.iv_search);
-        rg_hui = root.findViewById(R.id.rg_hui);
-        rb_ok = root.findViewById(R.id.rb_ok);
-        rb_no = root.findViewById(R.id.rb_no);
         jlt_storage_in_barcode_save_btn = root.findViewById(R.id.jlt_storage_in_barcode_save_btn);
     }
 
@@ -128,8 +120,7 @@ public class PreProcessingReportFragment extends BaseFragment implements View.On
         macode = arguments.getString(Constants.FLAG.MA_CODE);
         mouldcode = arguments.getString(Constants.FLAG.MOULDCODE);
 
-        rb_ok.setChecked(true);
-        getPrintTemplate("Lotno!PDAPrint");
+        getPrintTemplate("PreBarcode");
         btn_oneprint.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -177,21 +168,7 @@ public class PreProcessingReportFragment extends BaseFragment implements View.On
         });
         ma_code = SharedPreUtil.getString(mActivity, "MA_CODE", null);
         sc_code = SharedPreUtil.getString(mActivity, "SC_CODE", null);
-        rg_hui.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
-            @SuppressLint("NonConstantResourceId")
-            @Override
-            public void onCheckedChanged(RadioGroup radioGroup, int checkid) {
-                switch (checkid){
-                    case R.id.rb_ok:
-                        getPrintTemplate("Lotno!PDAPrint");
-                        break;
-                    case R.id.rb_no:
-                        getPrintTemplate("PreBarcode");
-                        break;
 
-                }
-            }
-        });
 //        tv_ma_code.setText(ma_code);
     }
 

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

@@ -9,10 +9,37 @@
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
-
+        <RadioGroup
+            android:id="@+id/rg_hui"
+            android:orientation="horizontal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:layout_marginTop="@dimen/dp_10"
+            android:layout_marginBottom="@dimen/dp_10">
+            <RadioButton
+                android:id="@+id/rb_ok"
+                android:text="报工"
+                android:layout_gravity="center"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="@dimen/dp_10"
+                android:layout_marginLeft="@dimen/dp_10"
+                android:textSize="@dimen/sp_14">
+            </RadioButton>
+            <RadioButton
+                android:id="@+id/rb_no"
+                android:text="预加工"
+                android:layout_gravity="center"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/dp_10"
+                android:layout_marginRight="@dimen/dp_10">
+            </RadioButton>
+        </RadioGroup>
 
         <LinearLayout
-            android:paddingTop="@dimen/sp_16"
             android:paddingLeft="@dimen/sp_16"
             android:paddingRight="@dimen/sp_16"
             android:orientation="horizontal"

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

@@ -15,33 +15,6 @@
             android:layout_height="wrap_content"
             android:text="打印">
         </Button>
-        <RadioGroup
-            android:id="@+id/rg_hui"
-            android:orientation="horizontal"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:gravity="center">
-            <RadioButton
-                android:id="@+id/rb_ok"
-                android:text="报工"
-                android:layout_gravity="center"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginRight="@dimen/dp_10"
-                android:layout_marginLeft="@dimen/dp_10"
-                android:textSize="@dimen/sp_14">
-            </RadioButton>
-            <RadioButton
-                android:id="@+id/rb_no"
-                android:text="预加工"
-                android:layout_gravity="center"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/dp_10"
-                android:layout_marginRight="@dimen/dp_10">
-            </RadioButton>
-        </RadioGroup>
     </LinearLayout>
 
     <LinearLayout

build.gradle

@@ -51,8 +51,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 22,
-            versionName      : "v1.1.2"
+            versionCode      : 24,
+            versionName      : "v1.1.4"
     ]
 
     depsVersion = [