v1.0.0开发：缓存用户信息修改为mmkv

demo/src/main/assets/yyxx_game/yyxx_cfg.properties

@@ -1,7 +1,7 @@
 #出包版本
-YYXX_GCP_CODE=20201010
+YYXX_GCP_CODE=G010101
 #分包标识
-YYXX_GAME_CODE=9y12un3y
+YYXX_GAME_CODE=100001
 # 事件打点应用ID
 YYXX_ADJUST_APP_ID=3lb7knrx3yww
 # 事件打点开关,没配置的情况下默认开启（true）

demo/src/main/java/com/yyxxgame/columbus/DemoActivity.kt

@@ -9,9 +9,7 @@ import android.view.View
 import android.widget.*
 import cn.yyxx.columbus.base.Columbus
 import cn.yyxx.columbus.base.internal.ICallback
-import cn.yyxx.columbus.core.entity.LoginType
-import cn.yyxx.columbus.core.entity.Session
-import cn.yyxx.columbus.core.utils.SessionUtils
+import cn.yyxx.support.hawkeye.LogUtils
 
 
 /**
@@ -53,11 +51,12 @@ class DemoActivity : Activity(), View.OnClickListener {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        initView()
+        LogUtils.handler = handler
         Columbus.getInstance().initialize(this, false, object : ICallback {
             override fun onResult(code: Int, result: String) {
             }
         })
-        initView()
     }
 
     private fun initView() {
@@ -69,8 +68,6 @@ class DemoActivity : Activity(), View.OnClickListener {
             text = ""
             this@DemoActivity.layout.addView(this)
         }
-//        val spinner = YSpinner(this)
-//        layout.addView(spinner)
         val scrollView = ScrollView(this)
         scrollView.addView(layout)
         setContentView(scrollView)
@@ -90,26 +87,9 @@ class DemoActivity : Activity(), View.OnClickListener {
     }
 
 
-//    fun hex2bytes(src: String): ByteArray {
-//        val len = src.length / 2
-//        val ret = ByteArray(len)
-//        for (i in 0 until len) {
-//            ret[i] = (src.substring(i * 2, i * 2 + 2) as Int).toByte()
-//        }
-//    }
-//    public static byte[] hexString2Bytes(String src)
-//    {
-//        int l = src . length () / 2;
-//        byte[] ret = new byte[l];
-//        for (int i = 0; i < l; i++) {
-//        ret[i] = Integer.valueOf(src.substring(i * 2, i * 2 + 2), 16).byteValue();
-//    }
-//        return ret;
-//    }
-
-
     override fun onClick(v: View?) {
         v?.apply {
+            mTextView.text = ""
             when (tag as Int) {
                 0 -> EnvActivity.start(this@DemoActivity)
                 1 -> {
@@ -120,41 +100,16 @@ class DemoActivity : Activity(), View.OnClickListener {
                     })
                 }
                 2 -> {
-
-
-                }
-                3 -> {
-
-
-                }
-                7 -> {
-                    val uids = arrayListOf("uid1000", "uid1001", "uid1002", "uid1003", "uid1004")
-                    uids.forEach {
-                        val session = Session()
-                        session.userId = it
-                        session.userName = "test$it"
-                        session.pwd = "test$it"
-                        session.loginType = LoginType.TYPE_ACCOUNT_LOGIN
-                        SessionUtils.getInstance().saveSession(this@DemoActivity, session)
-                    }
-                }
-                8 -> {
-                    val session = Session()
-                    session.userId = "uid1005"
-                    session.loginType = LoginType.TYPE_GUEST_LOGIN
-                    SessionUtils.getInstance().saveSession(this@DemoActivity, session)
-                }
-                9 -> {
-                    val session = Session()
-                    session.userId = "uid1006"
-                    session.loginType = LoginType.TYPE_FACEBOOK_LOGIN
-                    SessionUtils.getInstance().saveSession(this@DemoActivity, session)
-                }
-                10 -> {
-                    val session = Session()
-                    session.userId = "uid1007"
-                    session.loginType = LoginType.TYPE_GOOGLE_LOGIN
-                    SessionUtils.getInstance().saveSession(this@DemoActivity, session)
+                    Columbus.getInstance().logout(this@DemoActivity, object : ICallback {
+                        override fun onResult(code: Int, result: String) {
+                            if (code == 0) {
+                                Columbus.getInstance().login(this@DemoActivity, false, object : ICallback {
+                                    override fun onResult(code: Int, result: String) {
+                                    }
+                                })
+                            }
+                        }
+                    })
                 }
             }
         }

library_base/proguard-rules.pro

@@ -18,4 +18,124 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+
+# 代码混淆压缩比，在0~7之间，默认为5，一般不做修改
+-optimizationpasses 7
+# 混合时不使用大小写混合，混合后的类名为小写
+-dontusemixedcaseclassnames
+# 指定不去忽略非公共库的类
+-dontskipnonpubliclibraryclasses
+-dontoptimize
+# 这句话能够使我们的项目混淆后产生映射文件
+# 包含有类名->混淆后类名的映射关系
+-verbose
+-ignorewarnings
+# 指定不去忽略非公共库的类成员
+-dontskipnonpubliclibraryclassmembers
+# 指定混淆是采用的算法，后面的参数是一个过滤器
+# 这个过滤器是谷歌推荐的算法，一般不做更改
+-optimizations !code/simplification/arithmetic,!field/*,!class/merging/*
+
+# 保留java与js交互注解
+-keepattributes *Annotation*
+-keepattributes *JavascriptInterface*
+
+# 保留内部类
+-keepattributes Exceptions,InnerClasses
+
+# 保留泛型
+-keepattributes Signature
+
+-keep class kotlin.** { *; }
+-keep class kotlin.Metadata { *; }
+-dontwarn kotlin.**
+-keepclassmembers class **$WhenMappings {
+    <fields>;
+}
+-keepclassmembers class kotlin.Metadata {
+    public <methods>;
+}
+-assumenosideeffects class kotlin.jvm.internal.Intrinsics {
+    static void checkParameterIsNotNull(java.lang.Object, java.lang.String);
+}
+
+-keepnames class * implements java.io.Serializable
+
+-keepclassmembers class * implements java.io.Serializable {
+   static final long serialVersionUID;
+   private static final java.io.ObjectStreamField[] serialPersistentFields;
+   !static !transient <fields>;
+   private void writeObject(java.io.ObjectOutputStream);
+   private void readObject(java.io.ObjectInputStream);
+   java.lang.Object writeReplace();
+   java.lang.Object readResolve();
+}
+
+-keepclassmembers class **.R$* {
+    public static <fields>;
+}
+-keep class **.R$* {
+ *;
+}
+
+-keep public class * extends android.app.Activity{
+	public <fields>;
+	public <methods>;
+}
+-keep public class * extends android.app.Application{
+	public <fields>;
+	public <methods>;
+}
+-keep public class * extends android.app.Service
+-keep public class * extends android.content.BroadcastReceiver
+-keep public class * extends android.content.ContentProvider
+-keep public class * extends android.app.backup.BackupAgentHelper
+-keep public class * extends android.preference.Preference
+-keep public class * extends androidx.core.app.CoreComponentFactory
+
+
+-keepclassmembers enum * {
+    public static **[] values();
+    public static ** valueOf(java.lang.String);
+}
+
+-keepclasseswithmembers class * {
+	public <init>(android.content.Context, android.util.AttributeSet);
+}
+
+-keepclasseswithmembers class * {
+	public <init>(android.content.Context, android.util.AttributeSet, int);
+}
+
+-keepclasseswithmembernames class *{
+	native <methods>;
+}
+
+-keep class * implements android.os.Parcelable {
+  public static final android.os.Parcelable$Creator *;
+}
+
+-keepclasseswithmembers class * {
+    ... *JNI*(...);
+}
+
+-keepclasseswithmembernames class * {
+	... *JRI*(...);
+}
+
+-keep class **JNI* {*;}
+
+
+-keep class cn.yyxx.support.**{*;}
+-keep class cn.yyxx.columbus.base.entity.SdkChargeInfo{public <fields>; public <methods>;}
+-keep class cn.yyxx.columbus.base.entity.SdkRoleInfo{public <fields>; public <methods>;}
+-keep class cn.yyxx.columbus.base.internal.ICallback{public <fields>; public <methods>;}
+-keep class cn.yyxx.columbus.base.utils.Logger{public <fields>; public <methods>;}
+-keep class cn.yyxx.columbus.base.utils.ParamsUtils{public <fields>; public <methods>;}
+-keep class cn.yyxx.columbus.base.Columbus{public <fields>; public <methods>;}
+-keep class cn.yyxx.columbus.base.ColumbusApplication{public <fields>; public <methods>;}
+-keep class cn.yyxx.columbus.Version{public <fields>; public <methods>;}
+
+
+

library_core/build.gradle

@@ -12,12 +12,12 @@ android {
         minSdkVersion MIN_SDK_VERSION
         targetSdkVersion TARGET_SDK_VERSION
 
-        externalNativeBuild {
-            cmake {
-                cppFlags '-std=c++11 -frtti -fexceptions -lz'
-//                abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
-            }
-        }
+//        externalNativeBuild {
+//            cmake {
+//                cppFlags '-std=c++11 -frtti -fexceptions -lz'
+////                abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
+//            }
+//        }
 
         ndk {
             // 设置支持的SO库架构
@@ -55,24 +55,26 @@ android {
 //        kotlinOptions.freeCompilerArgs += ['-module-name', "cn.yyxx.columbus.core"]
 //    }
 
-    externalNativeBuild {
-        cmake {
-            path "CMakeLists.txt"
-        }
-    }
+//    externalNativeBuild {
+//        cmake {
+//            path "CMakeLists.txt"
+//        }
+//    }
 
     ndkVersion NDK_VERSION
 }
 
 dependencies {
-    implementation 'androidx.core:core-ktx:1.3.2'
-    implementation 'androidx.fragment:fragment-ktx:1.3.2'
+
+    api files('../libs/mmkv-static-1.2.8.jar')
+    implementation 'androidx.core:core-ktx:1.5.0'
+    implementation 'androidx.fragment:fragment-ktx:1.3.5'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'com.google.android.material:material:1.3.0'
 
     implementation 'com.google.android.play:core:1.10.0'
     implementation 'com.google.android.gms:play-services-auth:19.0.0'
-    implementation 'com.android.billingclient:billing-ktx:3.0.3'
+    implementation 'com.android.billingclient:billing-ktx:4.0.0'
 
 
     implementation 'com.facebook.android:facebook-login:9.0.0'

library_core/proguard-rules.pro

@@ -18,4 +18,121 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+
+# 代码混淆压缩比，在0~7之间，默认为5，一般不做修改
+-optimizationpasses 7
+# 混合时不使用大小写混合，混合后的类名为小写
+-dontusemixedcaseclassnames
+# 指定不去忽略非公共库的类
+-dontskipnonpubliclibraryclasses
+-dontoptimize
+# 这句话能够使我们的项目混淆后产生映射文件
+# 包含有类名->混淆后类名的映射关系
+-verbose
+-ignorewarnings
+# 指定不去忽略非公共库的类成员
+-dontskipnonpubliclibraryclassmembers
+# 指定混淆是采用的算法，后面的参数是一个过滤器
+# 这个过滤器是谷歌推荐的算法，一般不做更改
+-optimizations !code/simplification/arithmetic,!field/*,!class/merging/*
+
+# 保留java与js交互注解
+-keepattributes *Annotation*
+-keepattributes *JavascriptInterface*
+
+# 保留内部类
+-keepattributes Exceptions,InnerClasses
+
+# 保留泛型
+-keepattributes Signature
+
+-keep class kotlin.** { *; }
+-keep class kotlin.Metadata { *; }
+-dontwarn kotlin.**
+-keepclassmembers class **$WhenMappings {
+    <fields>;
+}
+-keepclassmembers class kotlin.Metadata {
+    public <methods>;
+}
+-assumenosideeffects class kotlin.jvm.internal.Intrinsics {
+    static void checkParameterIsNotNull(java.lang.Object, java.lang.String);
+}
+
+-keepnames class * implements java.io.Serializable
+
+-keepclassmembers class * implements java.io.Serializable {
+   static final long serialVersionUID;
+   private static final java.io.ObjectStreamField[] serialPersistentFields;
+   !static !transient <fields>;
+   private void writeObject(java.io.ObjectOutputStream);
+   private void readObject(java.io.ObjectInputStream);
+   java.lang.Object writeReplace();
+   java.lang.Object readResolve();
+}
+
+-keepclassmembers class **.R$* {
+    public static <fields>;
+}
+-keep class **.R$* {
+ *;
+}
+
+-keep public class * extends android.app.Activity{
+	public <fields>;
+	public <methods>;
+}
+-keep public class * extends android.app.Application{
+	public <fields>;
+	public <methods>;
+}
+-keep public class * extends android.app.Service
+-keep public class * extends android.content.BroadcastReceiver
+-keep public class * extends android.content.ContentProvider
+-keep public class * extends android.app.backup.BackupAgentHelper
+-keep public class * extends android.preference.Preference
+-keep public class * extends androidx.core.app.CoreComponentFactory
+
+
+-keepclassmembers enum * {
+    public static **[] values();
+    public static ** valueOf(java.lang.String);
+}
+
+-keepclasseswithmembers class * {
+	public <init>(android.content.Context, android.util.AttributeSet);
+}
+
+-keepclasseswithmembers class * {
+	public <init>(android.content.Context, android.util.AttributeSet, int);
+}
+
+-keepclasseswithmembernames class *{
+	native <methods>;
+}
+
+-keep class * implements android.os.Parcelable {
+  public static final android.os.Parcelable$Creator *;
+}
+
+-keepclasseswithmembers class * {
+    ... *JNI*(...);
+}
+
+-keepclasseswithmembernames class * {
+	... *JRI*(...);
+}
+
+-keep class **JNI* {*;}
+
+
+-keep class com.tencent.mmkv.**{*;}
+-keep class cn.yyxx.support.**{*;}
+-keep class cn.yyxx.columbus.base.**{*;}
+-keep class cn.yyxx.columbus.core.SdkBridge{public <fields>; public <methods>;}
+-keep class cn.yyxx.columbus.core.impl.SdkDrive{public <fields>; public <methods>;}
+
+
+
+

library_core/src/main/cpp/aes_utils.cpp

@@ -5,6 +5,7 @@
 #include <hex_utils.h>
 #include <logger.h>
 #include <base64_utils.h>
+#include <toolkit.h>
 #include "include/aes/aes_utils.h"
 
 static const unsigned char HEX[16] = {0x10, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f};
@@ -65,6 +66,15 @@ void AesUtils::RemovePadding(uint8_t *out, size_t length) {
     }
 }
 
+char *AesUtils::GetRawKey() {
+    uint8_t *random_key = GetKey();
+    time_t ts = time(nullptr);
+    char *key = static_cast<char *>(malloc(33));
+    sprintf(key, "%ld%s", ts, random_key);
+    key[33] = '\0';
+    return key;
+}
+
 uint8_t *AesUtils::GetKey() {
     const int len = 16;
     auto *key = static_cast<uint8_t *>(malloc(len + 1));
@@ -85,6 +95,16 @@ uint8_t *AesUtils::GetIv(const uint8_t *key) {
     return iv;
 }
 
+char *AesUtils::GetIv32(const char *key) {
+    const int len = 32;
+    auto *iv = static_cast<char *>(malloc(len + 1));
+    for (int i = 0; i < len; i++) {
+        iv[i] = key[len - (i + 1)];
+    }
+    iv[len] = '\0';
+    return iv;
+}
+
 /**
  * AES加密, CBC, PKCS5Padding
  */
@@ -131,3 +151,36 @@ char *AesUtils::Decrypt(const char *input, const uint8_t *key) {
 
     return (char *) src;
 }
+
+std::string AesUtils::Decrypt2(JNIEnv *env, const std::string &key, const std::string &enc) {
+    jclass clz = env->FindClass("cn/yyxx/support/encryption/aes/AesUtils");
+    if (clz == nullptr) {
+        LOGE("aes impl clz is nullptr !!!");
+        return "";
+    }
+    const char *method_name = "decrypt";
+    const char *sig = "(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;";
+    jmethodID jmethod_id = env->GetStaticMethodID(clz, method_name, sig);
+    jstring jkey = env->NewStringUTF(key.c_str());
+    jstring jraw = env->NewStringUTF(enc.c_str());
+    jstring jresult = (jstring) env->CallStaticObjectMethod(clz, jmethod_id, jkey, jraw);
+    return ToolKit::JString2String(env, jresult);
+}
+
+std::string AesUtils::Encrypt2(JNIEnv *env, const std::string &key, const std::string &raw) {
+    jclass clz = env->FindClass("cn/yyxx/support/encryption/aes/AesUtils");
+    if (clz == nullptr) {
+        LOGE("aes impl clz is nullptr !!!");
+        return "";
+    }
+    const char *method_name = "encrypt";
+    const char *sig = "(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;";
+    jmethodID jmethod_id = env->GetStaticMethodID(clz, method_name, sig);
+    jstring jkey = env->NewStringUTF(key.c_str());
+    jstring jraw = env->NewStringUTF(raw.c_str());
+    jstring jresult = (jstring) env->CallStaticObjectMethod(clz, jmethod_id, jkey, jraw);
+    return ToolKit::JString2String(env, jresult);
+}
+
+
+

library_core/src/main/cpp/comm_map.cpp

@@ -24,8 +24,7 @@ void CommMap::Init(JNIEnv *env, jobject context) {
     //vers
     comm_params["server_version"] = ToolKit::GetServerVersion(env);
     comm_params["client_version"] = ToolKit::GetClientVersion(env);
-    comm_params["game_version_code"] = ToolKit::GetVersionCode(env, context);
-    comm_params["game_version_name"] = ToolKit::GetVersionName(env, context);
+    comm_params["game_version"] = ToolKit::GetVersionName(env, context);
 
     //device
     if (ToolKit::IsEmulator(env, context)) {
@@ -38,8 +37,8 @@ void CommMap::Init(JNIEnv *env, jobject context) {
     comm_params["network"] = ToolKit::GetNetworkType(env, context);
     comm_params["os"] = "android";
     comm_params["os_version"] = ToolKit::GetDeviceSoftwareVersion();
-    comm_params["model"] = ToolKit::GetDeviceModel();
-    comm_params["mfrs"] = ToolKit::GetDeviceManufacturer();
+    comm_params["mobile_model"] = ToolKit::GetDeviceModel();
+    comm_params["mobile_mfrs"] = ToolKit::GetDeviceManufacturer();
     comm_params["mobile_brand"] = ToolKit::GetMobileBrand();
 }
 

library_core/src/main/cpp/include/aes/aes_utils.h

@@ -17,14 +17,25 @@ class AesUtils {
 public:
     static uint8_t *GetKey();
 
+    static char *GetRawKey();
+
+
     static uint8_t *GetIv(const uint8_t *key);
 
+    static char *GetIv32(const char *key);
+
+
     /** AES加密, CBC, PKCS5Padding */
-    static char *Encrypt(const char *input,const uint8_t *key);
+    static char *Encrypt(const char *input, const uint8_t *key);
 
     /** AES解密, CBC, PKCS5Padding */
     static char *Decrypt(const char *input, const uint8_t *key);
 
+    static std::string Encrypt2(JNIEnv *env, const std::string &key, const std::string &raw);
+
+    static std::string Decrypt2(JNIEnv *env, const std::string &key, const std::string &enc);
+
+
 private:
     static uint8_t *GetPaddingInput(const char *input);
 

library_core/src/main/cpp/include/md5/md5.h

@@ -0,0 +1,86 @@
+//
+// Created by #Suyghur, on 2021/05/25.
+//
+
+#ifndef QSGAMESDK_MD5_H
+#define QSGAMESDK_MD5_H
+
+
+#include <string>
+#include <iostream>
+
+
+// a small class for calculating MD5 hashes of strings or byte arrays
+// it is not meant to be fast or secure
+//
+// usage:
+//      1) feed it blocks of uchars with update()
+//      2) finalize()
+//      3) get hexdigest() string
+//      or
+//      MD5(std::string).hexdigest()
+//
+// assumes that char is 8 bit and int is 32 bit
+class MD5 {
+public:
+    typedef unsigned int size_type; // must be 32bit
+
+    MD5();
+
+    MD5(const std::string &text);
+
+    void update(const unsigned char *buf, size_type length);
+
+    void update(const char *buf, size_type length);
+
+    MD5 &finalize();
+
+    std::string hexdigest() const;
+
+    friend std::ostream &operator<<(std::ostream &, MD5 md5);
+
+private:
+    void init();
+
+    typedef unsigned char uint1; //  8bit
+    typedef unsigned int uint4;  // 32bit
+    enum {
+        blocksize = 64
+    }; // VC6 won't eat a const static int here
+
+    void transform(const uint1 block[blocksize]);
+
+    static void decode(uint4 output[], const uint1 input[], size_type len);
+
+    static void encode(uint1 output[], const uint4 input[], size_type len);
+
+    bool finalized;
+    uint1 buffer[blocksize]; // bytes that didn't fit in last 64 byte chunk
+    uint4 count[2];   // 64bit counter for number of bits (lo, hi)
+    uint4 state[4];   // digest so far
+    uint1 digest[16]; // the result
+
+    // low level logic operations
+    static inline uint4 F(uint4 x, uint4 y, uint4 z);
+
+    static inline uint4 G(uint4 x, uint4 y, uint4 z);
+
+    static inline uint4 H(uint4 x, uint4 y, uint4 z);
+
+    static inline uint4 I(uint4 x, uint4 y, uint4 z);
+
+    static inline uint4 rotate_left(uint4 x, int n);
+
+    static inline void FF(uint4 &a, uint4 b, uint4 c, uint4 d, uint4 x, uint4 s, uint4 ac);
+
+    static inline void GG(uint4 &a, uint4 b, uint4 c, uint4 d, uint4 x, uint4 s, uint4 ac);
+
+    static inline void HH(uint4 &a, uint4 b, uint4 c, uint4 d, uint4 x, uint4 s, uint4 ac);
+
+    static inline void II(uint4 &a, uint4 b, uint4 c, uint4 d, uint4 x, uint4 s, uint4 ac);
+};
+
+std::string md5(const std::string str);
+
+
+#endif //QSGAMESDK_MD5_H

library_core/src/main/cpp/include/request_kit.h

@@ -15,8 +15,17 @@ class RequestKit {
 public:
     static std::string EncryptRequest(JNIEnv *env, jobject context, jstring params);
 
+    static std::string EncryptRequest2(JNIEnv *env, jobject context, jstring params);
+
+    static std::string DecryptResponse(JNIEnv *env, jobject context, jstring data);
+
+    static std::string DecryptResponse2(JNIEnv *env, jobject context, jstring data);
+
+
 private:
-    static Json::Value HandleRequest(JNIEnv *env,  jstring params);
+    static Json::Value HandleRequest(JNIEnv *env, jstring params);
+
+    static std::string HandleResponse(JNIEnv *env, jstring data);
 
 };
 

library_core/src/main/cpp/include/rsa/rsa_utils.h

@@ -13,7 +13,9 @@ public:
 
     static std::string EncryptByPublicKey(std::string public_key, std::string src);
 
-    static std::string DecryptByPublicKey(std::string public_key, std::string raw);
+    static std::string DecryptByPublicKey( std::string public_key, std::string raw);
+
+    static std::string DecryptByPublicKey2(JNIEnv *env,std::string public_key, std::string raw);
 
 
 private:
@@ -24,6 +26,9 @@ private:
 
     static std::string Decrypt(const std::string &public_key, const std::string &src);
 
+    static std::string Decrypt2(JNIEnv *env,const std::string &public_key, const std::string &src);
+
+
 
 //    static std::string Encode(const std::string &src);
 //

library_core/src/main/cpp/md5.cpp

@@ -0,0 +1,320 @@
+//
+// Created by #Suyghur, on 2021/05/25.
+//
+
+#include "include/md5/md5.h"
+
+/* system implementation headers */
+#include <stdio.h>
+#include <cstring>
+
+
+// Constants for MD5Transform routine.
+#define S11 7
+#define S12 12
+#define S13 17
+#define S14 22
+#define S21 5
+#define S22 9
+#define S23 14
+#define S24 20
+#define S31 4
+#define S32 11
+#define S33 16
+#define S34 23
+#define S41 6
+#define S42 10
+#define S43 15
+#define S44 21
+
+///////////////////////////////////////////////
+
+// F, G, H and I are basic MD5 functions.
+inline MD5::uint4 MD5::F(uint4 x, uint4 y, uint4 z) {
+    return x & y | ~x & z;
+}
+
+inline MD5::uint4 MD5::G(uint4 x, uint4 y, uint4 z) {
+    return x & z | y & ~z;
+}
+
+inline MD5::uint4 MD5::H(uint4 x, uint4 y, uint4 z) {
+    return x ^ y ^ z;
+}
+
+inline MD5::uint4 MD5::I(uint4 x, uint4 y, uint4 z) {
+    return y ^ (x | ~z);
+}
+
+// rotate_left rotates x left n bits.
+inline MD5::uint4 MD5::rotate_left(uint4 x, int n) {
+    return (x << n) | (x >> (32 - n));
+}
+
+// FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4.
+// Rotation is separate from addition to prevent recomputation.
+inline void MD5::FF(uint4 &a, uint4 b, uint4 c, uint4 d, uint4 x, uint4 s, uint4 ac) {
+    a = rotate_left(a + F(b, c, d) + x + ac, s) + b;
+}
+
+inline void MD5::GG(uint4 &a, uint4 b, uint4 c, uint4 d, uint4 x, uint4 s, uint4 ac) {
+    a = rotate_left(a + G(b, c, d) + x + ac, s) + b;
+}
+
+inline void MD5::HH(uint4 &a, uint4 b, uint4 c, uint4 d, uint4 x, uint4 s, uint4 ac) {
+    a = rotate_left(a + H(b, c, d) + x + ac, s) + b;
+}
+
+inline void MD5::II(uint4 &a, uint4 b, uint4 c, uint4 d, uint4 x, uint4 s, uint4 ac) {
+    a = rotate_left(a + I(b, c, d) + x + ac, s) + b;
+}
+
+//////////////////////////////////////////////
+
+// default ctor, just initailize
+MD5::MD5() {
+    init();
+}
+
+//////////////////////////////////////////////
+
+// nifty shortcut ctor, compute MD5 for string and finalize it right away
+MD5::MD5(const std::string &text) {
+    init();
+    update(text.c_str(), text.length());
+    finalize();
+}
+
+//////////////////////////////
+
+void MD5::init() {
+    finalized = false;
+
+    count[0] = 0;
+    count[1] = 0;
+
+    // load magic initialization constants.
+    state[0] = 0x67452301;
+    state[1] = 0xefcdab89;
+    state[2] = 0x98badcfe;
+    state[3] = 0x10325476;
+}
+
+//////////////////////////////
+
+// decodes input (unsigned char) into output (uint4). Assumes len is a multiple of 4.
+void MD5::decode(uint4 output[], const uint1 input[], size_type len) {
+    for (unsigned int i = 0, j = 0; j < len; i++, j += 4)
+        output[i] = ((uint4) input[j]) | (((uint4) input[j + 1]) << 8) |
+                    (((uint4) input[j + 2]) << 16) | (((uint4) input[j + 3]) << 24);
+}
+
+//////////////////////////////
+
+// encodes input (uint4) into output (unsigned char). Assumes len is
+// a multiple of 4.
+void MD5::encode(uint1 output[], const uint4 input[], size_type len) {
+    for (size_type i = 0, j = 0; j < len; i++, j += 4) {
+        output[j] = input[i] & 0xff;
+        output[j + 1] = (input[i] >> 8) & 0xff;
+        output[j + 2] = (input[i] >> 16) & 0xff;
+        output[j + 3] = (input[i] >> 24) & 0xff;
+    }
+}
+
+//////////////////////////////
+
+// apply MD5 algo on a block
+void MD5::transform(const uint1 block[blocksize]) {
+    uint4 a = state[0], b = state[1], c = state[2], d = state[3], x[16];
+    decode(x, block, blocksize);
+
+    /* Round 1 */
+    FF(a, b, c, d, x[0], S11, 0xd76aa478); /* 1 */
+    FF(d, a, b, c, x[1], S12, 0xe8c7b756); /* 2 */
+    FF(c, d, a, b, x[2], S13, 0x242070db); /* 3 */
+    FF(b, c, d, a, x[3], S14, 0xc1bdceee); /* 4 */
+    FF(a, b, c, d, x[4], S11, 0xf57c0faf); /* 5 */
+    FF(d, a, b, c, x[5], S12, 0x4787c62a); /* 6 */
+    FF(c, d, a, b, x[6], S13, 0xa8304613); /* 7 */
+    FF(b, c, d, a, x[7], S14, 0xfd469501); /* 8 */
+    FF(a, b, c, d, x[8], S11, 0x698098d8); /* 9 */
+    FF(d, a, b, c, x[9], S12, 0x8b44f7af); /* 10 */
+    FF(c, d, a, b, x[10], S13, 0xffff5bb1); /* 11 */
+    FF(b, c, d, a, x[11], S14, 0x895cd7be); /* 12 */
+    FF(a, b, c, d, x[12], S11, 0x6b901122); /* 13 */
+    FF(d, a, b, c, x[13], S12, 0xfd987193); /* 14 */
+    FF(c, d, a, b, x[14], S13, 0xa679438e); /* 15 */
+    FF(b, c, d, a, x[15], S14, 0x49b40821); /* 16 */
+
+    /* Round 2 */
+    GG(a, b, c, d, x[1], S21, 0xf61e2562); /* 17 */
+    GG(d, a, b, c, x[6], S22, 0xc040b340); /* 18 */
+    GG(c, d, a, b, x[11], S23, 0x265e5a51); /* 19 */
+    GG(b, c, d, a, x[0], S24, 0xe9b6c7aa); /* 20 */
+    GG(a, b, c, d, x[5], S21, 0xd62f105d); /* 21 */
+    GG(d, a, b, c, x[10], S22, 0x2441453); /* 22 */
+    GG(c, d, a, b, x[15], S23, 0xd8a1e681); /* 23 */
+    GG(b, c, d, a, x[4], S24, 0xe7d3fbc8); /* 24 */
+    GG(a, b, c, d, x[9], S21, 0x21e1cde6); /* 25 */
+    GG(d, a, b, c, x[14], S22, 0xc33707d6); /* 26 */
+    GG(c, d, a, b, x[3], S23, 0xf4d50d87); /* 27 */
+    GG(b, c, d, a, x[8], S24, 0x455a14ed); /* 28 */
+    GG(a, b, c, d, x[13], S21, 0xa9e3e905); /* 29 */
+    GG(d, a, b, c, x[2], S22, 0xfcefa3f8); /* 30 */
+    GG(c, d, a, b, x[7], S23, 0x676f02d9); /* 31 */
+    GG(b, c, d, a, x[12], S24, 0x8d2a4c8a); /* 32 */
+
+    /* Round 3 */
+    HH(a, b, c, d, x[5], S31, 0xfffa3942); /* 33 */
+    HH(d, a, b, c, x[8], S32, 0x8771f681); /* 34 */
+    HH(c, d, a, b, x[11], S33, 0x6d9d6122); /* 35 */
+    HH(b, c, d, a, x[14], S34, 0xfde5380c); /* 36 */
+    HH(a, b, c, d, x[1], S31, 0xa4beea44); /* 37 */
+    HH(d, a, b, c, x[4], S32, 0x4bdecfa9); /* 38 */
+    HH(c, d, a, b, x[7], S33, 0xf6bb4b60); /* 39 */
+    HH(b, c, d, a, x[10], S34, 0xbebfbc70); /* 40 */
+    HH(a, b, c, d, x[13], S31, 0x289b7ec6); /* 41 */
+    HH(d, a, b, c, x[0], S32, 0xeaa127fa); /* 42 */
+    HH(c, d, a, b, x[3], S33, 0xd4ef3085); /* 43 */
+    HH(b, c, d, a, x[6], S34, 0x4881d05); /* 44 */
+    HH(a, b, c, d, x[9], S31, 0xd9d4d039); /* 45 */
+    HH(d, a, b, c, x[12], S32, 0xe6db99e5); /* 46 */
+    HH(c, d, a, b, x[15], S33, 0x1fa27cf8); /* 47 */
+    HH(b, c, d, a, x[2], S34, 0xc4ac5665); /* 48 */
+
+    /* Round 4 */
+    II(a, b, c, d, x[0], S41, 0xf4292244); /* 49 */
+    II(d, a, b, c, x[7], S42, 0x432aff97); /* 50 */
+    II(c, d, a, b, x[14], S43, 0xab9423a7); /* 51 */
+    II(b, c, d, a, x[5], S44, 0xfc93a039); /* 52 */
+    II(a, b, c, d, x[12], S41, 0x655b59c3); /* 53 */
+    II(d, a, b, c, x[3], S42, 0x8f0ccc92); /* 54 */
+    II(c, d, a, b, x[10], S43, 0xffeff47d); /* 55 */
+    II(b, c, d, a, x[1], S44, 0x85845dd1); /* 56 */
+    II(a, b, c, d, x[8], S41, 0x6fa87e4f); /* 57 */
+    II(d, a, b, c, x[15], S42, 0xfe2ce6e0); /* 58 */
+    II(c, d, a, b, x[6], S43, 0xa3014314); /* 59 */
+    II(b, c, d, a, x[13], S44, 0x4e0811a1); /* 60 */
+    II(a, b, c, d, x[4], S41, 0xf7537e82); /* 61 */
+    II(d, a, b, c, x[11], S42, 0xbd3af235); /* 62 */
+    II(c, d, a, b, x[2], S43, 0x2ad7d2bb); /* 63 */
+    II(b, c, d, a, x[9], S44, 0xeb86d391); /* 64 */
+
+    state[0] += a;
+    state[1] += b;
+    state[2] += c;
+    state[3] += d;
+
+    // Zeroize sensitive information.
+    memset(x, 0, sizeof x);
+}
+
+//////////////////////////////
+
+// MD5 block update operation. Continues an MD5 message-digest
+// operation, processing another message block
+void MD5::update(const unsigned char input[], size_type length) {
+    // compute number of bytes mod 64
+    size_type index = count[0] / 8 % blocksize;
+
+    // Update number of bits
+    if ((count[0] += (length << 3)) < (length << 3))
+        count[1]++;
+    count[1] += (length >> 29);
+
+    // number of bytes we need to fill in buffer
+    size_type firstpart = 64 - index;
+
+    size_type i;
+
+    // transform as many times as possible.
+    if (length >= firstpart) {
+        // fill buffer first, transform
+        memcpy(&buffer[index], input, firstpart);
+        transform(buffer);
+
+        // transform chunks of blocksize (64 bytes)
+        for (i = firstpart; i + blocksize <= length; i += blocksize)
+            transform(&input[i]);
+
+        index = 0;
+    } else
+        i = 0;
+
+    // buffer remaining input
+    memcpy(&buffer[index], &input[i], length - i);
+}
+
+//////////////////////////////
+
+// for convenience provide a verson with signed char
+void MD5::update(const char input[], size_type length) {
+    update((const unsigned char *) input, length);
+}
+
+//////////////////////////////
+
+// MD5 finalization. Ends an MD5 message-digest operation, writing the
+// the message digest and zeroizing the context.
+MD5 &MD5::finalize() {
+    static unsigned char padding[64] = {
+            0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+    };
+
+    if (!finalized) {
+        // Save number of bits
+        unsigned char bits[8];
+        encode(bits, count, 8);
+
+        // pad out to 56 mod 64.
+        size_type index = count[0] / 8 % 64;
+        size_type padLen = (index < 56) ? (56 - index) : (120 - index);
+        update(padding, padLen);
+
+        // Append length (before padding)
+        update(bits, 8);
+
+        // Store state in digest
+        encode(digest, state, 16);
+
+        // Zeroize sensitive information.
+        memset(buffer, 0, sizeof buffer);
+        memset(count, 0, sizeof count);
+
+        finalized = true;
+    }
+
+    return *this;
+}
+
+//////////////////////////////
+
+// return hex representation of digest as string
+std::string MD5::hexdigest() const {
+    if (!finalized)
+        return "";
+
+    char buf[33];
+    for (int i = 0; i < 16; i++)
+        sprintf(buf + i * 2, "%02x", digest[i]);
+    buf[32] = 0;
+
+    return std::string(buf);
+}
+
+//////////////////////////////
+
+std::ostream &operator<<(std::ostream &out, MD5 md5) {
+    return out << md5.hexdigest();
+}
+
+//////////////////////////////
+
+std::string md5(const std::string str) {
+    MD5 md5 = MD5(str);
+
+    return md5.hexdigest();
+}

library_core/src/main/cpp/request_kit.cpp

@@ -8,6 +8,7 @@
 #include <logger.h>
 #include <rsa/rsa_utils.h>
 #include <url_utils.h>
+#include <md5/md5.h>
 #include "include/request_kit.h"
 
 
@@ -27,6 +28,11 @@ std::string RequestKit::EncryptRequest(JNIEnv *env, jobject context, jstring par
     return ToolKit::ToJsonString(root);
 }
 
+std::string RequestKit::DecryptResponse(JNIEnv *env, jobject context, jstring data) {
+    //报文原文
+    return HandleResponse(env, data);
+}
+
 Json::Value RequestKit::HandleRequest(JNIEnv *env, jstring params) {
     Json::Value root;
     std::string params_ = ToolKit::JString2String(env, params);
@@ -35,4 +41,65 @@ Json::Value RequestKit::HandleRequest(JNIEnv *env, jstring params) {
     return root;
 }
 
+std::string RequestKit::HandleResponse(JNIEnv *env, jstring data) {
+    std::string data_ = ToolKit::JString2String(env, data);
+    LOGD("data : %s", data_.c_str());
+    Json::Value root = ToolKit::ToJsonObject(ToolKit::JString2String(env, data));
+    LOGD("ts : %s", root["ts"].asCString());
+    std::string ts = RsaUtils::DecryptByPublicKey2(env, PUBLIC_KEY, root["ts"].asString());
+    LOGD("ts : %s", ts.c_str());
+    const auto *aes_key = reinterpret_cast<const uint8_t *>(ts.c_str());
+    LOGD("aes key : %s", aes_key);
+    const char *p = root["p"].asCString();
+    return AesUtils::Decrypt(p, aes_key);
+
+}
+
+std::string RequestKit::EncryptRequest2(JNIEnv *env, jobject context, jstring params) {
+    //报文的原文
+    std::string raw = ToolKit::ToJsonString(HandleRequest(env, params));
+    //aes key
+    char *raw_key = AesUtils::GetRawKey();
+    std::string raw_key_md5 = md5(raw_key);
+    char *iv_32 = AesUtils::GetIv32(raw_key_md5.c_str());
+    char *key_64 = static_cast<char *>(malloc(65));
+    sprintf(key_64, "%s%s", raw_key_md5.c_str(), iv_32);
+    key_64[65] = '\0';
+    std::string key = md5(key_64);
+    std::string aes_key = key.substr(8, 16);
+    std::string p = AesUtils::Encrypt(raw.c_str(), reinterpret_cast<const uint8_t *>(aes_key.c_str()));
+    Json::Value root;
+    root["p"] = p;
+    root["ts"] = raw_key_md5;
+    free(raw_key);
+    free(iv_32);
+    free(key_64);
+//    delete aes_key;
+//    free((void *) aes_key);
+    return ToolKit::ToJsonString(root);
+}
+
+std::string RequestKit::DecryptResponse2(JNIEnv *env, jobject context, jstring data) {
+    std::string data_ = ToolKit::JString2String(env, data);
+    Json::Value root = ToolKit::ToJsonObject(ToolKit::JString2String(env, data));
+    std::string ts = root["ts"].asString();
+
+    std::string ts_iv = AesUtils::GetIv32(ts.c_str());
+
+    char *key_64 = static_cast<char *>(malloc(65));
+    sprintf(key_64, "%s%s", ts.c_str(), ts_iv.c_str());
+    std::string key = md5(key_64);
+    std::string aes_key = key.substr(8, 16);
+//    std::string ts = RsaUtils::DecryptByPublicKey2(env, PUBLIC_KEY, root["ts"].asString());
+
+    LOGD("aes key : %s", aes_key.c_str());
+    const char *p = root["p"].asCString();
+    std::string result = AesUtils::Decrypt(p, reinterpret_cast<const uint8_t *>(aes_key.c_str()));
+    free(key_64);
+    delete p;
+    return result;
+}
+
+
+
 

library_core/src/main/cpp/rsa_utils.cpp

@@ -5,6 +5,8 @@
 #include <third_part/openssl/ossl_typ.h>
 #include <third_part/openssl/bio.h>
 #include <third_part/openssl/pem.h>
+#include <logger.h>
+#include <toolkit.h>
 #include "include/base64_utils.h"
 #include "include/rsa/rsa_utils.h"
 
@@ -34,6 +36,9 @@ std::string RsaUtils::EncryptByPublicKey(std::string public_key, std::string src
  */
 std::string RsaUtils::DecryptByPublicKey(std::string public_key, std::string raw) {
     std::string key = GeneratePublicKey(public_key);
+    LOGD("decrypt pubkey : %s", key.c_str());
+
+    LOGD("decrypt key : %s", raw.c_str());
     return Decrypt(key, raw);
 }
 
@@ -158,6 +163,8 @@ std::string RsaUtils::Decrypt(const std::string &public_key, const std::string &
     //int ret = RSA_public_decrypt(clearText.length(), (const unsigned char*)clearText.c_str(), (unsigned char*)encryptedText, rsa, RSA_PKCS1_PADDING);
     //异常处理
     if (status < 0) {
+        LOGD("status : %d", status);
+
         //资源释放
         free(src);
         free(data);
@@ -178,9 +185,40 @@ std::string RsaUtils::Decrypt(const std::string &public_key, const std::string &
     RSA_free(rsa_public_key);
     //清除管理CRYPTO_EX_DATA的全局hash表中的数据，避免内存泄漏
     CRYPTO_cleanup_all_ex_data();
+    LOGD("result : %s", result.c_str());
     return result;
 
 }
 
+std::string RsaUtils::DecryptByPublicKey2(JNIEnv *env, std::string public_key, std::string raw) {
+
+//    std::string key = GeneratePublicKey(public_key);
+//    LOGD("decrypt pubkey : %s", key.c_str());
+//
+//    LOGD("decrypt key : %s", raw.c_str());
+    return Decrypt2(env, public_key, raw);
+}
+
+std::string RsaUtils::Decrypt2(JNIEnv *env, const std::string &public_key, const std::string &enc) {
+    jclass clz = env->FindClass("cn/yyxx/support/encryption/rsa/RsaUtils");
+    if (clz == nullptr) {
+        LOGE("rsa impl clz is nullptr !!!");
+        return "";
+    }
+
+    const char *method_name = "decryptByPublicKey";
+    const char *sig = "(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;";
+    jmethodID mid = env->GetStaticMethodID(clz, method_name, sig);
+    jstring key_ = env->NewStringUTF(public_key.c_str());
+    jstring enc_ = env->NewStringUTF(enc.c_str());
+    auto result = (jstring) env->CallStaticObjectMethod(clz, mid, key_, key_);
+    env->DeleteLocalRef(clz);
+    env->DeleteLocalRef(key_);
+    env->DeleteLocalRef(enc_);
+//    free((void *) method_name);
+//    free((void *) sig);
+    return ToolKit::JString2String(env, result);
+}
+
 
 

library_core/src/main/cpp/sdk_drive.cpp

@@ -10,6 +10,7 @@
 #include <comm_map.h>
 #include <params_kit.h>
 #include <request_kit.h>
+#include <md5/md5.h>
 #include "include/logger.h"
 #include "aes/aes_utils.h"
 
@@ -67,7 +68,7 @@ static jstring RsaDecrypt(JNIEnv *env, jobject thiz, jstring raw) {
     const char *raw_ = env->GetStringUTFChars(raw, JNI_FALSE);
 //    std::string key = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCAVatPhPaZtxBkLBZDnOLf7no6VfnjBRMXhpOnWmkkDX4zurB/OKisYDFnR0UUVnKn717+absfLlDk9HZWBcTMznsUju9fuXlu3Elr8HeI3en7E0KIQzxkY1GT1+qtZ+tCjWuyMmUw4vWpO8/MRU3f6nc4io3w+7N+dP24BIo0ZwIDAQAB";
     std::string key = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCbROlODv7iVaFhRAomQ9kSoV+whoebwVUDWUd968V8jbLQg0bAh6ad22O1bo33f4zNmIuDzdQMGOVgRyuvKsS9GyE+gh4XPDpSUmi/bZTl0wr8Y/yTi8eW+sXxn6Ao4oo4bg+qPewUxjTS2u4Pe1Zl3IC48HFALTAo0PSSXS5b7wIDAQAB";
-    std::string src = RsaUtils::DecryptByPublicKey(key, raw_);
+    std::string src = RsaUtils::DecryptByPublicKey2(env, key, raw_);
     env->ReleaseStringUTFChars(raw, raw_);
     jstring result = ToolKit::GetJString(env, src.c_str());
     return result;
@@ -99,7 +100,7 @@ static jstring GetParam(JNIEnv *env, jobject thiz, jstring key) {
 }
 
 static jstring InvokeJob(JNIEnv *env, jobject thiz, jobject context, jstring data) {
-    std::string enc = RequestKit::EncryptRequest(env, context, data);
+    std::string enc = RequestKit::EncryptRequest2(env, context, data);
 //    env->ReleaseStringUTFChars(raw, raw_);
     jstring result = ToolKit::GetJString(env, enc.c_str());
 //    free(src);
@@ -107,7 +108,13 @@ static jstring InvokeJob(JNIEnv *env, jobject thiz, jobject context, jstring dat
 }
 
 static jstring ParseJob(JNIEnv *env, jobject thiz, jobject context, jstring data) {
-    return env->NewStringUTF("");
+    std::string raw = RequestKit::DecryptResponse2(env, context, data);
+    jstring result = ToolKit::GetJString(env, raw.c_str());
+    return result;
+//    time_t ts = time(nullptr);
+//    LOGD("%ld", ts);
+//    char *key = AesUtils::GetRawKey();
+//    return env->NewStringUTF("");
 }
 
 
@@ -120,9 +127,9 @@ static JNINativeMethod gMethod[] = {
 
 //        {"getAesKey",  "()V",                                                      (void *) GetAesKey},
 //        {"aesEncrypt",   "(Ljava/lang/String;)Ljava/lang/String;",                                            (void *) AesEncrypt},
-//        {"aesDecrypt", "(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;", (void *) AesDecrypt},
+//        {"aesDecrypt",   "(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;",        (void *) AesDecrypt},
 //        {"rsaEncrypt", "(Ljava/lang/String;)Ljava/lang/String;",                   (void *) RsaEncrypt},
-//        {"rsaDecrypt", "(Ljava/lang/String;)Ljava/lang/String;",                   (void *) RsaDecrypt}
+//        {"rsaDecrypt",   "(Ljava/lang/String;)Ljava/lang/String;",                          (void *) RsaDecrypt}
 };
 
 extern "C" JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) {

library_core/src/main/cpp/toolkit.cpp

@@ -15,16 +15,16 @@ jstring ToolKit::GetJString(JNIEnv *env, const char *src) {
     jmethodID methodID = env->GetMethodID(clz, "<init>", "([BLjava/lang/String;)V");
     jstring encoding = env->NewStringUTF("utf-8");
 
-    jsize length = static_cast<jsize>(strlen(src));
+    auto length = static_cast<jsize>(strlen(src));
     jbyteArray bytes = env->NewByteArray(length);
     env->SetByteArrayRegion(bytes, 0, length, (jbyte *) src);
-    jstring resultString = (jstring) env->NewObject(clz, methodID, bytes, encoding);
+    auto result = (jstring) env->NewObject(clz, methodID, bytes, encoding);
 
     env->DeleteLocalRef(clz);
     env->DeleteLocalRef(encoding);
     env->DeleteLocalRef(bytes);
 
-    return resultString;
+    return result;
 }
 
 std::string ToolKit::JString2String(JNIEnv *env, jstring jstr) {
@@ -50,6 +50,9 @@ std::string ToolKit::JString2String(JNIEnv *env, jstring jstr) {
     env->ReleaseByteArrayElements(byte_array, byte, JNI_FALSE);
     std::string result(tmp_ptr);
     free(tmp_ptr);
+    env->DeleteLocalRef(clz);
+    env->DeleteLocalRef(encode_mode);
+    env->DeleteLocalRef(byte_array);
     return result;
 }
 
@@ -71,6 +74,9 @@ std::string ToolKit::GetPackageName(JNIEnv *env, jobject context) {
     const char *sig = "()Ljava/lang/String;";
     jmethodID mid = env->GetMethodID(clz, method_name, sig);
     auto result = (jstring) env->CallObjectMethod(context, mid);
+    env->DeleteLocalRef(clz);
+//    free((void *) method_name);
+//    free((void *) sig);
     return JString2String(env, result);
 }
 
@@ -84,6 +90,9 @@ std::string ToolKit::GetServerVersion(JNIEnv *env) {
     const char *sig = "Ljava/lang/String;";
     jfieldID fid = env->GetStaticFieldID(clz, field_name, sig);
     auto result = (jstring) env->GetStaticObjectField(clz, fid);
+    env->DeleteLocalRef(clz);
+//    free((void *) field_name);
+//    free((void *) sig);
     return JString2String(env, result);
 }
 
@@ -97,6 +106,9 @@ std::string ToolKit::GetClientVersion(JNIEnv *env) {
     const char *sig = "Ljava/lang/String;";
     jfieldID fid = env->GetStaticFieldID(clz, field_name, sig);
     auto result = (jstring) env->GetStaticObjectField(clz, fid);
+    env->DeleteLocalRef(clz);
+//    free((void *) field_name);
+//    free((void *) sig);
     return JString2String(env, result);
 }
 
@@ -110,6 +122,9 @@ std::string ToolKit::GetVersionName(JNIEnv *env, jobject context) {
     const char *sig = "(Landroid/content/Context;)Ljava/lang/String;";
     jmethodID mid = env->GetStaticMethodID(clz, method_name, sig);
     auto result = (jstring) env->CallStaticObjectMethod(clz, mid, context);
+    env->DeleteLocalRef(clz);
+//    free((void *) method_name);
+//    free((void *) sig);
     return JString2String(env, result);
 }
 
@@ -123,6 +138,9 @@ std::string ToolKit::GetVersionCode(JNIEnv *env, jobject context) {
     const char *sig = "(Landroid/content/Context;)Ljava/lang/String;";
     jmethodID mid = env->GetStaticMethodID(clz, method_name, sig);
     auto result = (jstring) env->CallStaticObjectMethod(clz, mid, context);
+    env->DeleteLocalRef(clz);
+//    free((void *) method_name);
+//    free((void *) sig);
     return JString2String(env, result);
 }
 
@@ -136,6 +154,9 @@ std::string ToolKit::GetAndroidDeviceId(JNIEnv *env, jobject context) {
     const char *sig = "(Landroid/content/Context;)Ljava/lang/String;";
     jmethodID mid = env->GetStaticMethodID(clz, method_name, sig);
     auto result = (jstring) env->CallStaticObjectMethod(clz, mid, context);
+    env->DeleteLocalRef(clz);
+//    free((void *) method_name);
+//    free((void *) sig);
     return JString2String(env, result);
 }
 
@@ -149,6 +170,9 @@ int ToolKit::GetNetworkType(JNIEnv *env, jobject context) {
     const char *sig = "(Landroid/content/Context;)Ljava/lang/String;";
     jmethodID mid = env->GetStaticMethodID(clz, method_name, sig);
     auto result = (jstring) env->CallStaticObjectMethod(clz, mid, context);
+    env->DeleteLocalRef(clz);
+//    free((void *) method_name);
+//    free((void *) sig);
     return String2Int(JString2String(env, result));
 }
 
@@ -194,6 +218,9 @@ bool ToolKit::IsEmulator(JNIEnv *env, jobject context) {
     const char *sig = "(Landroid/content/Context;)Z";
     jmethodID mid = env->GetStaticMethodID(clz, method_name, sig);
     auto result = (jboolean) env->CallStaticBooleanMethod(clz, mid, context);
+    env->DeleteLocalRef(clz);
+//    free((void *) method_name);
+//    free((void *) sig);
     return result == JNI_TRUE;
 }
 

library_core/src/main/java/cn/yyxx/columbus/core/entity/SdkBackLoginInfo.kt

@@ -29,7 +29,7 @@ class SdkBackLoginInfo private constructor() {
     fun toJsonString(): String {
         val jsonObject = JSONObject()
         try {
-            jsonObject.put("user_id", userId)
+            jsonObject.put("uid", userId)
             jsonObject.put("token", token)
         } catch (e: JSONException) {
             e.printStackTrace()

library_core/src/main/java/cn/yyxx/columbus/core/entity/Session.kt

@@ -24,8 +24,8 @@ class Session : Serializable {
     fun toJSONObject(): JSONObject {
         val jsonObject = JSONObject()
         try {
-            jsonObject.put("user_id", userId)
-            jsonObject.put("user_name", userName)
+            jsonObject.put("uid", userId)
+            jsonObject.put("uname", userName)
             jsonObject.put("pwd", pwd)
             jsonObject.put("login_type", loginType)
         } catch (e: Exception) {
@@ -37,6 +37,4 @@ class Session : Serializable {
     override fun toString(): String {
         return "Session(userId='$userId', userName='$userName', pwd='$pwd', loginType=$loginType)"
     }
-
-
 }

library_core/src/main/java/cn/yyxx/columbus/core/entity/bean/init/FloatCfg.kt

@@ -38,28 +38,26 @@ class FloatCfg {
                 bean.floatIconUrl = floatCfg.getString("float_icon_url")
             }
 
-            if (JsonUtils.hasJsonKey(floatCfg, "feature_cfg")) {
-                val featureCfg = floatCfg.getJSONObject("feature_cfg")
-                if (JsonUtils.hasJsonKey(featureCfg, "member_cfg")) {
-                    bean.memberCfg = FeatureCfg.toBean(featureCfg.getJSONObject("member_cfg"))
-                }
+            if (JsonUtils.hasJsonKey(floatCfg, "member_cfg")) {
+                bean.memberCfg = FeatureCfg.toBean(floatCfg.getJSONObject("member_cfg"))
+            }
 
-                if (JsonUtils.hasJsonKey(featureCfg, "gif_cfg")) {
-                    bean.gifCfg = FeatureCfg.toBean(featureCfg.getJSONObject("gif_cfg"))
-                }
+            if (JsonUtils.hasJsonKey(floatCfg, "gif_cfg")) {
+                bean.gifCfg = FeatureCfg.toBean(floatCfg.getJSONObject("gif_cfg"))
+            }
 
-                if (JsonUtils.hasJsonKey(featureCfg, "gm_cfg")) {
-                    bean.gmCfg = FeatureCfg.toBean(featureCfg.getJSONObject("gm_cfg"))
-                }
+            if (JsonUtils.hasJsonKey(floatCfg, "gm_cfg")) {
+                bean.gmCfg = FeatureCfg.toBean(floatCfg.getJSONObject("gm_cfg"))
+            }
 
-                if (JsonUtils.hasJsonKey(featureCfg, "charge_cfg")) {
-                    bean.chargeCfg = FeatureCfg.toBean(featureCfg.getJSONObject("charge_cfg"))
-                }
+            if (JsonUtils.hasJsonKey(floatCfg, "charge_cfg")) {
+                bean.chargeCfg = FeatureCfg.toBean(floatCfg.getJSONObject("charge_cfg"))
+            }
 
-                if (JsonUtils.hasJsonKey(featureCfg, "invite_cfg")) {
-                    bean.inviteCfg = FeatureCfg.toBean(featureCfg.getJSONObject("invite_cfg"))
-                }
+            if (JsonUtils.hasJsonKey(floatCfg, "invite_cfg")) {
+                bean.inviteCfg = FeatureCfg.toBean(floatCfg.getJSONObject("invite_cfg"))
             }
+
             return bean
         }
     }

library_core/src/main/java/cn/yyxx/columbus/core/impl/SdkBridgeImpl.kt

@@ -11,19 +11,22 @@ import cn.yyxx.columbus.base.internal.ICallback
 import cn.yyxx.columbus.base.internal.IInitialize
 import cn.yyxx.columbus.base.utils.Logger
 import cn.yyxx.columbus.base.utils.ParamsUtils
+import cn.yyxx.columbus.core.entity.ResultInfo
 import cn.yyxx.columbus.core.entity.SdkBackLoginInfo
 import cn.yyxx.columbus.core.entity.bean.init.InitBean
 import cn.yyxx.columbus.core.impl.login.LoginActivity
 import cn.yyxx.columbus.core.internal.IImplCallback
+import cn.yyxx.columbus.core.internal.IRequestCallback
 import cn.yyxx.columbus.core.network.Host
-import cn.yyxx.support.DensityUtils
-import cn.yyxx.support.device.DeviceInfoUtils
+import cn.yyxx.columbus.core.network.SdkRequest
+import cn.yyxx.columbus.core.utils.MMKVUtils
 import cn.yyxx.support.gaid.GAIDUtils
 import cn.yyxx.support.hawkeye.LogUtils
 import cn.yyxx.support.hawkeye.OwnDebugUtils
 import cn.yyxx.support.hawkeye.ToastUtils
 import java.util.concurrent.atomic.AtomicInteger
 
+
 /**
  * @author #Suyghur.
  * Created on 2021/06/16
@@ -31,7 +34,22 @@ import java.util.concurrent.atomic.AtomicInteger
 class SdkBridgeImpl(context: Context) {
 
 
+    private var mActivity: Activity? = null
+
     private var hasReadGaid = false
+    private var roleInfo: SdkRoleInfo? = null
+
+    private var initState = false
+
+    //是否有公告，默认有，为了拦截初始化后马上登录
+    private var isShowInitDialog = true
+
+    //登录接口是否在休眠中，公告接口请求完成后，会自动发起登录
+    private var isSleepLogin = false
+
+    //当前是否存在登录操作
+    private var isExistLoginHandle = false
+    private var isSubmitRoleData = false
 
     @Volatile
     private var timeCount = AtomicInteger(0)
@@ -43,14 +61,15 @@ class SdkBridgeImpl(context: Context) {
 
     fun attachBaseContext(application: Application, context: Context) {
         Logger.initZap(application)
+//        SdkDrive.initSdkDrive(application)
         Logger.i("Columbus attachBaseContext ...")
         GAIDUtils.initGoogleAdid(application) { code, _ ->
             if (code == 0) {
                 Logger.i("谷歌框架可以访问，请求gaid")
-                SdkDrive.getInstance().setParam("device_id", GAIDUtils.getGoogleAdid())
+//                SdkDrive.setParam("device_id", GAIDUtils.getGoogleAdid())
             } else {
                 Logger.e("谷歌框架不可访问，使用android id替代")
-                SdkDrive.getInstance().setParam("device_id", DeviceInfoUtils.getAndroidDeviceId(application))
+//                SdkDrive.setParam("device_id", DeviceInfoUtils.getAndroidDeviceId(application))
             }
             hasReadGaid = true
         }
@@ -58,7 +77,8 @@ class SdkBridgeImpl(context: Context) {
 
     fun initApplication(application: Application) {
         Logger.i("Columbus initApplication ...")
-        SdkDrive.getInstance().initSdkDrive(application)
+        MMKVUtils.getInstance().init(application)
+//        MMKV.initialize(application, application.getExternalFilesDir("")!!.absolutePath + "/user_info")
     }
 
     fun initialize(activity: Activity, isLandscape: Boolean, callback: ICallback, initCallback: IInitialize) {
@@ -86,7 +106,7 @@ class SdkBridgeImpl(context: Context) {
         }
 
         //获取当前屏幕尺寸
-        SdkDrive.getInstance().setParam("screen", DensityUtils.getResolutionByFullScreen(activity))
+//        SdkDrive.setParam("screen", DensityUtils.getResolutionByFullScreen(activity))
 
         if (!hasReadGaid) {
             Logger.e("还未完成gaid加载，将延迟初始化")
@@ -118,15 +138,71 @@ class SdkBridgeImpl(context: Context) {
     }
 
     private fun startSdkInit(activity: Activity, callback: ICallback, initCallback: IInitialize) {
-        val test =
-            "{\"notice_cfg\":{\"switch\":1,\"url\":\"https://www.baidu.com\",\"show_count\":1},\"privacy_cfg\":{\"switch\":1,\"url\":\"https://www.baidu.com\"},\"float_cfg\":{\"switch\":1,\"float_icon_url\":\"https://www.baidu.com\",\"feature_cfg\":{\"member_cfg\":{\"switch\":1,\"icon_url\":\"https://www.baidu.com\",\"url\":\"https://www.baidu.com\"},\"gif_cfg\":{\"switch\":1,\"icon_url\":\"https://www.baidu.com\",\"url\":\"https://www.baidu.com\"},\"gm_cfg\":{\"switch\":1,\"icon_url\":\"https://www.baidu.com\",\"url\":\"https://www.baidu.com\"},\"charge_cfg\":{\"switch\":1,\"icon_url\":\"https://www.baidu.com\",\"url\":\"https://www.baidu.com\"},\"invite_cfg\":{\"switch\":1,\"icon_url\":\"https://www.baidu.com\",\"url\":\"https://www.baidu.com\"}}},\"reward_id\":\"com.yyxx.yzcjl60\",\"area_code_list\":[\"86\",\"886\",\"862\"]}"
-        initBean = InitBean.toBean(test)
-        Logger.d(initBean)
-        callback.onResult(0, "")
-        initCallback.onResult(0, "")
+        SdkRequest.getInstance().initSdk(activity, object : IRequestCallback {
+            override fun onResponse(resultInfo: ResultInfo) {
+                if (resultInfo.code == 1 && !TextUtils.isEmpty(resultInfo.data)) {
+                    Logger.d(resultInfo.data)
+                    initBean = InitBean.toBean(resultInfo.data)
+                    //TODO 下载图片资源
+                    showInitDialog(activity, callback, initCallback)
+                } else {
+                    initState = false
+                    initCallback.onResult(-1, "SDK初始化失败")
+                    callback.onResult(-1, "SDK初始化失败")
+                }
+            }
+        })
+    }
+
+    private fun showInitDialog(activity: Activity, callback: ICallback, initCallback: IInitialize) {
+        isShowInitDialog = false
+        initState = true
+        initCallback.onResult(0, "SDK初始化成功")
+        callback.onResult(0, "SDK初始化成功")
     }
 
     fun login(activity: Activity, isAutoLogin: Boolean, callback: ICallback) {
+        this.mActivity = activity
+        if (!initState) {
+            Logger.e("登录失败，SDK未初始化或初始化失败")
+            callback.onResult(-1, "登录失败，SDK未初始化或初始化失败")
+            return
+        }
+        if (isSleepLogin) {
+            Logger.e("登录接口正在执行中，请稍等...")
+            return
+        }
+        if (isExistLoginHandle) {
+            Logger.e("登录接口已经存在队列中操作，请等待...")
+            return
+        }
+        isExistLoginHandle = true
+        if (isShowInitDialog) {
+            Logger.e("登录调用过快或Dialog还未关闭，延迟登录，Dialog : $isShowInitDialog")
+            callback.onResult(-1, "登录调用过快或Dialog还未关闭，延迟登录")
+            if (!isSleepLogin) {
+                isSleepLogin = true
+                Thread {
+                    while (isShowInitDialog) {
+                        try {
+                            Logger.e("公告还在执行，延迟2秒后自动登录，Dialog : $isShowInitDialog")
+                            Thread.sleep(2000)
+                        } catch (e: InterruptedException) {
+                            e.printStackTrace()
+                        }
+                    }
+                    isSleepLogin = false
+                    isExistLoginHandle = false
+                    activity.runOnUiThread {
+                        Logger.e("公告接口执行完成，发起登录...")
+                        login(activity, isAutoLogin, callback)
+                    }
+                }.start()
+            }
+            return
+        }
+        isExistLoginHandle = false
+        SdkBackLoginInfo.instance.reset()
         LoginActivity.login(activity, isAutoLogin, object : IImplCallback {
             override fun onResult(code: Int, result: String) {
                 Logger.d("onResult code : $code , result : $result")
@@ -136,11 +212,19 @@ class SdkBridgeImpl(context: Context) {
     }
 
     fun logout(activity: Activity, callback: ICallback) {
-
+        this.mActivity = activity
+        this.roleInfo = null
+        SdkBackLoginInfo.instance.reset()
+        callback.onResult(0, "用户登出成功")
     }
 
     fun charge(activity: Activity, chargeInfo: SdkChargeInfo, callback: ICallback) {
-
+        this.mActivity = activity
+        if (!initState) {
+            Logger.e("支付失败，SDK未初始化或初始化失败")
+            callback.onResult(-1, "支付失败，SDK未初始化或初始化失败")
+            return
+        }
     }
 
     fun roleCreate(activity: Activity, roleInfo: SdkRoleInfo) {

library_core/src/main/java/cn/yyxx/columbus/core/impl/SdkDrive.kt

@@ -1,54 +1,51 @@
-package cn.yyxx.columbus.core.impl
-
-import android.content.Context
-import androidx.annotation.Keep
-
-/**
- * @author #Suyghur.
- * Created on 2021/06/09
- */
-class SdkDrive private constructor() {
-
-    init {
-        System.loadLibrary("columbus")
-    }
-
-    //    external fun getAesKey()
-//
-//    external fun aesEncrypt(src: String): String
-//
-//    external fun aesDecrypt(raw: String, key: String): String
-//
-//    external fun rsaEncrypt(src: String): String
-//
-//    external fun rsaDecrypt(raw: String): String
-
-    external fun initSdkDrive(context: Context)
-
-    external fun setParam(key: String, value: String)
-
-    external fun getParam(key: String): String
-
-    external fun invokeJob(context: Context, data: String): String
-
-    external fun parseJob(context: Context, data: String): String
-
-    companion object {
-        @JvmStatic
-        @Keep
-        fun getInstance(): SdkDrive {
-            return SdkDriveHolder.INSTANCE
-        }
-
-        private object SdkDriveHolder {
-            val INSTANCE: SdkDrive = SdkDrive()
-        }
-
-        /**
-         * 防止单例对象在反序列化时重新生成对象
-         */
-        private fun readResolve(): Any {
-            return SdkDriveHolder.INSTANCE
-        }
-    }
-}
+//package cn.yyxx.columbus.core.impl
+//
+///**
+// * @author #Suyghur.
+// * Created on 2021/06/09
+// */
+//object SdkDrive {
+//
+////    init {
+////        System.loadLibrary("columbus")
+////    }
+//
+//    //    external fun getAesKey()
+////
+////    external fun aesEncrypt(src: String): String
+////
+////    external fun aesDecrypt(raw: String, key: String): String
+////
+////    external fun rsaEncrypt(src: String): String
+////
+////    external fun rsaDecrypt(raw: String): String
+//
+////    external fun initSdkDrive(context: Context)
+//
+////    external fun setParam(key: String, value: String)
+//
+////    external fun getParam(key: String): String
+//
+////    external fun invokeJob(context: Context, data: String): String
+//
+////    external fun parseJob(context: Context, data: String): String
+//
+////    companion object {
+////        @JvmStatic
+////        @Keep
+////        fun getInstance(): SdkDrive {
+////            return SdkDriveHolder.INSTANCE
+////        }
+////
+////        private object SdkDriveHolder {
+////            val INSTANCE: SdkDrive = SdkDrive()
+////        }
+////
+////        /**
+////         * 防止单例对象在反序列化时重新生成对象
+////         */
+////        private fun readResolve(): Any {
+////            return SdkDriveHolder.INSTANCE
+////        }
+////    }
+//}

library_core/src/main/java/cn/yyxx/columbus/core/impl/login/LoginActivity.kt

@@ -38,6 +38,8 @@ class LoginActivity : FragmentActivity(), View.OnClickListener {
         private set
 
     private lateinit var rootContainer: ConstraintLayout
+
+    //    private lateinit var loginContainer: ViewStub
     private lateinit var loginContainer: ConstraintLayout
     private lateinit var tabLayout: TabLayout
     private lateinit var viewPager: NoScrollViewPager
@@ -86,6 +88,7 @@ class LoginActivity : FragmentActivity(), View.OnClickListener {
         userSignInImpl = UserSignInImpl(this, object : UserSignInImpl.ISignInCallback {
             override fun onSuccess(result: String) {
                 hideChooseDialog()
+//                userLoginVerify(JSONObject(result))
                 this@LoginActivity.finish()
                 implCallback?.onResult(0, result)
             }
@@ -355,6 +358,9 @@ class LoginActivity : FragmentActivity(), View.OnClickListener {
                     chooseDialog = null
                     loginContainer.visibility = View.VISIBLE
                 }
+                ClickType.ACTION_GUEST_MODE -> {
+                    userSignInImpl.guestLogin(this@LoginActivity)
+                }
             }
         }
     }
@@ -364,6 +370,7 @@ class LoginActivity : FragmentActivity(), View.OnClickListener {
         hideBar()
     }
 
+
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
         data?.apply {
@@ -380,16 +387,31 @@ class LoginActivity : FragmentActivity(), View.OnClickListener {
     }
 
     private fun userAutoLogin() {
-        Logger.d("userAutoLogin")
-    }
-
-    private fun userRegister() {
-
+        session?.apply {
+            when (loginType) {
+                LoginType.TYPE_GUEST_LOGIN -> userSignInImpl.guestLogin(this@LoginActivity)
+                LoginType.TYPE_FACEBOOK_LOGIN -> userSignInImpl.facebookLogin(this@LoginActivity)
+                LoginType.TYPE_GOOGLE_LOGIN -> userSignInImpl.googleLogin(this@LoginActivity)
+                LoginType.TYPE_ACCOUNT_LOGIN -> userSignInImpl.accountLogin(this@LoginActivity, userName, pwd)
+            }
+        }
     }
 
-    private fun userLoginVerify() {
-
-    }
+//    fun userRegister(registerParams: JSONObject) {
+//        SdkRequest.getInstance().registerUser(this, registerParams, object : IRequestCallback {
+//            override fun onResponse(resultInfo: ResultInfo) {
+//                Logger.d(resultInfo)
+//            }
+//        })
+//    }
+//
+//    private fun userLoginVerify(loginParams: JSONObject) {
+//        SdkRequest.getInstance().userVerify(this, loginParams, object : IRequestCallback {
+//            override fun onResponse(resultInfo: ResultInfo) {
+//                Logger.d(resultInfo)
+//            }
+//        })
+//    }
 
     private fun changeTimeNum() {
         if (!TimeDownUtils.isRunning()) {

library_core/src/main/java/cn/yyxx/columbus/core/impl/login/UserSignInImpl.kt

@@ -1,10 +1,18 @@
 package cn.yyxx.columbus.core.impl.login
 
 import android.app.Activity
+import android.content.Context
 import android.content.Intent
+import android.text.TextUtils
 import cn.yyxx.columbus.base.utils.Logger
 import cn.yyxx.columbus.base.utils.ParamsUtils
 import cn.yyxx.columbus.core.entity.LoginType
+import cn.yyxx.columbus.core.entity.ResultInfo
+import cn.yyxx.columbus.core.entity.SdkBackLoginInfo
+import cn.yyxx.columbus.core.entity.Session
+import cn.yyxx.columbus.core.internal.IRequestCallback
+import cn.yyxx.columbus.core.network.SdkRequest
+import cn.yyxx.columbus.core.utils.SessionUtils
 import cn.yyxx.support.hawkeye.ToastUtils
 import com.facebook.*
 import com.facebook.login.LoginManager
@@ -25,7 +33,7 @@ import java.util.*
  * @author #Suyghur.
  * Created on 2021/06/18
  */
-class UserSignInImpl constructor(val activity: LoginActivity, val callback: ISignInCallback) {
+class UserSignInImpl constructor(val activity: LoginActivity, private val callback: ISignInCallback) {
 
     private var fbCallback: CallbackManager? = null
     private var googleSignInClient: GoogleSignInClient? = null
@@ -56,7 +64,7 @@ class UserSignInImpl constructor(val activity: LoginActivity, val callback: ISig
                         jsonObject.put("login_type", LoginType.TYPE_FACEBOOK_LOGIN)
                         jsonObject.put("third_plat_id", AccessToken.getCurrentAccessToken().userId)
                         jsonObject.put("third_plat_token", AccessToken.getCurrentAccessToken().token)
-                        callback.onSuccess(jsonObject.toString())
+                        userLoginVerify(activity, jsonObject)
                     } catch (e: JSONException) {
                         e.printStackTrace()
                         callback.onFailed("Facebook登录异常")
@@ -101,7 +109,7 @@ class UserSignInImpl constructor(val activity: LoginActivity, val callback: ISig
                 jsonObject.put("login_type", LoginType.TYPE_GOOGLE_LOGIN)
                 jsonObject.put("third_plat_id", account?.id)
                 jsonObject.put("third_plat_token", account?.idToken)
-                callback.onSuccess(jsonObject.toString())
+                userLoginVerify(activity, jsonObject)
             } catch (e: JSONException) {
                 e.printStackTrace()
                 callback.onFailed("Google登录异常")
@@ -114,11 +122,105 @@ class UserSignInImpl constructor(val activity: LoginActivity, val callback: ISig
 
 
     fun guestLogin(activity: Activity) {
+        try {
+            val jsonObject = JSONObject()
+            jsonObject.put("login_type", LoginType.TYPE_GUEST_LOGIN)
+            jsonObject.put("third_plat_id", "")
+            jsonObject.put("third_plat_token", "")
+            userLoginVerify(activity, jsonObject)
+        } catch (e: JSONException) {
+            e.printStackTrace()
+            callback.onFailed("游客登录异常")
+        }
+    }
+
+    fun accountLogin(context: Context, userName: String, pwd: String) {
+        try {
+            val jsonObject = JSONObject()
+            jsonObject.put("login_type", LoginType.TYPE_ACCOUNT_LOGIN)
+            jsonObject.put("uname", userName)
+            jsonObject.put("pwd", pwd)
+            userLoginVerify(context, jsonObject)
+        } catch (e: JSONException) {
+            e.printStackTrace()
+            callback.onFailed("用户登录异常")
+        }
+    }
+
+    fun userRegister(context: Context, userName: String, pwd: String) {
+        try {
+            val registerParams = JSONObject()
+            registerParams.put("uname", userName)
+            registerParams.put("pwd", pwd)
+            SdkRequest.getInstance().registerUser(context, registerParams, object : IRequestCallback {
+                override fun onResponse(resultInfo: ResultInfo) {
+                    if (resultInfo.code == 1 && !TextUtils.isEmpty(resultInfo.data)) {
+                        try {
+                            val jsonObject = JSONObject(resultInfo.data)
+                            SdkBackLoginInfo.instance.userId = jsonObject.getString("uid")
+                            SdkBackLoginInfo.instance.token = jsonObject.getString("token")
+                            SdkBackLoginInfo.instance.isRegUser = jsonObject.getInt("is_reg_user") == 1
+                            SdkBackLoginInfo.instance.hasBindAccount = jsonObject.getInt("has_bind_account") == 1
+                            SdkBackLoginInfo.instance.hasBindPhone = jsonObject.getInt("has_bind_phone") == 1
+                            SdkBackLoginInfo.instance.loginType = LoginType.TYPE_ACCOUNT_LOGIN
+
+                            with(Session()) {
+                                userId = SdkBackLoginInfo.instance.userId
+                                loginType = SdkBackLoginInfo.instance.loginType
+                                this.userName = userName
+                                this.pwd = pwd
+                                SessionUtils.getInstance().saveSession(context, this)
+                            }
+                            callback.onSuccess(SdkBackLoginInfo.instance.toJsonString())
+                        } catch (e: JSONException) {
+                            e.printStackTrace()
+                            callback.onFailed("用户注册异常")
+                        }
+                    } else {
+                        callback.onFailed("用户注册异常")
+                    }
+                }
+            })
+        } catch (e: Exception) {
+            e.printStackTrace()
+            callback.onFailed("用户注册异常")
+        }
 
     }
 
-    fun accountLogin(activity: Activity) {
+    private fun userLoginVerify(context: Context, loginParams: JSONObject) {
+        SdkRequest.getInstance().userVerify(context, loginParams, object : IRequestCallback {
+            override fun onResponse(resultInfo: ResultInfo) {
+                if (resultInfo.code == 1 && !TextUtils.isEmpty(resultInfo.data)) {
+                    try {
+                        val jsonObject = JSONObject(resultInfo.data)
+                        SdkBackLoginInfo.instance.userId = jsonObject.getString("uid")
+                        SdkBackLoginInfo.instance.token = jsonObject.getString("token")
+                        SdkBackLoginInfo.instance.isRegUser = jsonObject.getInt("is_reg_user") == 1
+                        SdkBackLoginInfo.instance.hasBindAccount = jsonObject.getInt("has_bind_account") == 1
+                        SdkBackLoginInfo.instance.hasBindPhone = jsonObject.getInt("has_bind_phone") == 1
+                        SdkBackLoginInfo.instance.loginType = loginParams.getInt("login_type")
+
+                        with(Session()) {
+                            userId = SdkBackLoginInfo.instance.userId
+                            loginType = SdkBackLoginInfo.instance.loginType
+                            if (loginType == LoginType.TYPE_ACCOUNT_LOGIN) {
+                                userName = loginParams.getString("uname")
+                                pwd = loginParams.getString("pwd")
+                            }
+                            SessionUtils.getInstance().saveSession(context, this)
+                        }
+                        callback.onSuccess(SdkBackLoginInfo.instance.toJsonString())
+                    } catch (e: JSONException) {
+                        e.printStackTrace()
+                        callback.onFailed("登录校验异常")
+                    }
+                } else {
+                    callback.onFailed("登录校验异常")
+                }
 
+            }
+        })
     }
 
     fun onSignInResult(requestCode: Int, resultCode: Int, intent: Intent) {

library_core/src/main/java/cn/yyxx/columbus/core/impl/login/fragment/LauncherFragment.kt

@@ -94,6 +94,7 @@ class LauncherFragment : Fragment(), View.OnClickListener {
 
         eetPwd = view.findViewById(ResUtils.getResId(requireActivity(), "yyxx_eet_pwd", "id"))
         eetPwd.apply {
+            editText.inputType = InputType.TYPE_TEXT_VARIATION_PASSWORD or InputType.TYPE_CLASS_TEXT
             leftImageView.setBackgroundResource(ResUtils.getResId(requireActivity(), "yyxx_pwd_img", "drawable"))
             leftImageView.visibility = View.VISIBLE
             editText.setHint(ResUtils.getResId(requireActivity(), "yyxx_hint_pwd", "string"))
@@ -341,12 +342,20 @@ class LauncherFragment : Fragment(), View.OnClickListener {
         v?.apply {
             when (tag as Int) {
                 ClickType.ACTION_FORGET -> showForgetPwdDialog()
-//                ClickType.ACTION_LAUNCHER->
+                ClickType.ACTION_LAUNCHER -> {
+//                    val jsonObject = JSONObject()
+//                    jsonObject.put("login_type", LoginType.TYPE_ACCOUNT_LOGIN)
+//                    jsonObject.put("uname", eetAccount.editText.text)
+//                    jsonObject.put("pwd", eetPwd.editText.text)
+                    val userName = eetAccount.editText.text.trim().toString()
+                    val pwd = eetPwd.editText.text.trim().toString()
+                    loginImpl.userSignInImpl.accountLogin(requireActivity(), userName, pwd)
+                }
                 ClickType.ACTION_CLICK_CHECK -> changeCheck()
                 ClickType.ACTION_CLICK_AGREEMENT -> showAgreementDialog()
                 ClickType.ACTION_GOOGLE_MODE -> loginImpl.userSignInImpl.googleLogin(requireActivity())
                 ClickType.ACTION_FACEBOOK_MODE -> loginImpl.userSignInImpl.facebookLogin(requireActivity())
-
+                ClickType.ACTION_GUEST_MODE -> loginImpl.userSignInImpl.guestLogin(requireActivity())
             }
         }
     }

library_core/src/main/java/cn/yyxx/columbus/core/impl/login/fragment/RegisterFragment.kt

@@ -17,6 +17,7 @@ import cn.yyxx.columbus.core.impl.login.LoginActivity
 import cn.yyxx.columbus.core.ui.EventEditText
 import cn.yyxx.columbus.core.ui.dialog.AgreementDialog
 import cn.yyxx.support.ResUtils
+import org.json.JSONException
 
 /**
  * @author #Suyghur.
@@ -69,6 +70,7 @@ class RegisterFragment : Fragment(), View.OnClickListener {
 
         eetPwd = view.findViewById(ResUtils.getResId(requireActivity(), "yyxx_eet_pwd", "id"))
         eetPwd.apply {
+            editText.inputType = InputType.TYPE_TEXT_VARIATION_PASSWORD or InputType.TYPE_CLASS_TEXT
             leftImageView.setBackgroundResource(ResUtils.getResId(requireActivity(), "yyxx_pwd_img", "drawable"))
             leftImageView.visibility = View.VISIBLE
             editText.setHint(ResUtils.getResId(requireActivity(), "yyxx_hint_register_pwd", "string"))
@@ -158,6 +160,15 @@ class RegisterFragment : Fragment(), View.OnClickListener {
             when (tag as Int) {
                 ClickType.ACTION_CLICK_CHECK -> changeCheck()
                 ClickType.ACTION_CLICK_AGREEMENT -> showAgreementDialog()
+                ClickType.ACTION_REGISTER -> {
+                    try {
+                        val userName = eetAccount.editText.text.trim().toString()
+                        val pwd = eetPwd.editText.text.trim().toString()
+                        loginImpl.userSignInImpl.userRegister(requireActivity(), userName, pwd)
+                    } catch (e: JSONException) {
+                        e.printStackTrace()
+                    }
+                }
             }
         }
 

library_core/src/main/java/cn/yyxx/columbus/core/network/Host.kt

@@ -10,9 +10,9 @@ import cn.yyxx.support.HostModelUtils
 object Host {
 
     private const val DEFAULT_ONLINE_HOST = ""
-    private const val DEFAULT_TEST_HOST = ""
+    private const val DEFAULT_TEST_HOST = "http://47.103.149.24:81"
 
-    private var HOST = ""
+    var HOST = ""
 
     /**
      * 默认线上环境
@@ -20,9 +20,9 @@ object Host {
     var IP_MODEL = 3
 
     var BASIC_ROUTE_INIT_SDK = "activate"
-    var BASIC_ROUTE_LOGIN = ""
-    var BASIC_ROUTE_THIRD_PART_LOGIN = ""
-    var BASIC_ROUTE_REGISTER = ""
+    var BASIC_ROUTE_LOGIN = "member_login"
+    var BASIC_ROUTE_THIRD_PART_LOGIN = "third_plat_login"
+    var BASIC_ROUTE_REGISTER = "member_register"
     var BASIC_ROUTE_FORGET_PWD = ""
     var BASIC_ROUTE_GET_ORDER_ID = ""
     var BASIC_ROUTE_NOTIFY_ORDER = ""

library_core/src/main/java/cn/yyxx/columbus/core/network/SdkRequest.kt

@@ -1,7 +1,16 @@
 package cn.yyxx.columbus.core.network
 
 import android.content.Context
+import android.text.TextUtils
+import cn.yyxx.columbus.Version
+import cn.yyxx.columbus.base.utils.ParamsUtils
+import cn.yyxx.columbus.core.entity.LoginType
 import cn.yyxx.columbus.core.internal.IRequestCallback
+import cn.yyxx.support.AppUtils
+import cn.yyxx.support.DensityUtils
+import cn.yyxx.support.device.DeviceInfoUtils
+import cn.yyxx.support.gaid.GAIDUtils
+import org.json.JSONException
 import org.json.JSONObject
 
 /**
@@ -13,8 +22,71 @@ class SdkRequest {
 
     fun initSdk(context: Context, callback: IRequestCallback) {
         val jsonObject = JSONObject()
+        jsonObject.put("common", getCommon(context))
         jsonObject.put("route_path", Host.BASIC_ROUTE_INIT_SDK)
-        VolleyRequest.post(context, "url", jsonObject, callback)
+        VolleyRequest.post(context, Host.HOST, jsonObject, callback)
+    }
+
+    fun userVerify(context: Context, jsonObject: JSONObject, callback: IRequestCallback) {
+        try {
+            jsonObject.put("common", getCommon(context))
+            if (jsonObject.getInt("login_type") == LoginType.TYPE_ACCOUNT_LOGIN) {
+                jsonObject.put("route_path", Host.BASIC_ROUTE_LOGIN)
+            } else {
+                jsonObject.put("route_path", Host.BASIC_ROUTE_THIRD_PART_LOGIN)
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+        VolleyRequest.post(context, Host.HOST, jsonObject, callback)
+    }
+
+    fun userVerifyThirdPart(context: Context, jsonObject: JSONObject, callback: IRequestCallback) {
+        try {
+            jsonObject.put("route_path", Host.BASIC_ROUTE_THIRD_PART_LOGIN)
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+        VolleyRequest.post(context, Host.HOST, jsonObject, callback)
+    }
+
+    fun registerUser(context: Context, jsonObject: JSONObject, callback: IRequestCallback) {
+        try {
+            jsonObject.put("route_path", Host.BASIC_ROUTE_REGISTER)
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+        VolleyRequest.post(context, Host.HOST, jsonObject, callback)
+    }
+
+    private fun getCommon(context: Context): JSONObject {
+        val common = JSONObject()
+        try {
+            common.put("gcp_code", ParamsUtils.getGcpCode(context))
+            common.put("game_code", ParamsUtils.getGameCode(context))
+            common.put("package_name", context.packageName)
+            common.put("server_version", Version.SERVER_VERSION)
+            common.put("client_version", Version.VERSION_NAME)
+            common.put("game_version", AppUtils.getVersionName(context))
+            common.put("screen", DensityUtils.getResolution(context))
+            common.put("simulator", DeviceInfoUtils.isEmulator(context))
+            if (TextUtils.isEmpty(GAIDUtils.getGoogleAdid())) {
+                common.put("device_id", DeviceInfoUtils.getAndroidDeviceId(context))
+                common.put("id_type", 1)
+            } else {
+                common.put("device_id", GAIDUtils.getGoogleAdid())
+                common.put("id_type", 0)
+            }
+            common.put("network", DeviceInfoUtils.getNetworkType(context))
+            common.put("os", "android")
+            common.put("os_version", DeviceInfoUtils.getDeviceSoftwareVersion())
+            common.put("mobile_model", DeviceInfoUtils.getDeviceModel())
+            common.put("mobile_mfrs", DeviceInfoUtils.getDeviceManufacturer())
+            common.put("mobile_brand", DeviceInfoUtils.getDeviceBrand())
+        } catch (e: JSONException) {
+            e.printStackTrace()
+        }
+        return common
     }
 
 

library_core/src/main/java/cn/yyxx/columbus/core/network/VolleyRequest.kt

@@ -3,11 +3,17 @@ package cn.yyxx.columbus.core.network
 import android.content.Context
 import cn.yyxx.columbus.base.utils.Logger
 import cn.yyxx.columbus.core.entity.ResultInfo
-import cn.yyxx.columbus.core.impl.SdkDrive
 import cn.yyxx.columbus.core.internal.IRequestCallback
-import cn.yyxx.support.encryption.Base64Utils
-import cn.yyxx.support.encryption.HexUtils
+import cn.yyxx.support.JsonUtils
+import cn.yyxx.support.StrUtils
+import cn.yyxx.support.encryption.Md5Utils
+import cn.yyxx.support.encryption.aes.AesUtils
+import cn.yyxx.support.volley.VolleySingleton
+import cn.yyxx.support.volley.source.DefaultRetryPolicy
+import cn.yyxx.support.volley.source.Response
 import cn.yyxx.support.volley.source.VolleyError
+import cn.yyxx.support.volley.source.toolbox.JsonObjectRequest
+import org.json.JSONException
 import org.json.JSONObject
 
 /**
@@ -20,61 +26,91 @@ object VolleyRequest {
 
     fun post(context: Context, host: String, jsonObject: JSONObject, callback: IRequestCallback) {
         try {
-            val json = SdkDrive.getInstance().invokeJob(context, jsonObject.toString())
-            val obj = JSONObject(json)
-            //因为native c++中aes加密后生成的base64字符串可能会因为\0的原因被截断，所以使用hex进行编码
-            //得到json对象后将p内容由hex转为base64，然后再赋值回json对象中的p。
-            //ts因为是rsa加密，得到的base64字符串不会被截断，可能因为是长度远比aes生成的报文长度短
-            val hexP = obj.getString("p")
-            val tmp = HexUtils.hexString2Bytes(hexP)
-            val base64P = Base64Utils.encode(tmp)
-            obj.put("p", base64P)
-            Logger.d(obj.toString())
-//            val request = object : JsonObjectRequest(Method.POST, url, obj, Response.Listener {
-//                val resultInfo = ResultInfo()
-//                resultInfo.code = -1
-//                resultInfo.msg = "接口请求异常"
-//                it?.apply {
-//                    try {
-//                        resultInfo.code = it.getInt("code")
-//                        resultInfo.msg = it.getString("msg")
-//                        resultInfo.data = if (JsonUtils.hasJsonKey(it, "data")) {
+            val time = System.currentTimeMillis().toString()
+            val randomKey = time + StrUtils.getRandomString(16)
+            val rawKey = Md5Utils.encodeByMD5(randomKey)
+            val aesKey = Md5Utils.encodeByMD5(rawKey + StrUtils.reverseString(rawKey))
+            val p = AesUtils.encrypt(aesKey.substring(8, 24), jsonObject.toString())
+
+            Logger.d("请求路由 : ${jsonObject["route_path"]}")
+            Logger.d("请求参数 : $jsonObject")
+            Logger.logHandler("请求路由 : ${jsonObject["route_path"]}\n")
+            Logger.logHandler("请求参数 : $jsonObject\n")
+            val obj = JSONObject()
+            obj.put("p", p)
+            obj.put("ts", rawKey)
+//            val json = SdkDrive.invokeJob(context, jsonObject.toString())
+//            val obj = JSONObject(json)
+//            //因为native c++中aes加密后生成的base64字符串可能会因为\0的原因被截断，所以使用hex进行编码
+//            //得到json对象后将p内容由hex转为base64，然后再赋值回json对象中的p。
+//            //ts因为是rsa加密，得到的base64字符串不会被截断，可能因为是长度远比aes生成的报文长度短
+//            val hexP = obj.getString("p")
+//            Logger.d("hex: $hexP")
+//            val tmp = HexUtils.hexString2Bytes(hexP)
+//            val base64P = Base64Utils.encode(tmp)
+//            obj.put("p", base64P)
+
+            val request = object : JsonObjectRequest(Method.POST, host, obj, Response.Listener {
+                val resultInfo = ResultInfo()
+                resultInfo.code = -1
+                resultInfo.msg = "接口请求异常"
+                it?.apply {
+                    try {
+                        resultInfo.code = it.getInt("code")
+                        resultInfo.msg = it.getString("msg")
+                        resultInfo.data = if (JsonUtils.hasJsonKey(it, "data")) {
 //                            //返回要对p进行base64 -> hex
 //                            val responseObj = it.getJSONObject("data")
 //                            val base64P2 = responseObj.getString("p")
 //                            val tmp2 = Base64Utils.decode(base64P2)
 //                            val hexP2 = HexUtils.bytes2HexString(tmp2)
 //                            responseObj.put("p", hexP2)
-//                            SdkDrive.getInstance().parseJob(context, responseObj.toString())
-//                        } else {
-//                            ""
-//                        }
-//                    } catch (e: JSONException) {
-//                        e.printStackTrace()
-//                    }
-//                }
-//                callback.onResponse(resultInfo)
-//            }, Response.ErrorListener {
-//                it?.apply {
-//                    Logger.e("postByVolley onErrorResponse : $it")
-//                    callback.onResponse(getErrorResultInfo(it))
-//                }
-//            }) {
-//                override fun getHeaders(): MutableMap<String, String> {
-//                    val headers = HashMap<String, String>()
-//                    headers["Accept"] = "application/json"
-//                    headers["Content-Type"] = "application/json;charset=UTF-8"
-//                    return headers
-//                }
-//            }
-//            //设置超时时间
-//            request.retryPolicy = DefaultRetryPolicy(MAX_TIMEOUT, 1, 1.0f)
-//            VolleySingleton.getInstance(context.applicationContext).addToRequestQueue(context.applicationContext, request)
+//                            SdkDrive.parseJob(context, responseObj.toString())
+                            parseResopnse(it.getJSONObject("data"))
+                        } else {
+                            ""
+                        }
+                    } catch (e: JSONException) {
+                        e.printStackTrace()
+                    }
+                }
+                it.put("data", resultInfo.data)
+                Logger.d("返回信息 : $it")
+                Logger.logHandler("返回信息 : $it\n")
+                callback.onResponse(resultInfo)
+            }, Response.ErrorListener {
+                it?.apply {
+                    Logger.e("postByVolley onErrorResponse : $it")
+                    callback.onResponse(getErrorResultInfo(it))
+                }
+            }) {
+                override fun getHeaders(): MutableMap<String, String> {
+                    val headers = HashMap<String, String>()
+                    headers["Accept"] = "application/json"
+                    headers["Content-Type"] = "application/json;charset=UTF-8"
+                    return headers
+                }
+            }
+            //设置超时时间
+            request.retryPolicy = DefaultRetryPolicy(MAX_TIMEOUT, 1, 1.0f)
+            VolleySingleton.getInstance(context.applicationContext).addToRequestQueue(context.applicationContext, request)
         } catch (e: Exception) {
             e.printStackTrace()
         }
     }
 
+    private fun parseResopnse(data: JSONObject): String {
+        try {
+            val p = data.getString("p")
+            val ts = data.getString("ts")
+            val aesKey = Md5Utils.encodeByMD5(ts + StrUtils.reverseString(ts))
+            return AesUtils.decrypt(aesKey.substring(8, 24), p)
+        } catch (e: JSONException) {
+            e.printStackTrace()
+        }
+        return ""
+    }
+
     private fun getErrorResultInfo(volleyError: VolleyError): ResultInfo {
         val resultInfo = ResultInfo()
         resultInfo.code = 400

library_core/src/main/java/cn/yyxx/columbus/core/utils/MMKVUtils.kt

@@ -0,0 +1,52 @@
+package cn.yyxx.columbus.core.utils
+
+import android.content.Context
+import cn.yyxx.columbus.base.utils.Logger
+import com.tencent.mmkv.MMKV
+import com.tencent.mmkv.MMKVHandler
+import com.tencent.mmkv.MMKVLogLevel
+import com.tencent.mmkv.MMKVRecoverStrategic
+import java.io.File
+
+
+/**
+ * @author #Suyghur.
+ * Created on 2021/06/25
+ */
+class MMKVUtils private constructor() : MMKVHandler {
+
+    var mmkv: MMKV? = null
+
+    fun init(context: Context) {
+        MMKV.initialize(context, context.getExternalFilesDir("")!!.absolutePath + File.separator + "/user_info")
+        mmkv = MMKV.defaultMMKV()
+    }
+
+    override fun onMMKVCRCCheckFail(mmapID: String?): MMKVRecoverStrategic {
+        return MMKVRecoverStrategic.OnErrorDiscard
+    }
+
+    override fun onMMKVFileLengthError(mmapID: String?): MMKVRecoverStrategic {
+        return MMKVRecoverStrategic.OnErrorDiscard
+    }
+
+
+    override fun wantLogRedirecting(): Boolean {
+        return false
+    }
+
+    override fun mmkvLog(level: MMKVLogLevel?, file: String?, line: Int, function: String?, message: String?) {
+        val log = "<${file.toString()}:${line}::${function}>${message}"
+        Logger.i(log)
+    }
+
+    companion object {
+        fun getInstance(): MMKVUtils {
+            return MMKVUtilsHolder.INSTANCE
+        }
+    }
+
+    private object MMKVUtilsHolder {
+        val INSTANCE: MMKVUtils = MMKVUtils()
+    }
+}

library_core/src/main/java/cn/yyxx/columbus/core/utils/SessionUtils.kt

@@ -5,6 +5,8 @@ import android.text.TextUtils
 import cn.yyxx.columbus.base.utils.Logger
 import cn.yyxx.columbus.core.entity.LoginType
 import cn.yyxx.columbus.core.entity.Session
+import cn.yyxx.columbus.core.network.Host
+import cn.yyxx.support.HostModelUtils
 import cn.yyxx.support.JsonUtils
 import org.json.JSONArray
 import org.json.JSONException
@@ -44,13 +46,19 @@ class SessionUtils private constructor() {
             for (item in userList) {
                 jsonArray.put(item.toJSONObject())
             }
-            val filePath = FileUtils.getUserInfoFilePath(context)
+//            val filePath = FileUtils.getUserInfoFilePath(context)
             try {
                 jsonObject.put("info", jsonArray)
             } catch (e: JSONException) {
                 e.printStackTrace()
             }
-            FileUtils.writeFile(jsonObject.toString(), filePath)
+            val keyName = when (Host.IP_MODEL) {
+                HostModelUtils.ENV_ONLINE -> "online"
+                HostModelUtils.ENV_TEST -> "test"
+                else -> "online"
+            }
+            MMKVUtils.getInstance().mmkv?.encode(keyName, jsonObject.toString())
+//            FileUtils.writeFile(jsonObject.toString(), filePath)
         }
     }
 
@@ -89,8 +97,18 @@ class SessionUtils private constructor() {
     }
 
     private fun getLocalSession(context: Context): MutableList<Session> {
-        val json = FileUtils.readFile(FileUtils.getUserInfoFilePath(context))
-        return toList(json)
+        val keyName = when (Host.IP_MODEL) {
+            HostModelUtils.ENV_ONLINE -> "online"
+            HostModelUtils.ENV_TEST -> "test"
+            else -> "online"
+        }
+        val json = MMKVUtils.getInstance().mmkv?.decodeString(keyName)
+//        val json = FileUtils.readFile(FileUtils.getUserInfoFilePath(context))
+        return if (TextUtils.isEmpty(json)) {
+            mutableListOf()
+        } else {
+            toList(json!!)
+        }
     }
 
     @Synchronized
@@ -146,11 +164,11 @@ class SessionUtils private constructor() {
             for (i in 0 until infoObject.length()) {
                 val session = Session()
                 val obj = infoObject.getJSONObject(i)
-                if (JsonUtils.hasJsonKey(obj, "user_id")) {
-                    session.userId = obj.getString("user_id")
+                if (JsonUtils.hasJsonKey(obj, "uid")) {
+                    session.userId = obj.getString("uid")
                 }
-                if (JsonUtils.hasJsonKey(obj, "user_name")) {
-                    session.userName = obj.getString("user_name")
+                if (JsonUtils.hasJsonKey(obj, "uname")) {
+                    session.userName = obj.getString("uname")
                 }
                 if (JsonUtils.hasJsonKey(obj, "pwd")) {
                     session.pwd = obj.getString("pwd")