2017-10-24

aa326422 · yu · 2985d50f · aa326422 · aa326422 · aa326422
Commit aa326422 authored Oct 24, 2017 by yu
Showing with 145 additions and 16 deletions
app/src/main/java/com/dayu/bigfish/Constants.java
app/src/main/java/com/dayu/bigfish/activity/LoginActivity.java
app/src/main/java/com/dayu/bigfish/bean/LoginBean.java
app/src/main/java/com/dayu/bigfish/bean/LoginTestBean.java
app/src/main/java/com/dayu/bigfish/moudle/login/LoginPresenter.java
app/src/main/java/com/dayu/bigfish/moudle/login/LoginView.java
--- a/app/src/main/java/com/dayu/bigfish/Constants.java
+++ b/app/src/main/java/com/dayu/bigfish/Constants.java
@@ -19,7 +19,7 @@ public class Constants {
    /**************************正式根环境路径*******************************/
    public static final String BASE_URL = "https://mobile.dayu.ai";
    /***********************测试环境2.0配置**********************************/
-    public static final String LOGIN_URL = "http://47.94.101.239:3112/check";
+  /*  public static final String LOGIN_URL = "http://47.94.101.239:3112/check";
    //登录时发送验证码的URL
    public static final String REGISTER_URL = BASE_TEST + "/api-user/" + "account/loginSms/";
    //根据工单状态获取分页工单信息的路径
@@ -61,10 +61,13 @@ public class Constants {
    public final static String TAB_NUM = BASE_TEST + "/api-order/" + "orders/";
    //环信
    public final static String MESSAGE_HX = BASE_TEST + "/api-message/" + "hXMessage";
+     //处理工单上传照片
+     public final static String UP_PHOTO = "http://47.94.101.239:3111/file/uploadMore";
+*/
    /**************************正式环境*******************************/
    //登录的URL
-   /* public static final String LOGIN_URL = BASE_URL + "/check";
+    public static final String LOGIN_URL = BASE_URL + "/check";
    //登录时发送验证码的URL
    public static final String REGISTER_URL = BASE_URL + "/api-user/" + "account/loginSms/";
    //根据工单状态获取分页工单信息的路径
@@ -106,7 +109,8 @@ public class Constants {
    public final static String TAB_NUM = BASE_URL + "/api-order/" + "orders/";
    //环信消息
    public final static String MESSAGE_HX = BASE_URL + "/api-message/" + "hXMessage";
-    */
+    //处理工单上传照片
+    public final static String UP_PHOTO = BASE_URL + "/file/uploadMore";
    /***********************其他配置**********************************/
@@ -114,8 +118,6 @@ public class Constants {
    public static final int DEBUGLEVEL = LogUtils.LEVEL_ALL;
    //相册选择照片删除时传递的key
    public final static String BUNDLE_KEY_ID = "BUNDLE_KEY_ID";
-    //处理工单上传照片
-    public final static String UP_PHOTO = "http://47.94.101.239:3111/file/uploadMore";
    //通用的工程师id
    public final static String USER_ID = " /engineerId/";
    //通用的站点id

--- a/app/src/main/java/com/dayu/bigfish/activity/LoginActivity.java
+++ b/app/src/main/java/com/dayu/bigfish/activity/LoginActivity.java
@@ -18,6 +18,7 @@ import com.dayu.bigfish.R;
 import com.dayu.bigfish.base.BaseActivity;
 import com.dayu.bigfish.bean.BaseBean;
 import com.dayu.bigfish.bean.LoginBean;
+import com.dayu.bigfish.bean.LoginTestBean;
 import com.dayu.bigfish.bean.RegisterBean;
 import com.dayu.bigfish.managers.UserManager;
 import com.dayu.bigfish.moudle.login.LoginPresenter;
@@ -114,6 +115,12 @@ public class LoginActivity extends BaseActivity<LoginView, LoginPresenter> imple
        hxUserId = loginBean.getData().getHxAccount();
        hxUserPwd = loginBean.getData().getHxPwd();
        imageUrl = loginBean.getData().getHeaderImg();
+      /*  accountId = loginTestBean.getData().getAccountId();
+        siteId = loginTestBean.getData().getSiteId();
+        token = loginTestBean.getData().getToken();
+        hxUserId = loginTestBean.getData().getHxAccount();
+        hxUserPwd = loginTestBean.getData().getHxPwd();*/
+        //imageUrl = null;
        if (TextUtils.isEmpty(imageUrl)){
                imageUrl = "暂无头像";
        }
@@ -184,7 +191,6 @@ public class LoginActivity extends BaseActivity<LoginView, LoginPresenter> imple
    public void sendRegisterError(String msg) {
        ToastUtils.showShortToast(msg);
    }
    @Override
    public void onDestroy() {
        super.onDestroy();

--- a/app/src/main/java/com/dayu/bigfish/bean/LoginBean.java
+++ b/app/src/main/java/com/dayu/bigfish/bean/LoginBean.java
@@ -57,6 +57,15 @@ public class LoginBean implements Serializable {
        private String accountId;
        private String siteId;
        private String hxAccount;
+        public String getAccessToken() {
+            return accessToken;
+        }
+        public void setAccessToken(String accessToken) {
+            this.accessToken = accessToken;
+        }
        private String accessToken;
        private String hxPwd;
        private String headerImg;
@@ -84,15 +93,6 @@ public class LoginBean implements Serializable {
        public void setHxAccount(String hxAccount) {
            this.hxAccount = hxAccount;
        }
-        public String getAccessToken() {
-            return accessToken;
-        }
-        public void setAccessToken(String accessToken) {
-            this.accessToken = accessToken;
-        }
        public String getHxPwd() {
            return hxPwd;
        }

--- a/app/src/main/java/com/dayu/bigfish/bean/LoginTestBean.java
+++ b/app/src/main/java/com/dayu/bigfish/bean/LoginTestBean.java
+package com.dayu.bigfish.bean;
+/**
+ * Created by yu on 2017/10/24.
+ */
+public class LoginTestBean {
+    /**
+     * code : 0
+     * data : {"accountId":"407","siteId":"209","hxAccount":"bff06f06ea094d158b599908296b0aa1","accessToken":"b1ac52a96ab34f76ac42c55073dc0cfa","hxPwd":"ADsj63J8","token":"a53723f05fdd4532843eb5a3c9048a06"}
+     * msg : 成功
+     */
+    private int code;
+    private DataBean data;
+    private String msg;
+    public int getCode() {
+        return code;
+    }
+    public void setCode(int code) {
+        this.code = code;
+    }
+    public DataBean getData() {
+        return data;
+    }
+    public void setData(DataBean data) {
+        this.data = data;
+    }
+    public String getMsg() {
+        return msg;
+    }
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+    public static class DataBean {
+        /**
+         * accountId : 407
+         * siteId : 209
+         * hxAccount : bff06f06ea094d158b599908296b0aa1
+         * accessToken : b1ac52a96ab34f76ac42c55073dc0cfa
+         * hxPwd : ADsj63J8
+         * token : a53723f05fdd4532843eb5a3c9048a06
+         */
+        private String accountId;
+        private String siteId;
+        private String hxAccount;
+        private String accessToken;
+        private String hxPwd;
+        private String token;
+        public String getAccountId() {
+            return accountId;
+        }
+        public void setAccountId(String accountId) {
+            this.accountId = accountId;
+        }
+        public String getSiteId() {
+            return siteId;
+        }
+        public void setSiteId(String siteId) {
+            this.siteId = siteId;
+        }
+        public String getHxAccount() {
+            return hxAccount;
+        }
+        public void setHxAccount(String hxAccount) {
+            this.hxAccount = hxAccount;
+        }
+        public String getAccessToken() {
+            return accessToken;
+        }
+        public void setAccessToken(String accessToken) {
+            this.accessToken = accessToken;
+        }
+        public String getHxPwd() {
+            return hxPwd;
+        }
+        public void setHxPwd(String hxPwd) {
+            this.hxPwd = hxPwd;
+        }
+        public String getToken() {
+            return token;
+        }
+        public void setToken(String token) {
+            this.token = token;
+        }
+    }
+}
--- a/app/src/main/java/com/dayu/bigfish/moudle/login/LoginPresenter.java
+++ b/app/src/main/java/com/dayu/bigfish/moudle/login/LoginPresenter.java
@@ -6,6 +6,7 @@ import android.widget.Button;
 import com.dayu.bigfish.Constants;
 import com.dayu.bigfish.base.BasePresenter;
 import com.dayu.bigfish.bean.LoginBean;
+import com.dayu.bigfish.bean.LoginTestBean;
 import com.dayu.bigfish.bean.RegisterBean;
 import com.dayu.bigfish.bean.UserInfo;
 import com.dayu.bigfish.managers.UserManager;
@@ -96,12 +97,21 @@ public class LoginPresenter extends BasePresenter<LoginView> {
                            return;
                        } else {
                            Gson gson = new Gson();
+                            //解析测试环境的bean
+                           // LoginTestBean loginTestBean = gson.fromJson(s, LoginTestBean.class);
+                            //解析正式环境的bean
                             LoginBean loginBean = gson.fromJson(s, LoginBean.class);
                           if (loginBean.getCode() == 0) {
                                mloginView.loginSuccess(loginBean);
                            }else if (loginBean.getCode()== 4){
                                mloginView.loginFailed("您还未通过审核,暂不能登录");
                            }
+                          /*  if (loginTestBean.getCode() == 0) {
+                                mloginView.loginSuccess(loginTestBean);
+                            }else if (loginTestBean.getCode()== 4){
+                                mloginView.loginFailed("您还未通过审核,暂不能登录");
+                            }*/
                        }
                    }

--- a/app/src/main/java/com/dayu/bigfish/moudle/login/LoginView.java
+++ b/app/src/main/java/com/dayu/bigfish/moudle/login/LoginView.java
 package com.dayu.bigfish.moudle.login;
 import com.dayu.bigfish.bean.LoginBean;
+import com.dayu.bigfish.bean.LoginTestBean;
 import com.dayu.bigfish.bean.RegisterBean;
 /**
@@ -10,8 +11,10 @@ import com.dayu.bigfish.bean.RegisterBean;
 public interface LoginView {
-    //登录成功的回调
+    //正式登录成功的回调
  void loginSuccess(LoginBean loginBean);
+    //测试登录成功的回调
+   // void loginSuccess(LoginTestBean loginTestBean);
    //登录失败的回调
    void loginFailed(String msg);
    //验证码发送成功的回调