@@ -3,7 +3,7 @@ package cn.org.bjca.trust.android.lib.im; | |||||
import cn.org.bjca.trust.android.lib.im.kit.SdkInterface; | import cn.org.bjca.trust.android.lib.im.kit.SdkInterface; | ||||
import cn.org.bjca.trust.android.lib.im.manager.SZYXImManager; | import cn.org.bjca.trust.android.lib.im.manager.SZYXImManager; | ||||
public class SzyxPush { | |||||
public class SZYXImSdk { | |||||
private static final class SdkInterfaceHolder { | private static final class SdkInterfaceHolder { | ||||
static final SdkInterface instance = new SZYXImManager(); | static final SdkInterface instance = new SZYXImManager(); |
@@ -43,7 +43,7 @@ public class SZYXImManager implements SdkInterface { | |||||
public void login(String userID, String userSig, IMSDKCallback callback) { | public void login(String userID, String userSig, IMSDKCallback callback) { | ||||
Constant.setUserId(userID); | 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)) | |||||
.subscribeOn(Schedulers.io()) | .subscribeOn(Schedulers.io()) | ||||
.observeOn(AndroidSchedulers.mainThread()) | .observeOn(AndroidSchedulers.mainThread()) | ||||
.subscribe(httpResult -> { | .subscribe(httpResult -> { | ||||
@@ -5,15 +5,12 @@ import cn.org.bjca.trust.android.lib.im.db.device.DeviceEntity; | |||||
public class LoginData { | public class LoginData { | ||||
private String userId; | private String userId; | ||||
private String userSig; | private String userSig; | ||||
private DeviceEntity device; | |||||
public LoginData() { | public LoginData() { | ||||
} | } | ||||
public LoginData(String userId, String userSig, DeviceEntity device) { | |||||
public LoginData(String userId, String userSig) { | |||||
this.userId = userId; | this.userId = userId; | ||||
this.userSig = userSig; | this.userSig = userSig; | ||||
this.device = device; | |||||
} | } | ||||
public String getUserId() { | public String getUserId() { | ||||
@@ -31,12 +28,4 @@ public class LoginData { | |||||
public void setUserSig(String userSig) { | public void setUserSig(String userSig) { | ||||
this.userSig = userSig; | this.userSig = userSig; | ||||
} | } | ||||
public DeviceEntity getDevice() { | |||||
return device; | |||||
} | |||||
public void setDevice(DeviceEntity device) { | |||||
this.device = device; | |||||
} | |||||
} | } |
@@ -2,7 +2,7 @@ package cn.org.bjca.trust.android.imdemo; | |||||
import android.app.Application; | import android.app.Application; | ||||
import cn.org.bjca.trust.android.lib.im.SzyxPush; | |||||
import cn.org.bjca.trust.android.lib.im.SZYXImSdk; | |||||
import cn.org.bjca.trust.android.lib.im.bean.IMUserFullInfo; | import cn.org.bjca.trust.android.lib.im.bean.IMUserFullInfo; | ||||
import cn.org.bjca.trust.android.lib.im.kit.IMSDKCallback; | import cn.org.bjca.trust.android.lib.im.kit.IMSDKCallback; | ||||
import cn.org.bjca.trust.android.lib.im.kit.IMSDKListener; | import cn.org.bjca.trust.android.lib.im.kit.IMSDKListener; | ||||
@@ -11,7 +11,7 @@ public class MyApplication extends Application { | |||||
@Override | @Override | ||||
public void onCreate() { | public void onCreate() { | ||||
super.onCreate(); | super.onCreate(); | ||||
SzyxPush.getInstance().addIMSDKListener(new IMSDKListener() { | |||||
SZYXImSdk.getInstance().addIMSDKListener(new IMSDKListener() { | |||||
@Override | @Override | ||||
public void onConnecting() { | public void onConnecting() { | ||||
@@ -37,7 +37,7 @@ public class MyApplication extends Application { | |||||
} | } | ||||
}); | }); | ||||
SzyxPush.getInstance().init(this, "202305161853245", new IMSDKCallback() { | |||||
SZYXImSdk.getInstance().init(this, "202305161853245", new IMSDKCallback() { | |||||
@Override | @Override | ||||
public void success() { | public void success() { | ||||
@@ -22,7 +22,7 @@ import androidx.lifecycle.ViewModelProvider; | |||||
import cn.org.bjca.trust.android.imdemo.MainActivity; | import cn.org.bjca.trust.android.imdemo.MainActivity; | ||||
import cn.org.bjca.trust.android.imdemo.databinding.ActivityLoginBinding; | import cn.org.bjca.trust.android.imdemo.databinding.ActivityLoginBinding; | ||||
import cn.org.bjca.trust.android.lib.im.SzyxPush; | |||||
import cn.org.bjca.trust.android.lib.im.SZYXImSdk; | |||||
import cn.org.bjca.trust.android.lib.im.kit.IMSDKCallback; | import cn.org.bjca.trust.android.lib.im.kit.IMSDKCallback; | ||||
public class LoginActivity extends AppCompatActivity { | public class LoginActivity extends AppCompatActivity { | ||||
@@ -123,7 +123,7 @@ public class LoginActivity extends AppCompatActivity { | |||||
} | } | ||||
private void updateUiWithUser(LoggedInUserView model) { | private void updateUiWithUser(LoggedInUserView model) { | ||||
SzyxPush.getInstance().login(model.getDisplayName().getUserId(), model.getDisplayName().getUserSig(), new IMSDKCallback() { | |||||
SZYXImSdk.getInstance().login(model.getDisplayName().getUserId(), model.getDisplayName().getUserSig(), new IMSDKCallback() { | |||||
@Override | @Override | ||||
public void success() { | public void success() { | ||||