Skip to content

S
Sobot_module_Dev
Commit 173b3db7 by 郭倩芳
Options

common 1.7.7.2 登录接口添加：默认登录状态

parent d396b2a6
Showing with 108 additions and 8 deletions
app/src/main/java/com/sobot/moduletest/MainActivity.java
......@@ -5,13 +5,23 @@ import static com.sobot.widget.ui.SobotBaseConstant.REQUEST_CODE_PICTURE;
import android.app.Activity;
import android.content.Intent;
import android.graphics.Color;
import android.net.Uri;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
import androidx.annotation.NonNull;
//import com.sobot.album.Action;
//import com.sobot.album.AlbumFile;
//import com.sobot.album.SobotAlbum;
//import com.sobot.album.api.widget.Widget;
//import com.sobot.album.app.preview.PreviewAlbumActivity;
import com.sobot.common.login.SobotLoginTools;
import com.sobot.common.login.callback.SobotResultBlock;
import com.sobot.common.login.callback.SobotResultCode;
import com.sobot.common.login.model.SobotServiceInfoModel;
import com.sobot.common.utils.SobotImageUtils;
import com.sobot.network.http.log.SobotNetLogUtils;
import com.sobot.pictureframe.SobotBitmapUtil;
......@@ -29,6 +39,7 @@ import com.sobot.widget.ui.rich.HtmlToolUtils;
import com.sobot.widget.ui.toast.SobotToastUtil;
import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
......@@ -121,6 +132,8 @@ public class MainActivity extends SobotBaseActivity {
// selectPicFromLocal();
// selectVedioFromLocal();
// openCamera();
//预览
RefreshLayout refreshLayout = (RefreshLayout) findViewById(R.id.refreshLayout);
refreshLayout.setRefreshHeader(new ClassicsHeader(this));
......@@ -202,12 +215,17 @@ public class MainActivity extends SobotBaseActivity {
// }
// });
// }
Map<String, Object> map1 = new HashMap<>();
map1.put("from", 2 + "");
map1.put("way", "10");
map1.put("ack", "1");
map1.put("version", "3.3.1");
//日志测试
// StringBuilder stringBuilder = new StringBuilder();
// for (int i = 0; i < 100000; i++) {
// stringBuilder.append("asdfsadfas撒旦发射点发射点大师傅士大夫是地方撒旦发射点发射点发生地方撒地方士大夫撒旦飞洒地方是的asdfsadfas撒旦发射点发射点大师傅士大夫是地方撒旦发射点发射点发生地方撒地方士大夫撒旦飞洒地方是的asdfsadfas撒旦发射点发射点大师傅士大夫是地方撒旦发射点发射点发生地方撒地方士大夫撒旦飞洒地方是的asdfsadfas撒旦发射点发射点大师傅士大夫是地方撒旦发射点发射点发生地方撒地方士大夫撒旦飞洒地方是的asdfsadfas撒旦发射点发射点大师傅士大夫是地方撒旦发射点发射点发生地方撒地方士大夫撒旦飞洒地方是的asdfsadfas撒旦发射点发射点大师傅士大夫是地方撒旦发射点发射点发生地方撒地方士大夫撒旦飞洒地方是的asdfsadfas撒旦发射点发射点大师傅士大夫是地方撒旦发射点发射点发生地方撒地方士大夫撒旦飞洒地方是的asdfsadfas撒旦发射点发射点大师傅士大夫是地方撒旦发射点发射点发生地方撒地方士大夫撒旦飞洒地方是的asdfsadfas撒旦发射点发射点大师傅士大夫是地方撒旦发射点发射点发生地方撒地方士大夫撒旦飞洒地方是的asdfsadfas撒旦发射点发射点大师傅士大夫是地方撒旦发射点发射点发生地方撒地方士大夫撒旦飞洒地方是的asdfsadfas撒旦发射点发射点大师傅士大夫是地方撒旦发射点发射点发生地方撒地方士大夫撒旦飞洒地方是的asdfsadfas撒旦发射点发射点大师傅士大夫是地方撒旦发射点发射点发生地方撒地方士大夫撒旦飞洒地方是的asdfsadfas撒旦发射点发射点大师傅士大夫是地方撒旦发射点发射点发生地方撒地方士大夫撒旦飞洒地方是的");
// }
// SobotNetLogUtils.i(stringBuilder.toString());
// Map<String, Object> map1 = new HashMap<>();
// map1.put("from", 2 + "");
// map1.put("way", "10");
// map1.put("ack", "1");
// map1.put("version", "3.3.1");
// SobotLoginTools.getInstance().doLogin(MainActivity.this, getSobotBaseContext(), true, "https://test-branche1.sobot.com/text", "https://test-branche1.sobot.com/text", "zhangxy@zhichi.com", "app123456", map1, new SobotResultBlock() {
// @Override
// public void resultBolok(SobotResultCode code, String msg, Object obj) {
......@@ -216,6 +234,9 @@ public class MainActivity extends SobotBaseActivity {
// SobotLogUtils.i(SobotLoginTools.getInstance().getTempId());
// SobotLogUtils.i(SobotLoginTools.getInstance().getToken() + "");
// SobotLogUtils.i(SobotLoginTools.getInstance().getServiceInfo().getStatus() + "====登录状态======");
// if(obj instanceof SobotServiceInfoModel){
// SobotLogUtils.i("默认登录状态===="+((SobotServiceInfoModel)obj).getDefaultAppLoginStatus());
// }
//// SobotLoginTools.getInstance().logOut(MainActivity.this, "https://test-branche1.sobot.com/text", "zhengnw@zhichi.com", new SobotResultBlock() {
//// @Override
//// public void resultBolok(SobotResultCode code, String msg, Object obj) {
......@@ -275,9 +296,68 @@ public class MainActivity extends SobotBaseActivity {
// openAlbum();
// selectPicFromLocal();
// preview();
}
// private void openAlbum() {
// private void preview() {
// AlbumFile albumFile1 = new AlbumFile();
// albumFile1.setFileUrl("https://img-test.sobot.com/66a522ea3ef944a98af45bac09220861/console/ticket/1718874897522_1718874896631.jpg");
// albumFile1.setFileNumKey("a47ba821-f2b2-44cd-9431-7b41bddacca7");
// albumFile1.setChecked(true);
// albumFile1.setPath("/data/user/0/com.sobot.appsdk/cache/1718874897522.jpg");
// albumFile1.setMediaType(AlbumFile.TYPE_IMAGE);
// albumFile1.setSize(323035);
// albumFile1.setMimeType("image/jpeg");
// mAlbumFiles.add(albumFile1);
// AlbumFile albumFile2 = new AlbumFile();
// albumFile2.setFileUrl("https://img-test.sobot.com/66a522ea3ef944a98af45bac09220861/console/ticket/1718874897469_1718874896703.jpg");
// albumFile2.setFileNumKey("0b9f28ce-ac00-4dfa-858d-7bb2d5bca3af");
// albumFile2.setChecked(true);
// albumFile2.setPath("/data/user/0/com.sobot.appsdk/cache/1718874897469.jpg");
// albumFile2.setMediaType(AlbumFile.TYPE_IMAGE);
// albumFile2.setSize(508729);
// albumFile2.setMimeType("image/jpeg");
// mAlbumFiles.add(albumFile2);
// AlbumFile albumFile = new AlbumFile();
// albumFile.setFileUrl("https://img-test.sobot.com/66a522ea3ef944a98af45bac09220861/console/ticket/1718874897296_1718874896508.jpg");
// albumFile.setFileNumKey("5059b8d9-9e97-4e5f-ab01-bda8f61c0286");
// albumFile.setChecked(true);
// albumFile.setPath("/data/user/0/com.sobot.appsdk/cache/1718874897296.jpg");
// albumFile.setMediaType(AlbumFile.TYPE_IMAGE);
// albumFile.setSize(218603);
// albumFile.setMimeType("image/jpeg");
// mAlbumFiles.add(albumFile);
//// Intent intent = new Intent(MainActivity.this, PreviewAlbumActivity.class);
//// intent.putExtra("mAlbumFiles", mAlbumFiles);
//// startActivity(intent);
// SobotAlbum.preview(this)
// .checkedList(mAlbumFiles)
// .currentPosition(0)
// .widget(
// Widget.newLightBuilder(this)
// .toolBarColor(Color.WHITE)
// .statusBarColor(Color.WHITE)
// .mediaItemCheckSelector(Color.GREEN, Color.RED)
// .bucketItemCheckSelector(Color.GREEN, Color.RED)
// .buttonStyle(
// Widget.ButtonStyle.newLightBuilder(this)
// .setButtonSelector(Color.WHITE, Color.GRAY)
// .build()
// )
// .build()
// )
// .onResult(new Action<ArrayList<AlbumFile>>() {
// @Override
// public void onAction(@NonNull ArrayList<AlbumFile> result) {
// mAlbumFiles = result;
//// mAdapter.notifyDataSetChanged(mAlbumFiles);
//// mTvMessage.setVisibility(result.size() > 0 ? View.VISIBLE : View.GONE);
// }
// })
// .start();
// }
// private void openAlbum() {
// SobotAlbum.album(MainActivity.this)
// .multipleChoice()
// .columnCount(4)
......
sobot_common/sobot-common-publish-mavencentral.gradle
......@@ -12,7 +12,7 @@ task androidSourcesJar(type: Jar) {
ext {
PUBLISH_GROUP_ID = "com.sobot.library" //项目包名
PUBLISH_ARTIFACT_ID = 'sobotcommon_x' //项目名
PUBLISH_VERSION = '1.7.7.1' //版本号
PUBLISH_VERSION = '1.7.7.2' //版本号
}
......
sobot_common/src/main/java/com/sobot/common/login/SobotLoginTools.java
......@@ -889,6 +889,7 @@ public class SobotLoginTools {
tempServiceInfoModel.setTopFlag(userEntity.getTopFlag());
tempServiceInfoModel.setTransferAuditFlag(userEntity.getTransferAuditFlag());
tempServiceInfoModel.setSortFlag(userEntity.getSortFlag());
tempServiceInfoModel.setDefaultAppLoginStatus(userEntity.getDefaultAppLoginStatus());
setServiceInfo(tempServiceInfoModel);
SobotSharedPreferencesUtil.getInstance(context).put(SobotLoginConstant.SOBOT_LOGIN_USER_INFO, tempServiceInfoModel);
if (resultBlock != null) {
......
sobot_common/src/main/java/com/sobot/common/login/model/OnlineUserEntity.java
......@@ -24,6 +24,7 @@ public class OnlineUserEntity implements Serializable {
private String kbVersion;//智能回复，查询版本v6/v1
private String robotVersion;//机器人，查询版本v6/v1
private String onlineVersion;//在线，查询版本v6/v1
private String defaultAppLoginStatus;//登录的默认状态
@Expose
......@@ -153,4 +154,12 @@ public class OnlineUserEntity implements Serializable {
public void setStatusCode(int statusCode) {
this.statusCode = statusCode;
}
public String getDefaultAppLoginStatus() {
return defaultAppLoginStatus;
}
public void setDefaultAppLoginStatus(String defaultAppLoginStatus) {
this.defaultAppLoginStatus = defaultAppLoginStatus;
}
}
sobot_common/src/main/java/com/sobot/common/login/model/SobotServiceInfoModel.java
......@@ -119,6 +119,8 @@ public class SobotServiceInfoModel implements Serializable {
private long login_time;//登录时间戳
private String defaultAppLoginStatus;//默认登录状态
public static final String LOGIN_TIME = "login_time";
public String getCompanyName() {
......@@ -137,6 +139,14 @@ public class SobotServiceInfoModel implements Serializable {
this.accountStatus = accountStatus;
}
public String getDefaultAppLoginStatus() {
return defaultAppLoginStatus;
}
public void setDefaultAppLoginStatus(String defaultAppLoginStatus) {
this.defaultAppLoginStatus = defaultAppLoginStatus;
}
@Expose
@SerializedName("wslink.bak")
private List<String> wslinkBak;//通道地址
......
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