调整版本更新接口参数

app/build.gradle

@@ -1,9 +1,5 @@
 apply plugin: 'com.android.application'
 
-//apply plugin: 'kotlin-android'
-
-//apply plugin: 'kotlin-android-extensions'
-
 android {
     signingConfigs {
         pda_storage {

app/src/main/java/com/uas/equipment/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.equipment.R;
-import com.uas.equipment.bean.VersionUpgradeBean;
 import com.uas.equipment.global.GloableParams;
 import com.uas.equipment.util.AndroidUtil;
 import com.uas.equipment.util.CommonUtil;
@@ -34,8 +32,6 @@ import com.uas.equipment.util.down.ProgressResponseBody;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
 
 import static com.uas.equipment.util.Constants.CONSTANT.APK_FILE_NAME;
 import static com.uas.equipment.util.Constants.CONSTANT.APK_FILE_PATH;
@@ -145,51 +141,67 @@ public class VersionUpgradeFragment extends BaseFragment implements ProgressResp
                       .url(GloableParams.ADDRESS_OUTMATERIAL_GETPDAVERSION)
                        // .url("http://usoft.f3322.net:11769/ERP/api/pda/outMaterial/getPdaVersion.action")
                         .method(Request.Method.GET)
-                        .addParam("code", "UAS_SMART")
+                        .addParam("code", "UAS设备管理")
                         .build(), new HttpCallback() {
                     @Override
                     public void onSuccess(int flag, Object o) throws Exception {
                         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);
                             }
                         }
+
                     }
 
                     @Override

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

@@ -866,9 +866,8 @@ 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/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";
 
 
     /**

build.gradle

@@ -1,7 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-//    ext.kotlin_version = '1.2.30'
     repositories {
         maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' }
         maven { url 'http://maven.aliyun.com/nexus/content/repositories/jcenter' }
@@ -22,13 +21,6 @@ buildscript {
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0'
 
-
-
-
-//        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
     }
 }
 
@@ -62,8 +54,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 14,
-            versionName      : "v1.0.3"
+            versionCode      : 15,
+            versionName      : "v1.0.4"
     ]
 
     depsVersion = [