添加正确的参数修改密码的接口

taowenyin · Dec 21, 2017 · 0e17db5 · 0e17db5
1 parent 55a0249
commit 0e17db5
Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/app/src/main/java/cn/edu/siso/rlxapf/ParamActivity.java b/app/src/main/java/cn/edu/siso/rlxapf/ParamActivity.java
@@ -3,6 +3,7 @@
 import android.support.v4.app.DialogFragment;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.View;
@@ -15,6 +16,8 @@
 
 import com.alibaba.fastjson.JSON;
 
+import org.apache.commons.lang3.StringUtils;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -166,7 +169,8 @@ public void onClick(View v) {
 
     @Override
     public void onConfirmBtnClick(DialogFragment dialogFragment, boolean isConfrim, String pwd) {
-        if (isConfrim && !pwd.equals(deviceData.get(currPosition).getGPRSComPw())) {
+        if (isConfrim && !StringUtils.isEmpty(deviceData.get(currPosition).getGPRSChangePwd()) &&
+                !pwd.equals(deviceData.get(currPosition).getGPRSChangePwd())) {
             ConnectToast toast  = new ConnectToast(getApplicationContext(),
                     ConnectToast.ConnectRes.BAD,
                     getResources().getString(R.string.pref_fragment_dialog_pwd_error),

diff --git a/app/src/main/java/cn/edu/siso/rlxapf/bean/DeviceBean.java b/app/src/main/java/cn/edu/siso/rlxapf/bean/DeviceBean.java
@@ -13,6 +13,7 @@ public class DeviceBean {
     private String GPSDeviceNo = StringUtils.EMPTY;
     private String GPRSComPw = StringUtils.EMPTY;
     private String GPRSMobileNo = StringUtils.EMPTY;
+    private String GPRSChangePwd = StringUtils.EMPTY;
     private String deviceNo = StringUtils.EMPTY;
     private String authority = StringUtils.EMPTY;
     private String onoff = StringUtils.EMPTY;
@@ -98,6 +99,14 @@ public void setGPRSMobileNo(String GPRSMobileNo) {
         this.GPRSMobileNo = GPRSMobileNo;
     }
 
+    public String getGPRSChangePwd() {
+        return GPRSChangePwd;
+    }
+
+    public void setGPRSChangePwd(String GPRSChangePwd) {
+        this.GPRSChangePwd = GPRSChangePwd;
+    }
+
     public String getDeviceNo() {
         return deviceNo;
     }