From d8f80ad07d136cc069d5c7bdd2bc3e15b2ef055b Mon Sep 17 00:00:00 2001 From: lijia Date: Tue, 26 Nov 2024 11:01:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E8=B7=AF=E4=BA=A4=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../arpa/hndahesudintocctmsdriver/cuspop/MessagePop.kt | 8 ++++---- .../request/net/BaseObserver.java | 2 +- .../request/net/RxHttpCallBack.java | 2 +- .../hndahesudintocctmsdriver/ui/login/LoginActivity.java | 3 +++ .../arpa/hndahesudintocctmsdriver/ui/my/MyFragment.java | 1 - .../java/com/dahe/mylibrary/net/CommonResponseBean.java | 6 +++--- 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/cuspop/MessagePop.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/cuspop/MessagePop.kt index f6949bb..56165aa 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/cuspop/MessagePop.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/cuspop/MessagePop.kt @@ -55,15 +55,15 @@ class MessagePop(context: Context) : CenterPopupView(context), View.OnClickListe } R.id.tvOk,R.id.tvPhone -> { dismiss() - if (XPermission.create(context).isGranted(Manifest.permission.CALL_PHONE)){ +// if (XPermission.create(context).isGranted(Manifest.permission.CALL_PHONE)){ val toString = tvPhone.text.toString() val intent = Intent(Intent.ACTION_DIAL) val data = Uri.parse("tel:$toString") intent.data = data context.startActivity(intent) - }else{ - ToastUtils.showToast(context,"请开启电话权限") - } +// }else{ +// ToastUtils.showToast(context,"请开启电话权限") +// } // BaseUtils.callPhone(content as Activity, tvPhone.text.toString()) } diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/net/BaseObserver.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/net/BaseObserver.java index db75429..2ae591a 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/net/BaseObserver.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/net/BaseObserver.java @@ -37,7 +37,7 @@ public class BaseObserver implements Observer> { @Override public void onNext(CommonResponseBean tCommonResponseBean) { - if (0==tCommonResponseBean.getCode()) { + if ("0".equals(tCommonResponseBean.getCode())) { mRxHttpCallBack.onSuccess(tCommonResponseBean); } else { mRxHttpCallBack.onCodeError(mContext, tCommonResponseBean); diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/net/RxHttpCallBack.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/net/RxHttpCallBack.java index d126c97..1af45f7 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/net/RxHttpCallBack.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/net/RxHttpCallBack.java @@ -86,7 +86,7 @@ public abstract class RxHttpCallBack { dialog.dismiss(); } - if (t.getCode() == 401) { + if (t.getCode() == "401") { UiAuxiliary.delLogin(mContext); Intent intent = new Intent(mContext, MainActivity.class); intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/login/LoginActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/login/LoginActivity.java index 989f3c9..c559a1b 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/login/LoginActivity.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/login/LoginActivity.java @@ -32,6 +32,7 @@ import com.arpa.hndahesudintocctmsdriver.request.net.BaseObserver; import com.arpa.hndahesudintocctmsdriver.request.net.DataManager; import com.arpa.hndahesudintocctmsdriver.request.net.RxHttpCallBack; import com.arpa.hndahesudintocctmsdriver.ui.web.WebOnlyOneActivity; +import com.arpa.hndahesudintocctmsdriver.util.NewLJUtils; import com.dahe.mylibrary.net.CommonResponseBean; import com.google.gson.Gson; import com.arpa.hndahesudintocctmsdriver.R; @@ -100,6 +101,8 @@ public class LoginActivity extends BaseActivity { Log.e("--登录信息--", new Gson().toJson(loginBean)); AppInfoBean appInfoBean = new AppInfoBean(); if (loginBean.getCode() == 200) { + //获取新路交token + NewLJUtils.getInstance().getToken(con); SPUtil.insSP(con, USER, USER_TOKEN, loginBean.getData().getToken()); SPUtil.insSP(con, USER, USER_UNAME, loginBean.getData().getUname()); SPUtil.insSP(con, USER, USER_RNAME, loginBean.getData().getRname()); diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/my/MyFragment.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/my/MyFragment.java index 06f3ae6..4b7f484 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/my/MyFragment.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/my/MyFragment.java @@ -236,7 +236,6 @@ public class MyFragment extends BaseFragment { }); //联系我们 onContact.setOnClickListener(v -> { - NewLJUtils.getInstance().getToken(con); String serviceMobile = ""; if (ConfigParts.getConfigParts(con) != null) { serviceMobile = ConfigParts.getConfigParts(con).getData().getServiceMobile(); diff --git a/mylibrary/src/main/java/com/dahe/mylibrary/net/CommonResponseBean.java b/mylibrary/src/main/java/com/dahe/mylibrary/net/CommonResponseBean.java index 17bc013..f98a9d3 100644 --- a/mylibrary/src/main/java/com/dahe/mylibrary/net/CommonResponseBean.java +++ b/mylibrary/src/main/java/com/dahe/mylibrary/net/CommonResponseBean.java @@ -8,7 +8,7 @@ import java.io.Serializable; public class CommonResponseBean implements Serializable { private T data; - private int code; + private String code; private String info; private String msg; private String message; @@ -59,11 +59,11 @@ public class CommonResponseBean implements Serializable { this.data = data; } - public int getCode() { + public String getCode() { return code; } - public void setCode(int code) { + public void setCode(String code) { this.code = code; }