From fd35c04b1e66a0405638dddd685e3aecdf061f90 Mon Sep 17 00:00:00 2001 From: xuqm Date: Wed, 17 May 2023 19:36:13 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E8=8E=B7=E5=8F=96=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/org/bjca/trust/android/lib/im/cfg/Constant.java | 9 +++++++++ .../trust/android/lib/im/http/HeaderInterceptor.java | 1 + .../bjca/trust/android/lib/im/manager/SZYXImManager.java | 2 +- .../trust/android/imdemo/ui/login/LoginActivity.java | 4 ++++ 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/cfg/Constant.java b/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/cfg/Constant.java index 5e7fb73..c0b3f76 100644 --- a/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/cfg/Constant.java +++ b/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/cfg/Constant.java @@ -4,6 +4,7 @@ public class Constant { public static final String BaseUrl = "https://221n3i2201.goho.co"; private static String sdkAppID; + private static String userId; public static void setSdkAppID(String sdkAppID) { Constant.sdkAppID = sdkAppID; @@ -12,4 +13,12 @@ public class Constant { public static String getSdkAppID() { return sdkAppID; } + + public static String getUserId() { + return userId; + } + + public static void setUserId(String userId) { + Constant.userId = userId; + } } diff --git a/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/http/HeaderInterceptor.java b/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/http/HeaderInterceptor.java index ffb8105..4363942 100644 --- a/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/http/HeaderInterceptor.java +++ b/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/http/HeaderInterceptor.java @@ -16,6 +16,7 @@ public class HeaderInterceptor implements Interceptor { return chain.proceed(chain.request().newBuilder() .header("AppID", Constant.getSdkAppID()) + .header("UserId", Constant.getUserId()) .addHeader("Version", BuildConfig.versionName) .addHeader("OsType", "1") .build()); diff --git a/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/manager/SZYXImManager.java b/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/manager/SZYXImManager.java index 107b771..93be694 100644 --- a/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/manager/SZYXImManager.java +++ b/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/manager/SZYXImManager.java @@ -41,7 +41,7 @@ public class SZYXImManager implements SdkInterface { @Override public void login(String userID, String userSig, IMSDKCallback callback) { - + Constant.setUserId(userID); Disposable d = HttpManage.getApi(Service.class) .login(new LoginData(userID, userSig, DeviceHelper.getDevice())) .subscribeOn(Schedulers.io()) diff --git a/app/src/main/java/cn/org/bjca/trust/android/imdemo/ui/login/LoginActivity.java b/app/src/main/java/cn/org/bjca/trust/android/imdemo/ui/login/LoginActivity.java index 680fa4b..0da36a2 100644 --- a/app/src/main/java/cn/org/bjca/trust/android/imdemo/ui/login/LoginActivity.java +++ b/app/src/main/java/cn/org/bjca/trust/android/imdemo/ui/login/LoginActivity.java @@ -116,6 +116,10 @@ public class LoginActivity extends AppCompatActivity { passwordEditText.getText().toString()); } }); + + loadingProgressBar.setVisibility(View.VISIBLE); + loginViewModel.login(usernameEditText.getText().toString(), + passwordEditText.getText().toString()); } private void updateUiWithUser(LoggedInUserView model) {