钢网管控页修改领用增加退回去除的张力参数

app/src/main/java/com/uas/lg_smart/fragment/SteelMeshControlFragment.java

@@ -420,8 +420,6 @@ public class SteelMeshControlFragment extends BaseFragment implements View.OnCli
      * 领用
      */
     private void confirmCharging() {
-
-
         progressDialog.show();
         VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
                 .url(GloableParams.ADDRESS_DOCUMENTLIBRARY_RECEIVE)
@@ -434,6 +432,11 @@ public class SteelMeshControlFragment extends BaseFragment implements View.OnCli
                 .addParam("licode", solder_charging_linecode_et.getText().toString().trim())
                 .addParam("emcode", tv_dc_emcode.getText().toString().trim())
                 .addParam("macode", et_linecode_smts.getText().toString().trim())
+                .addParam("ENSIONA", ce_a.getText().toString().trim())
+                .addParam("ENSIONB", ce_b.getText().toString().trim())
+                .addParam("ENSIONC", ce_c.getText().toString().trim())
+                .addParam("ENSIOND", ce_d.getText().toString().trim())
+                .addParam("ENSIONE", ce_e.getText().toString().trim())
                 .build(), new HttpCallback() {
             @Override
             public void onSuccess(int flag, Object o) throws Exception {
@@ -451,8 +454,6 @@ public class SteelMeshControlFragment extends BaseFragment implements View.OnCli
                 if (!StringUtil.isEmpty(waring)){
                     CommonUtil.toastNoRepeat(mActivity, resultdata+"");
                 }
-
-
             }
 
             @Override
@@ -476,12 +477,6 @@ public class SteelMeshControlFragment extends BaseFragment implements View.OnCli
                 .addParam("emcode", tv_dc_emcode.getText().toString().trim())
                 .addParam("stcombinenumber", ce_ban.getText().toString().trim())
                 .addParam("isclean", cb_xi.isChecked()+"")
-                .addParam("ENSIONA", ce_a.getText().toString().trim())
-                .addParam("ENSIONB", ce_b.getText().toString().trim())
-                .addParam("ENSIONC", ce_c.getText().toString().trim())
-                .addParam("ENSIOND", ce_d.getText().toString().trim())
-                .addParam("ENSIONE", ce_e.getText().toString().trim())
-
                 .build(), new HttpCallback() {
             @Override
             public void onSuccess(int flag, Object o) throws Exception {

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

@@ -13,12 +13,10 @@ import android.widget.Button;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.android.volley.Request;
 import com.android.volley.toolbox.StringRequest;
 import com.uas.lg_smart.R;
-import com.uas.lg_smart.bean.VersionUpgradeBean;
 import com.uas.lg_smart.global.GloableParams;
 import com.uas.lg_smart.util.AndroidUtil;
 import com.uas.lg_smart.util.CommonUtil;
@@ -34,8 +32,6 @@ import com.uas.lg_smart.util.down.ProgressResponseBody;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
 
 import static com.uas.lg_smart.util.Constants.CONSTANT.APK_FILE_NAME;
 import static com.uas.lg_smart.util.Constants.CONSTANT.APK_FILE_PATH;
@@ -150,45 +146,60 @@ public class VersionUpgradeFragment extends BaseFragment implements ProgressResp
                         .build(), new HttpCallback() {
                     @Override
                     public void onSuccess(int flag, Object o) throws Exception {
-                        progressDialog.dismiss();
+//                        progressDialog.dismiss();
+//                        String result = o.toString();
+//                        JSONObject resultObject = JSON.parseObject(result);
+//                        JSONArray dataArray = resultObject.getJSONArray("data");
+//                        List<VersionUpgradeBean> list=new ArrayList<>();
+//                        list.clear();
+//                        if (dataArray != null && dataArray.size() > 0) {
+//                            for (int i = 0; i < dataArray.size(); i++) {
+//                                JSONObject dataObject = dataArray.getJSONObject(i);
+//                                if (dataObject != null) {
+//                                    VersionUpgradeBean jltStorageInBean = new VersionUpgradeBean();
+//                                    if (FastjsonUtil.getText(dataObject, "PP_PDACODE").equals("UAS辅料管理")){
+//                                        jltStorageInBean.setPP_PDACODE(FastjsonUtil.getText(dataObject, "PP_PDACODE"));
+//                                        jltStorageInBean.setPP_VERSIONNUM(FastjsonUtil.getText(dataObject, "PP_VERSIONNUM"));
+//                                        jltStorageInBean.setPP_ATTACH(FastjsonUtil.getText(dataObject, "PP_ATTACH"));
+//                                        jltStorageInBean.setPP_REMARK(FastjsonUtil.getText(dataObject, "PP_REMARK"));
+//                                        jltStorageInBean.setPP_VERSIONNAME(FastjsonUtil.getText(dataObject, "PP_VERSIONNAME"));
+//                                        list.add(jltStorageInBean);
+//                                        mUpgradeButton.setVisibility(View.VISIBLE);
+//                                    }else {
+//                                        mUpgradeButton.setVisibility(View.GONE);
+//                                    }
+//
+//                                }
+//                            }
+//                        }
+//                        if (list == null || list.size() == 0){
+//                            mUpgradeButton.setVisibility(View.GONE);
+//                        }else {
+//                            for (int i=0;i<list.size();i++){
+//                                VersionUpgradeBean versionUpgradeBean = list.get(0);
+//                                mNewVersionTv.setText(versionUpgradeBean.getPP_VERSIONNAME());
+//                                mMsgTextView.setText(versionUpgradeBean.getPP_REMARK());
+//                                mAttachId = versionUpgradeBean.getPP_ATTACH();
+//                                if (!TextUtils.isEmpty(mAttachId)) {
+//                                    mUpgradeButton.setVisibility(View.VISIBLE);
+//                                } else {
+//                                    mUpgradeButton.setVisibility(View.VISIBLE);
+//                                }
+//                            }
+//                        }
+
                         String result = o.toString();
                         JSONObject resultObject = JSON.parseObject(result);
-                        JSONArray dataArray = resultObject.getJSONArray("data");
-                        List<VersionUpgradeBean> list=new ArrayList<>();
-                        list.clear();
-                        if (dataArray != null && dataArray.size() > 0) {
-                            for (int i = 0; i < dataArray.size(); i++) {
-                                JSONObject dataObject = dataArray.getJSONObject(i);
-                                if (dataObject != null) {
-                                    VersionUpgradeBean jltStorageInBean = new VersionUpgradeBean();
-                                    if (FastjsonUtil.getText(dataObject, "PP_PDACODE").equals("UAS辅料管理")){
-                                        jltStorageInBean.setPP_PDACODE(FastjsonUtil.getText(dataObject, "PP_PDACODE"));
-                                        jltStorageInBean.setPP_VERSIONNUM(FastjsonUtil.getText(dataObject, "PP_VERSIONNUM"));
-                                        jltStorageInBean.setPP_ATTACH(FastjsonUtil.getText(dataObject, "PP_ATTACH"));
-                                        jltStorageInBean.setPP_REMARK(FastjsonUtil.getText(dataObject, "PP_REMARK"));
-                                        jltStorageInBean.setPP_VERSIONNAME(FastjsonUtil.getText(dataObject, "PP_VERSIONNAME"));
-                                        list.add(jltStorageInBean);
-                                        mUpgradeButton.setVisibility(View.VISIBLE);
-                                    }else {
-                                        mUpgradeButton.setVisibility(View.GONE);
-                                    }
-
-                                }
-                            }
-                        }
-                        if (list == null || list.size() == 0){
-                            mUpgradeButton.setVisibility(View.GONE);
-                        }else {
-                            for (int i=0;i<list.size();i++){
-                                VersionUpgradeBean versionUpgradeBean = list.get(0);
-                                mNewVersionTv.setText(versionUpgradeBean.getPP_VERSIONNAME());
-                                mMsgTextView.setText(versionUpgradeBean.getPP_REMARK());
-                                mAttachId = versionUpgradeBean.getPP_ATTACH();
-                                if (!TextUtils.isEmpty(mAttachId)) {
-                                    mUpgradeButton.setVisibility(View.VISIBLE);
-                                } else {
-                                    mUpgradeButton.setVisibility(View.VISIBLE);
-                                }
+                        JSONObject dataObject = resultObject.getJSONObject("data");
+                        if (dataObject != null) {
+                            mNewVersionTv.setText(FastjsonUtil.getText(dataObject, "pp_versionname"));
+                            mMsgTextView.setText(FastjsonUtil.getText(dataObject, "pp_remark"));
+
+                            mAttachId = FastjsonUtil.getText(dataObject, "pp_attach");
+                            if (!TextUtils.isEmpty(mAttachId)) {
+                                mUpgradeButton.setVisibility(View.VISIBLE);
+                            } else {
+                                mUpgradeButton.setVisibility(View.GONE);
                             }
                         }
                     }

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

@@ -450,7 +450,9 @@ public class GloableParams {
     //下载附件
     private static final String ADDRESSTAIL_COMMON_DOWNLOADBYID = "/common/downloadbyId.action";
     //获取应用版本信息
-    private static final String ADDRESSTAIL_OUTMATERIAL_GETPDAVERSION = "/api/pda/outMaterial/getPdaVersion.action";
+//    private static final String ADDRESSTAIL_OUTMATERIAL_GETPDAVERSION = "/api/pda/outMaterial/getPdaVersion.action";
+    private static final String ADDRESSTAIL_OUTMATERIAL_GETPDAVERSION = "/api/pda/getPdaVersion.action";
+
     private static final String ADDRESSTAIL_DELIVERYORDERDETAIL = "/api/pda/receiving/makeCollectList.action";
 
     // 仓库管理:拆批合批，页面二：分拆批次页面

build.gradle

@@ -54,8 +54,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 16,
-            versionName      : "v1.0.6"
+            versionCode      : 17,
+            versionName      : "v1.0.7"
     ]
 
     depsVersion = [