common 1.6.8 登录方式调整

app/src/main/java/com/sobot/moduletest/MainActivity.java

@@ -219,7 +219,7 @@ public class MainActivity extends SobotBaseActivity {
         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", "zhengnw@zhichi.com", "znw123456", map1, new SobotResultBlock() {
 //            @Override
 //            public void resultBolok(SobotResultCode code, String msg, Object obj) {
@@ -227,7 +227,7 @@ public class MainActivity extends SobotBaseActivity {
 //                SobotLogUtils.i(SobotLoginTools.getInstance().getAccessToken() + "");
 //                SobotLogUtils.i(SobotLoginTools.getInstance().getTempId());
 //                SobotLogUtils.i(SobotLoginTools.getInstance().getToken() + "");
-////                SobotLoginTools.getInstance().logOut(MainActivity.this, "https://api-c.sobot.com/text", "zhengnw@zhichi.com", new SobotResultBlock() {
+////                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) {
 ////
@@ -236,15 +236,15 @@ public class MainActivity extends SobotBaseActivity {
 //            }
 //        });
 
-        SobotLoginTools.getInstance().loginWithAppkey(MainActivity.this, getSobotBaseContext(), true, "https://test-branche1.sobot.com/text", "https://test.sobot.com", "zhengnw@zhichi.com", "UaH4q8JHj708", "615abf5432134e4992d4da2ba6f460db", map1, new SobotResultBlock() {
-            @Override
-            public void resultBolok(SobotResultCode code, String msg, Object obj) {
-                SobotLoginTools.getInstance().checkExpiresToken();
-                SobotLogUtils.i(SobotLoginTools.getInstance().getAccessToken() + "");
-                SobotLogUtils.i(SobotLoginTools.getInstance().getTempId());
-                SobotLogUtils.i(SobotLoginTools.getInstance().getToken() + "");
-            }
-        });
+//        SobotLoginTools.getInstance().loginWithAppkey(MainActivity.this, getSobotBaseContext(), true, "https://test-branche1.sobot.com/text", "https://test-branche1.sobot.com", "zhengnw@zhichi.com", "UaH4q8JHj708", "615abf5432134e4992d4da2ba6f460db", map1, new SobotResultBlock() {
+//            @Override
+//            public void resultBolok(SobotResultCode code, String msg, Object obj) {
+//                SobotLoginTools.getInstance().checkExpiresToken();
+//                SobotLogUtils.i(SobotLoginTools.getInstance().getAccessToken() + "");
+//                SobotLogUtils.i(SobotLoginTools.getInstance().getTempId());
+//                SobotLogUtils.i(SobotLoginTools.getInstance().getToken() + "");
+//            }
+//        });
 
 
 //        LoginUserEntity sa=new LoginUserEntity();

sobot_common/build.gradle

@@ -11,7 +11,7 @@ android {
     //这里就是打jar包
     task makeJar(type: Copy) {
         //删除旧的jar包
-        delete 'build/libs/sobot_common_x_1.6.6.jar'
+        delete 'build/libs/sobot_common_x_1.6.8.jar'
         //原地址
         from('build/intermediates/packaged-classes/release/')
         //导出jar包的地址
@@ -19,7 +19,7 @@ android {
         //包含的jar包
         include('classes.jar')
         //重命名jar包为mysdk
-        rename ('classes.jar', 'sobot_common_x_1.6.6.jar')
+        rename ('classes.jar', 'sobot_common_x_1.6.8.jar')
     }
     makeJar.dependsOn(build)
 }

sobot_common/sobot-common-publish-mavencentral.gradle

@@ -12,12 +12,10 @@ task androidSourcesJar(type: Jar) {
 ext {
     PUBLISH_GROUP_ID = "com.sobot.library"        //项目包名
     PUBLISH_ARTIFACT_ID = 'sobotcommon_x'            //项目名
-    PUBLISH_VERSION = '1.6.6'                    //版本号
+    PUBLISH_VERSION = '1.6.8'                    //版本号
 }
 
 
-
-
 ext["signing.keyId"] = ''
 ext["signing.password"] = ''
 ext["signing.secretKeyRingFile"] = ''