@@ -4,6 +4,7 @@ public class Constant { | |||||
public static final String BaseUrl = "https://221n3i2201.goho.co"; | public static final String BaseUrl = "https://221n3i2201.goho.co"; | ||||
private static String sdkAppID; | private static String sdkAppID; | ||||
private static String userId; | |||||
public static void setSdkAppID(String sdkAppID) { | public static void setSdkAppID(String sdkAppID) { | ||||
Constant.sdkAppID = sdkAppID; | Constant.sdkAppID = sdkAppID; | ||||
@@ -12,4 +13,12 @@ public class Constant { | |||||
public static String getSdkAppID() { | public static String getSdkAppID() { | ||||
return sdkAppID; | return sdkAppID; | ||||
} | } | ||||
public static String getUserId() { | |||||
return userId; | |||||
} | |||||
public static void setUserId(String userId) { | |||||
Constant.userId = userId; | |||||
} | |||||
} | } |
@@ -16,6 +16,7 @@ public class HeaderInterceptor implements Interceptor { | |||||
return chain.proceed(chain.request().newBuilder() | return chain.proceed(chain.request().newBuilder() | ||||
.header("AppID", Constant.getSdkAppID()) | .header("AppID", Constant.getSdkAppID()) | ||||
.header("UserId", Constant.getUserId()) | |||||
.addHeader("Version", BuildConfig.versionName) | .addHeader("Version", BuildConfig.versionName) | ||||
.addHeader("OsType", "1") | .addHeader("OsType", "1") | ||||
.build()); | .build()); | ||||
@@ -41,7 +41,7 @@ public class SZYXImManager implements SdkInterface { | |||||
@Override | @Override | ||||
public void login(String userID, String userSig, IMSDKCallback callback) { | public void login(String userID, String userSig, IMSDKCallback callback) { | ||||
Constant.setUserId(userID); | |||||
Disposable d = HttpManage.getApi(Service.class) | Disposable d = HttpManage.getApi(Service.class) | ||||
.login(new LoginData(userID, userSig, DeviceHelper.getDevice())) | .login(new LoginData(userID, userSig, DeviceHelper.getDevice())) | ||||
.subscribeOn(Schedulers.io()) | .subscribeOn(Schedulers.io()) | ||||
@@ -116,6 +116,10 @@ public class LoginActivity extends AppCompatActivity { | |||||
passwordEditText.getText().toString()); | passwordEditText.getText().toString()); | ||||
} | } | ||||
}); | }); | ||||
loadingProgressBar.setVisibility(View.VISIBLE); | |||||
loginViewModel.login(usernameEditText.getText().toString(), | |||||
passwordEditText.getText().toString()); | |||||
} | } | ||||
private void updateUiWithUser(LoggedInUserView model) { | private void updateUiWithUser(LoggedInUserView model) { | ||||