Commit 4f0f3be1 authored by jianglx's avatar jianglx

添加Im密码请求端口

parent 20f2fc4e
......@@ -136,6 +136,10 @@ public class MainActivity extends BaseActivity<CommonPresenter> {
private ImService mService;
private String imToken;
private String imPassword;
private String[] permissions = new String[]{android.Manifest.permission.READ_PHONE_STATE, android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.WRITE_EXTERNAL_STORAGE, android.Manifest.permission.READ_EXTERNAL_STORAGE,
android.Manifest.permission.CAMERA, android.Manifest.permission.RECORD_AUDIO, Manifest.permission.CALL_PHONE};
......@@ -281,13 +285,9 @@ public class MainActivity extends BaseActivity<CommonPresenter> {
promotionDialog.show();
}
break;
case 3:
hasBindService = true;
DiscoveryIMTokenBean intokenBean = (DiscoveryIMTokenBean) result;
if (intokenBean != null) {
initIm(intokenBean.getData());
}
imToken = ((DiscoveryIMTokenBean) result).getData();
getImPassword();
break;
case 4:
......@@ -298,6 +298,12 @@ public class MainActivity extends BaseActivity<CommonPresenter> {
Cookie.save(getApplicationContext(), SPConstance.USER_JSON_TOKE_TIME, DateUtils.getCurDate());
}
break;
case 5:
imPassword = ((DiscoveryIMTokenBean) result).getData();
if (!TextUtils.isEmpty(imToken) && !TextUtils.isEmpty(imPassword)) {
initIm();
}
break;
default:
break;
}
......@@ -583,16 +589,17 @@ public class MainActivity extends BaseActivity<CommonPresenter> {
}
}
private void getImPassword() {
Map<String, Object> headMap = new LinkedHashMap<>();
headMap.put("Authorization", OkGoUtil.getToken());
mPresenter.getDataHead(RvFrameConfig.HOST, 5, ApiConfig.HTTP_URL_GET_PWD, DiscoveryIMTokenBean.class, headMap, false);
}
private void initIm(String imToken) {
//
ImSetting.setImConfig(Cookie.getStringValue(getApplicationContext(), SPConstance.USER_JSON_IMUSERID),
Cookie.getStringValue(getApplicationContext(), SPConstance.USER_JSON_NAME),
Md5Util.toMD5("aaaaa11111"), imToken);
// ImSetting.setImConfig(Cookie.getStringValue(getApplicationContext(), SPConstance.USER_JSON_IMUSERID),
// Cookie.getStringValue(getApplicationContext(), SPConstance.USER_JSON_NAME),
// "$2a$12$tclXJq1sHgnX0YZ5SMPXMOGVXXZR7IdcUKFOS3v3Hg103TwvOsNIG",imToken);
private void initIm() {
hasBindService = true;
ImSetting.setImConfig(Cookie.getStringValue(getApplicationContext(), SPConstance.USER_JSON_IMUSERID),
Cookie.getStringValue(getApplicationContext(), SPConstance.USER_JSON_NAME), imPassword, imToken);
Intent intent = new Intent(this, ImService.class);
bindService(intent, mConnection, BIND_AUTO_CREATE);
......
......@@ -150,4 +150,6 @@ public class ApiConfig {
* 获取新的token
*/
public static String HTTP_URL_GET_TOKEN_REFRESH = RvFrameConfig.HOST + "/api/auth/jwt/refresh";
public static String HTTP_URL_GET_PWD = RvFrameConfig.HOST + "/api/admin/app/user/im/getPwd";
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment