Browse Source

修改版本升级逻辑,修改默认IP

ChengJH 2 years ago
parent
commit
e83e65a490

+ 52 - 0
app/src/main/java/com/uas/rd_uaspda/bean/VersionUpgradeBean.java

@@ -0,0 +1,52 @@
+package com.uas.rd_uaspda.bean;
+
+/**
+ * Created by cjh-sail on 2023-06-25
+ */
+public class VersionUpgradeBean {
+    public String PP_PDACODE;
+    public String PP_VERSIONNUM;
+    public String PP_ATTACH;
+    public String PP_REMARK;
+    public String PP_VERSIONNAME;
+
+    public String getPP_PDACODE() {
+        return PP_PDACODE;
+    }
+
+    public void setPP_PDACODE(String PP_PDACODE) {
+        this.PP_PDACODE = PP_PDACODE;
+    }
+
+    public String getPP_VERSIONNUM() {
+        return PP_VERSIONNUM;
+    }
+
+    public void setPP_VERSIONNUM(String PP_VERSIONNUM) {
+        this.PP_VERSIONNUM = PP_VERSIONNUM;
+    }
+
+    public String getPP_ATTACH() {
+        return PP_ATTACH;
+    }
+
+    public void setPP_ATTACH(String PP_ATTACH) {
+        this.PP_ATTACH = PP_ATTACH;
+    }
+
+    public String getPP_REMARK() {
+        return PP_REMARK;
+    }
+
+    public void setPP_REMARK(String PP_REMARK) {
+        this.PP_REMARK = PP_REMARK;
+    }
+
+    public String getPP_VERSIONNAME() {
+        return PP_VERSIONNAME;
+    }
+
+    public void setPP_VERSIONNAME(String PP_VERSIONNAME) {
+        this.PP_VERSIONNAME = PP_VERSIONNAME;
+    }
+}

+ 3 - 0
app/src/main/java/com/uas/rd_uaspda/fragment/ConnectServerFragment.java

@@ -138,8 +138,11 @@ public class ConnectServerFragment extends BaseFragment implements View.OnClickL
         //获取组件
         submitButton = (Button) root.findViewById(R.id.btn_submit_conncetserver_fragment);
         ipEditText = (EditText) root.findViewById(R.id.et_ip_connectserver_fragment);
+        ipEditText.setText("192.168.6.253");
         portEditText = (EditText) root.findViewById(R.id.et_port_connectserver_fragment);
+        portEditText.setText("8099");
         siteEditText = (EditText) root.findViewById(R.id.et_site_connectserver_fragment);
+        siteEditText.setText("mes");
         noticeTextView = (TextView) root.findViewById(R.id.textview_notice);
         mSystemSpinner = (Spinner) root.findViewById(R.id.connect_system_sp);
         mHttpSpinner = (Spinner) root.findViewById(R.id.connect_http_sp);

+ 40 - 10
app/src/main/java/com/uas/rd_uaspda/fragment/VersionUpgradeFragment.java

@@ -13,10 +13,12 @@ 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.rd_uaspda.R;
+import com.uas.rd_uaspda.bean.VersionUpgradeBean;
 import com.uas.rd_uaspda.global.GloableParams;
 import com.uas.rd_uaspda.util.AndroidUtil;
 import com.uas.rd_uaspda.util.CommonUtil;
@@ -32,6 +34,8 @@ import com.uas.rd_uaspda.util.down.ProgressResponseBody;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 
 import static com.uas.rd_uaspda.util.Constants.CONSTANT.APK_FILE_NAME;
 import static com.uas.rd_uaspda.util.Constants.CONSTANT.APK_FILE_PATH;
@@ -149,16 +153,42 @@ public class VersionUpgradeFragment extends BaseFragment implements ProgressResp
                         progressDialog.dismiss();
                         String result = o.toString();
                         JSONObject resultObject = JSON.parseObject(result);
-                        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.VISIBLE);
+                        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);
+                                }
                             }
                         }
                     }