Merge branch 'feature/v1.0.0' of http://gogs.yyxxgame.com:3000/Client/EYuanGameSdk-KTX into feature/v1.0.0

* 'feature/v1.0.0' of http://gogs.yyxxgame.com:3000/Client/EYuanGameSdk-KTX:
  v1.0.0开发：native层加密方案优化
  v1.0.0开发：修改core模块中单例写法更符合kotlin规范

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

@@ -11,6 +11,8 @@ import android.view.View
 import android.widget.*
 import cn.yyxx.eyuangame.base.EYuanGame
 import cn.yyxx.eyuangame.base.internal.ICallback
+import cn.yyxx.eyuangame.base.utils.Logger
+import cn.yyxx.eyuangame.core.impl.SdkDrive
 import cn.yyxx.support.hawkeye.LogUtils
 import kotlin.system.exitProcess
 
@@ -29,10 +31,6 @@ class DemoActivity : Activity(), View.OnClickListener {
         Item(4, "04 角色登录上报"),
         Item(5, "05 角色升级上报"),
         Item(6, "06 定额充值"),
-        Item(7, "07 模拟写入5条账号信息"),
-        Item(8, "08 模拟写入游客登录信息"),
-        Item(9, "09 模拟写入Facebook登录信息"),
-        Item(10, "10 模拟写入Google登录信息")
     )
 
 
@@ -106,14 +104,19 @@ class DemoActivity : Activity(), View.OnClickListener {
                     EYuanGame.getInstance().logout(this@DemoActivity, object : ICallback {
                         override fun onResult(code: Int, result: String) {
                             if (code == 0) {
-                                EYuanGame.getInstance().login(this@DemoActivity, false, object : ICallback {
-                                    override fun onResult(code: Int, result: String) {
-                                    }
-                                })
+                                EYuanGame.getInstance()
+                                    .login(this@DemoActivity, false, object : ICallback {
+                                        override fun onResult(code: Int, result: String) {
+                                        }
+                                    })
                             }
                         }
                     })
                 }
+                3 -> {
+                    val result = SdkDrive.instance.test()
+                    Logger.d(result)
+                }
             }
         }
     }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Jun 09 15:49:46 CST 2021
+#Sun Jun 27 19:44:37 CST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip

library_base/src/main/java/cn/yyxx/eyuangame/base/EYuanGame.kt

@@ -51,7 +51,11 @@ class EYuanGame private constructor() {
         if (mSdkBridge == null) {
             mSdkBridge = getSdkBridgeManager(application)
         }
-        SdkBridgeManager.call(Function.ATTACH_BASE_CONTEXT, arrayOf(Application::class.java, Context::class.java), arrayOf(application, context))
+        SdkBridgeManager.call(
+            Function.ATTACH_BASE_CONTEXT,
+            arrayOf(Application::class.java, Context::class.java),
+            arrayOf(application, context)
+        )
     }
 
 
@@ -78,7 +82,11 @@ class EYuanGame private constructor() {
         if (mSdkBridge == null) {
             mSdkBridge = getSdkBridgeManager(application)
         }
-        SdkBridgeManager.call(Function.INIT_APPLICATION, arrayOf(Application::class.java), arrayOf(application))
+        SdkBridgeManager.call(
+            Function.INIT_APPLICATION,
+            arrayOf(Application::class.java),
+            arrayOf(application)
+        )
     }
 
     /**
@@ -107,7 +115,12 @@ class EYuanGame private constructor() {
 
         SdkBridgeManager.call(
             Function.INITIALIZE,
-            arrayOf(Activity::class.java, Boolean::class.java, ICallback::class.java, IInitialize::class.java),
+            arrayOf(
+                Activity::class.java,
+                Boolean::class.java,
+                ICallback::class.java,
+                IInitialize::class.java
+            ),
             arrayOf(activity, isLandscape, callback, initCallback)
         )
     }
@@ -167,7 +180,11 @@ class EYuanGame private constructor() {
         }
 
         clickLogoutTime = System.currentTimeMillis()
-        SdkBridgeManager.call(Function.LOGOUT, arrayOf(Activity::class.java, ICallback::class.java), arrayOf(activity, callback))
+        SdkBridgeManager.call(
+            Function.LOGOUT,
+            arrayOf(Activity::class.java, ICallback::class.java),
+            arrayOf(activity, callback)
+        )
     }
 
     /**
@@ -214,7 +231,11 @@ class EYuanGame private constructor() {
             return
         }
 
-        SdkBridgeManager.call(Function.ROLE_CREATE, arrayOf(Activity::class.java, SdkRoleInfo::class.java), arrayOf(activity, roleInfo))
+        SdkBridgeManager.call(
+            Function.ROLE_CREATE,
+            arrayOf(Activity::class.java, SdkRoleInfo::class.java),
+            arrayOf(activity, roleInfo)
+        )
     }
 
     /**
@@ -232,7 +253,11 @@ class EYuanGame private constructor() {
             return
         }
 
-        SdkBridgeManager.call(Function.ROLE_LAUNCHER, arrayOf(Activity::class.java, SdkRoleInfo::class.java), arrayOf(activity, roleInfo))
+        SdkBridgeManager.call(
+            Function.ROLE_LAUNCHER,
+            arrayOf(Activity::class.java, SdkRoleInfo::class.java),
+            arrayOf(activity, roleInfo)
+        )
     }
 
     /**
@@ -250,7 +275,11 @@ class EYuanGame private constructor() {
             return
         }
 
-        SdkBridgeManager.call(Function.ROLE_LEVEL_UP, arrayOf(Activity::class.java, SdkRoleInfo::class.java), arrayOf(activity, roleInfo))
+        SdkBridgeManager.call(
+            Function.ROLE_LEVEL_UP,
+            arrayOf(Activity::class.java, SdkRoleInfo::class.java),
+            arrayOf(activity, roleInfo)
+        )
     }
 
     /**
@@ -268,7 +297,11 @@ class EYuanGame private constructor() {
             return
         }
 
-        SdkBridgeManager.call(Function.OPEN_EXIT_VIEW, arrayOf(Activity::class.java, ICallback::class.java), arrayOf(activity, callback))
+        SdkBridgeManager.call(
+            Function.OPEN_EXIT_VIEW,
+            arrayOf(Activity::class.java, ICallback::class.java),
+            arrayOf(activity, callback)
+        )
     }
 
     fun onStart(activity: Activity) {
@@ -336,7 +369,11 @@ class EYuanGame private constructor() {
             return
         }
 
-        SdkBridgeManager.call(Function.ON_START, arrayOf(Activity::class.java, Intent::class.java), arrayOf(activity, intent))
+        SdkBridgeManager.call(
+            Function.ON_START,
+            arrayOf(Activity::class.java, Intent::class.java),
+            arrayOf(activity, intent)
+        )
     }
 
     fun getCurrentUserId(): String {
@@ -348,7 +385,11 @@ class EYuanGame private constructor() {
             return ""
         }
 
-        return SdkBridgeManager.callback(Function.GET_CURRENT_USER_ID, emptyArray(), emptyArray()) as String
+        return SdkBridgeManager.callback(
+            Function.GET_CURRENT_USER_ID,
+            emptyArray(),
+            emptyArray()
+        ) as String
     }
 
     fun getSdkVersion(): String {
@@ -385,6 +426,7 @@ class EYuanGame private constructor() {
 
         private const val CLICK_INTERVAL: Int = 1500
 
+        @Keep
         private object ColumbusHolder {
             val INSTANCE: EYuanGame = EYuanGame()
         }
@@ -392,6 +434,7 @@ class EYuanGame private constructor() {
         /**
          * 防止单例对象在反序列化时重新生成对象
          */
+        @Keep
         private fun readResolve(): Any {
             return ColumbusHolder.INSTANCE
         }

library_core/src/main/cpp/aes_utils.cpp

@@ -7,7 +7,8 @@
 #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};
+static const unsigned char HEX[16] = {0x10, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09,
+                                      0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f};
 
 static const unsigned char CHAR_SET[36] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
                                            'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j',
@@ -66,12 +67,17 @@ void AesUtils::RemovePadding(uint8_t *out, size_t length) {
 }
 
 char *AesUtils::GetRawKey() {
-    uint8_t *random_key = GetKey();
+    const int len = 26;
     time_t ts = time(nullptr);
-    char *key = static_cast<char *>(malloc(33));
-    sprintf(key, "%ld%s", ts, random_key);
-    key[33] = '\0';
-    return key;
+    srandom(ts);
+    auto *raw_key = static_cast<char *>(malloc(len + 1));
+    memset(raw_key, 0, len + 1);
+    for (int i = 0; i < 16; ++i) {
+        raw_key[i] = CHAR_SET[random() % 36];
+    }
+    sprintf(raw_key, "%s%ld", raw_key, ts);
+    raw_key[len] = '\0';
+    return raw_key;
 }
 
 uint8_t *AesUtils::GetKey() {
@@ -130,7 +136,9 @@ char *AesUtils::Encrypt(const char *input, const uint8_t *key) {
  * AES解密, CBC, PKCS5Padding
  */
 char *AesUtils::Decrypt(const char *input, const uint8_t *key) {
+
     const uint8_t *iv = GetIv(key);
+//    const uint8_t *iv = reinterpret_cast<const uint8_t *>(ToolKit::StrReverse(reinterpret_cast<const char *>(key)));
 
     size_t len = strlen(input);
     unsigned char *input_des = HexUtils::HexDecode(input);

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

@@ -2,8 +2,8 @@
 // Created by #Suyghur, on 2021/06/11.
 //
 
-#ifndef COLUMBUS_AES_H
-#define COLUMBUS_AES_H
+#ifndef EYUANGAMESDK_KTX_AES_H
+#define EYUANGAMESDK_KTX_AES_H
 
 // #define the macros below to 1/0 to enable/disable the mode of operation.
 //
@@ -55,4 +55,4 @@ void AES_CTR_xcrypt_buffer(uint8_t *output, uint8_t *input, uint32_t length, con
 
 #endif // #if defined(CTR) && (CTR == 1)
 
-#endif //COLUMBUS_AES_H
+#endif //EYUANGAMESDK_KTX_AES_H

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

@@ -2,8 +2,8 @@
 // Created by #Suyghur, on 2021/06/11.
 //
 
-#ifndef COLUMBUS_AES_UTILS_H
-#define COLUMBUS_AES_UTILS_H
+#ifndef EYUANGAMESDK_KTX_AES_UTILS_H
+#define EYUANGAMESDK_KTX_AES_UTILS_H
 
 #include "aes.h"
 
@@ -50,4 +50,4 @@ private:
 #endif
 
 
-#endif //COLUMBUS_AES_UTILS_H
+#endif //EYUANGAMESDK_KTX_AES_UTILS_H

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

@@ -2,8 +2,8 @@
 // Created by #Suyghur, on 2021/06/21.
 //
 
-#ifndef COLUMBUS_COMM_MAP_H
-#define COLUMBUS_COMM_MAP_H
+#ifndef EYUANGAMESDK_KTX_COMM_MAP_H
+#define EYUANGAMESDK_KTX_COMM_MAP_H
 
 
 #include <jni.h>
@@ -24,4 +24,4 @@ private:
 };
 
 
-#endif //COLUMBUS_COMM_MAP_H
+#endif //EYUANGAMESDK_KTX_COMM_MAP_H

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

@@ -2,8 +2,8 @@
 // Created by #Suyghur, on 2021/06/11.
 //
 
-#ifndef COLUMBUS_HEX_UTILS_H
-#define COLUMBUS_HEX_UTILS_H
+#ifndef EYUANGAMESDK_KTX_HEX_UTILS_H
+#define EYUANGAMESDK_KTX_HEX_UTILS_H
 
 #include <stdlib.h>
 #include <string.h>
@@ -27,4 +27,4 @@ private:
 }
 #endif
 
-#endif //COLUMBUS_HEX_UTILS_H
+#endif //EYUANGAMESDK_KTX_HEX_UTILS_H

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

@@ -2,8 +2,8 @@
 // Created by #Suyghur, on 2021/06/11.
 //
 
-#ifndef COLUMBUS_LOGGER_H
-#define COLUMBUS_LOGGER_H
+#ifndef EYUANGAMESDK_KTX_LOGGER_H
+#define EYUANGAMESDK_KTX_LOGGER_H
 
 #include <string>
 #include <android/log.h>
@@ -28,4 +28,4 @@ public:
 
 };
 
-#endif //COLUMBUS_LOGGER_H
+#endif //EYUANGAMESDK_KTX_LOGGER_H

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

@@ -2,8 +2,8 @@
 // Created by #Suyghur, on 2021/05/25.
 //
 
-#ifndef QSGAMESDK_MD5_H
-#define QSGAMESDK_MD5_H
+#ifndef EYUANGAMESDK_KTX_MD5_H
+#define EYUANGAMESDK_KTX_MD5_H
 
 
 #include <string>
@@ -16,9 +16,9 @@
 // usage:
 //      1) feed it blocks of uchars with update()
 //      2) finalize()
-//      3) get hexdigest() string
+//      3) get HexDigest() string
 //      or
-//      MD5(std::string).hexdigest()
+//      MD5(std::string).HexDigest()
 //
 // assumes that char is 8 bit and int is 32 bit
 class MD5 {
@@ -35,7 +35,7 @@ public:
 
     MD5 &finalize();
 
-    std::string hexdigest() const;
+    std::string HexDigest() const;
 
     friend std::ostream &operator<<(std::ostream &, MD5 md5);
 
@@ -80,7 +80,7 @@ private:
     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);
+std::string md5(const std::string& str);
 
 
-#endif //QSGAMESDK_MD5_H
+#endif //EYUANGAMESDK_KTX_MD5_H

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

@@ -2,8 +2,8 @@
 // Created by #Suyghur, on 2021/06/21.
 //
 
-#ifndef COLUMBUS_PARAMS_KIT_H
-#define COLUMBUS_PARAMS_KIT_H
+#ifndef EYUANGAMESDK_KTX_PARAMS_KIT_H
+#define EYUANGAMESDK_KTX_PARAMS_KIT_H
 
 
 #include <string>
@@ -28,4 +28,4 @@ private:
 };
 
 
-#endif //COLUMBUS_PARAMS_KIT_H
+#endif //EYUANGAMESDK_KTX_PARAMS_KIT_H

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

@@ -2,8 +2,8 @@
 // Created by #Suyghur, on 2021/06/21.
 //
 
-#ifndef COLUMBUS_REQUEST_KIT_H
-#define COLUMBUS_REQUEST_KIT_H
+#ifndef EYUANGAMESDK_KTX_REQUEST_KIT_H
+#define EYUANGAMESDK_KTX_REQUEST_KIT_H
 
 #define PUBLIC_KEY "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCbROlODv7iVaFhRAomQ9kSoV+whoebwVUDWUd968V8jbLQg0bAh6ad22O1bo33f4zNmIuDzdQMGOVgRyuvKsS9GyE+gh4XPDpSUmi/bZTl0wr8Y/yTi8eW+sXxn6Ao4oo4bg+qPewUxjTS2u4Pe1Zl3IC48HFALTAo0PSSXS5b7wIDAQAB"
 
@@ -30,4 +30,4 @@ private:
 };
 
 
-#endif //COLUMBUS_REQUEST_KIT_H
+#endif //EYUANGAMESDK_KTX_REQUEST_KIT_H

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

@@ -2,8 +2,8 @@
 // Created by #Suyghur, on 2021/06/12.
 //
 
-#ifndef COLUMBUS_TOOLKIT_H
-#define COLUMBUS_TOOLKIT_H
+#ifndef EYUANGAMESDK_KTX_TOOLKIT_H
+#define EYUANGAMESDK_KTX_TOOLKIT_H
 
 
 #include <jni.h>
@@ -46,9 +46,11 @@ public:
 
     static std::string ToJsonString(const Json::Value &root);
 
-    static Json::Value ToJsonObject(const std::string& json);
+    static Json::Value ToJsonObject(const std::string &json);
+
+    static char *StrReverse(const char *src);
 
 };
 
 
-#endif //COLUMBUS_TOOLKIT_H
+#endif //EYUANGAMESDK_KTX_TOOLKIT_H

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

@@ -2,8 +2,8 @@
 // Created by #Suyghur, on 2021/06/22.
 //
 
-#ifndef COLUMBUS_URL_UTILS_H
-#define COLUMBUS_URL_UTILS_H
+#ifndef EYUANGAMESDK_KTX_URL_UTILS_H
+#define EYUANGAMESDK_KTX_URL_UTILS_H
 
 
 #include <string>
@@ -16,4 +16,4 @@ public:
 };
 
 
-#endif //COLUMBUS_URL_UTILS_H
+#endif //EYUANGAMESDK_KTX_URL_UTILS_H

library_core/src/main/cpp/md5.cpp

@@ -293,7 +293,7 @@ MD5 &MD5::finalize() {
 //////////////////////////////
 
 // return hex representation of digest as string
-std::string MD5::hexdigest() const {
+std::string MD5::HexDigest() const {
     if (!finalized)
         return "";
 
@@ -308,13 +308,13 @@ std::string MD5::hexdigest() const {
 //////////////////////////////
 
 std::ostream &operator<<(std::ostream &out, MD5 md5) {
-    return out << md5.hexdigest();
+    return out << md5.HexDigest();
 }
 
 //////////////////////////////
 
-std::string md5(const std::string str) {
+std::string md5(const std::string& str) {
     MD5 md5 = MD5(str);
 
-    return md5.hexdigest();
+    return md5.HexDigest();
 }

library_core/src/main/cpp/request_kit.cpp

@@ -26,7 +26,7 @@
 //    root["ts"] = ts;
 //    return ToolKit::ToJsonString(root);
 //}
-//
+
 //std::string RequestKit::DecryptResponse(JNIEnv *env, jobject context, jstring data) {
 //    //报文原文
 //    return HandleResponse(env, data);

library_core/src/main/cpp/sdk_drive.cpp

@@ -13,66 +13,6 @@
 #include "include/logger.h"
 #include "aes/aes_utils.h"
 
-static void GetAesKey(JNIEnv *env, jobject thiz) {
-    uint8_t *aes_key = AesUtils::GetKey();
-    uint8_t *iv = AesUtils::GetIv(aes_key);
-    LOGD("%s", aes_key);
-    LOGD("%s", iv);
-    LOGD("------ invoke free() ------ ");
-    free(aes_key);
-    free(iv);
-//    free((void *) aes_key);
-//    free((void *) iv);
-    aes_key = nullptr;
-    iv = nullptr;
-    LOGD("%s", aes_key);
-    LOGD("%s", iv);
-}
-
-//static jstring AesEncrypt(JNIEnv *env, jobject thiz, jstring src) {
-//    const char *src_ = env->GetStringUTFChars(src, JNI_FALSE);
-//    char *raw = AesUtils::Encrypt(src_);
-//    LOGD("%s", raw);
-//
-//    env->ReleaseStringUTFChars(src, src_);
-//
-//    jstring result = ToolKit::GetJString(env, raw);
-//    free(raw);
-//
-//    return result;
-//}
-
-static jstring AesDecrypt(JNIEnv *env, jobject thiz, jstring raw, jstring key) {
-    const char *raw_ = env->GetStringUTFChars(raw, JNI_FALSE);
-    const auto *key_ = reinterpret_cast<const uint8_t *>(env->GetStringUTFChars(key, JNI_FALSE));
-    char *src = AesUtils::Decrypt(raw_, key_);
-    env->ReleaseStringUTFChars(raw, raw_);
-    jstring result = ToolKit::GetJString(env, src);
-    free(src);
-    return result;
-}
-
-
-//static jstring RsaEncrypt(JNIEnv *env, jobject thiz, jstring src) {
-//    const char *src_ = env->GetStringUTFChars(src, JNI_FALSE);
-//    std::string key = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCAVatPhPaZtxBkLBZDnOLf7no6VfnjBRMXhpOnWmkkDX4zurB/OKisYDFnR0UUVnKn717+absfLlDk9HZWBcTMznsUju9fuXlu3Elr8HeI3en7E0KIQzxkY1GT1+qtZ+tCjWuyMmUw4vWpO8/MRU3f6nc4io3w+7N+dP24BIo0ZwIDAQAB";
-//    std::string raw = RsaUtils::EncryptByPublicKey(key, src_);
-////    LOGD("base64 raw : %s", raw.c_str());
-//    env->ReleaseStringUTFChars(src, src_);
-//    jstring result = ToolKit::GetJString(env, raw.c_str());
-//    return result;
-//}
-//
-//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::DecryptByPublicKey2(env, key, raw_);
-//    env->ReleaseStringUTFChars(raw, raw_);
-//    jstring result = ToolKit::GetJString(env, src.c_str());
-//    return result;
-//}
-
 static void InitSdkDrive(JNIEnv *env, jobject thiz, jobject context) {
     CommMap::GetInstance()->Init(env, context);
     Logger::is_debug = ParamsKit::GetDebugModel(env, context);
@@ -101,18 +41,25 @@ static jstring GetParam(JNIEnv *env, jobject thiz, jstring key) {
 static jstring InvokeJob(JNIEnv *env, jobject thiz, jobject context, jstring key, jstring data) {
     const char *key_ = env->GetStringUTFChars(key, JNI_FALSE);
     const char *data_ = env->GetStringUTFChars(data, JNI_FALSE);
-//    Json::Value root = ToolKit::ToJsonObject(data_);
-//    if (root.)
-//    LOGD("aaaaa , %s", data_);
-//    LOGD("json str %s", root.asCString());
-//    std::string raw = ToolKit::ToJsonString(root);
-//    LOGD("aes key : %s", raw);
-    char *enc = AesUtils::Encrypt(data_, reinterpret_cast<const uint8_t *>(key_));
-    jstring result = ToolKit::GetJString(env, enc);
+
+    //添加公共参数
+    Json::Value root = ToolKit::ToJsonObject(data_);
+    root["common"] = CommMap::GetInstance()->comm_params;
+
+    //生成aes key
+//    char *raw_key = AesUtils::GetRawKey();
+//    std::string md5_key = md5(raw_key);
+//    auto *key64= static_cast<char *>(malloc(65));
+//    memset(key64,0,64);
+//    sprintf(key64,"%s%s",md5_key,reverse(md5_key.begin(),md5_key.end()))
+//    std::string  aes_key=md5()
+    LOGD("test : %s", ToolKit::StrReverse(key_));
+    char *p = AesUtils::Encrypt(ToolKit::ToJsonString(root).c_str(), reinterpret_cast<const uint8_t *>(key_));
+    jstring result = ToolKit::GetJString(env, p);
     env->ReleaseStringUTFChars(key, key_);
     env->ReleaseStringUTFChars(data, data_);
 //    delete (raw);
-    free(enc);
+    free(p);
     return result;
 
 //    std::string enc = RequestKit::EncryptRequest2(env, context, data);
@@ -162,6 +109,12 @@ static jstring ParseJob(JNIEnv *env, jobject thiz, jobject context, jstring key,
 //    return env->NewStringUTF("");
 }
 
+static jstring Test(JNIEnv *env, jobject thiz) {
+    char *key = AesUtils::GetRawKey();
+    jstring result = ToolKit::GetJString(env, key);
+    free(key);
+    return result;
+}
 
 static JNINativeMethod gMethod[] = {
         {"initSdkDrive", "(Landroid/content/Context;)V",                                                      (void *) InitSdkDrive},
@@ -169,12 +122,7 @@ static JNINativeMethod gMethod[] = {
         {"getParam",     "(Ljava/lang/String;)Ljava/lang/String;",                                            (void *) GetParam},
         {"invokeJob",    "(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;", (void *) InvokeJob},
         {"parseJob",     "(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;", (void *) ParseJob},
-
-//        {"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},
-//        {"rsaEncrypt", "(Ljava/lang/String;)Ljava/lang/String;",                   (void *) RsaEncrypt},
-//        {"rsaDecrypt",   "(Ljava/lang/String;)Ljava/lang/String;",                          (void *) RsaDecrypt}
+        {"test",         "()Ljava/lang/String;",                                                              (void *) Test},
 };
 
 extern "C" JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) {

library_core/src/main/cpp/toolkit.cpp

@@ -243,6 +243,20 @@ Json::Value ToolKit::ToJsonObject(const std::string &json) {
     return root;
 }
 
+char *ToolKit::StrReverse(const char *src) {
+    char *tmp = new char[strlen(src)];
+    strcpy(tmp, src);
+    char *ret = tmp;//用来最后返回数组指针
+    char *p = tmp + strlen(src) - 1;
+    while (p > tmp) {
+        char t = *tmp;
+        *tmp++ = *p;
+        *p-- = t;
+    }
+    free(p);
+    return ret;
+}
+
 
 
 

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

@@ -67,15 +67,15 @@ class SdkBridgeImpl(context: Context) {
 
     fun attachBaseContext(application: Application, context: Context) {
         Logger.initZap(application)
-        SdkDrive.initSdkDrive(application)
+        SdkDrive.instance.initSdkDrive(application)
         Logger.i("Columbus attachBaseContext ...")
         GAIDUtils.initGoogleAdid(application) { code, _ ->
             if (code == 0) {
                 Logger.i("谷歌框架可以访问，请求gaid")
-                SdkDrive.setParam("device_id", GAIDUtils.getGoogleAdid())
+                SdkDrive.instance.setParam("device_id", GAIDUtils.getGoogleAdid())
             } else {
                 Logger.e("谷歌框架不可访问，使用android id替代")
-                SdkDrive.setParam("device_id", DeviceInfoUtils.getAndroidDeviceId(application))
+                SdkDrive.instance.setParam("device_id", DeviceInfoUtils.getAndroidDeviceId(application))
             }
             hasReadGaid = true
         }
@@ -83,7 +83,7 @@ class SdkBridgeImpl(context: Context) {
 
     fun initApplication(application: Application) {
         Logger.i("Columbus initApplication ...")
-        MMKVUtils.getInstance().init(application)
+        MMKVUtils.instance.init(application)
     }
 
     fun initialize(activity: Activity, isLandscape: Boolean, callback: ICallback, initCallback: IInitialize) {
@@ -111,7 +111,7 @@ class SdkBridgeImpl(context: Context) {
         }
 
         //获取当前屏幕尺寸
-        SdkDrive.setParam("screen", DensityUtils.getResolutionByFullScreen(activity))
+        SdkDrive.instance.setParam("screen", DensityUtils.getResolutionByFullScreen(activity))
 
         if (!hasReadGaid) {
             Logger.e("还未完成gaid加载，将延迟初始化")
@@ -143,7 +143,7 @@ class SdkBridgeImpl(context: Context) {
     }
 
     private fun startSdkInit(activity: Activity, callback: ICallback, initCallback: IInitialize) {
-        SdkRequest.getInstance().initSdk(activity, object : IRequestCallback {
+        SdkRequest.instance.initSdk(activity, object : IRequestCallback {
             override fun onResponse(resultInfo: ResultInfo) {
                 if (resultInfo.code == 1 && !TextUtils.isEmpty(resultInfo.data)) {
                     initBean = InitBean.toBean(resultInfo.data)

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

@@ -6,7 +6,7 @@ import android.content.Context
  * @author #Suyghur.
  * Created on 2021/06/09
  */
-object SdkDrive {
+class SdkDrive {
 
     init {
         System.loadLibrary("eyuangame")
@@ -32,22 +32,11 @@ object SdkDrive {
 
     external fun parseJob(context: Context, key: String, 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
-//        }
-//    }
+    external fun test(): String
+
+    companion object {
+        val instance: SdkDrive by lazy(mode = LazyThreadSafetyMode.SYNCHRONIZED) {
+            SdkDrive()
+        }
+    }
 }

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

@@ -110,7 +110,7 @@ class LoginActivity : FragmentActivity(), View.OnClickListener {
             autoLoginDialog = null
         }
 
-        session = SessionUtils.getInstance().getLocalLastSession(this)
+        session = SessionUtils.instance.getLocalLastSession(this)
 
         if (session == null || !isAutoLogin) {
             showChooseDialog = true

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

@@ -152,7 +152,7 @@ class UserSignInImpl constructor(val activity: LoginActivity, private val callba
             val registerParams = JSONObject()
             registerParams.put("uname", userName)
             registerParams.put("pwd", pwd)
-            SdkRequest.getInstance().registerUser(context, registerParams, object : IRequestCallback {
+            SdkRequest.instance.registerUser(context, registerParams, object : IRequestCallback {
                 override fun onResponse(resultInfo: ResultInfo) {
                     if (resultInfo.code == 1 && !TextUtils.isEmpty(resultInfo.data)) {
                         try {
@@ -169,7 +169,7 @@ class UserSignInImpl constructor(val activity: LoginActivity, private val callba
                                 loginType = SdkBackLoginInfo.instance.loginType
                                 this.userName = userName
                                 this.pwd = pwd
-                                SessionUtils.getInstance().saveSession(context, this)
+                                SessionUtils.instance.saveSession(context, this)
                             }
                             callback.onSuccess(SdkBackLoginInfo.instance.toJsonString())
                         } catch (e: JSONException) {
@@ -189,7 +189,7 @@ class UserSignInImpl constructor(val activity: LoginActivity, private val callba
     }
 
     private fun userLoginVerify(context: Context, loginParams: JSONObject) {
-        SdkRequest.getInstance().userVerify(context, loginParams, object : IRequestCallback {
+        SdkRequest.instance.userLoginVerify(context, loginParams, object : IRequestCallback {
             override fun onResponse(resultInfo: ResultInfo) {
                 if (resultInfo.code == 1 && !TextUtils.isEmpty(resultInfo.data)) {
                     try {
@@ -208,7 +208,7 @@ class UserSignInImpl constructor(val activity: LoginActivity, private val callba
                                 userName = loginParams.getString("uname")
                                 pwd = loginParams.getString("pwd")
                             }
-                            SessionUtils.getInstance().saveSession(context, this)
+                            SessionUtils.instance.saveSession(context, this)
                         }
                         callback.onSuccess(SdkBackLoginInfo.instance.toJsonString())
                     } catch (e: JSONException) {

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

@@ -166,7 +166,7 @@ class LauncherFragment : Fragment(), View.OnClickListener {
     }
 
     private fun autoFillUserInfo() {
-        val temp = SessionUtils.getInstance().getLocalSessionLimit3(requireActivity())
+        val temp = SessionUtils.instance.getLocalSessionLimit3(requireActivity())
         if (temp.size == 0) {
             //本地没有缓存账号，直接返回
             eetAccount.rightImageView.visibility = View.GONE
@@ -405,7 +405,7 @@ class LauncherFragment : Fragment(), View.OnClickListener {
 
     private inner class AccountDeleteClick(val session: Session) : View.OnClickListener {
         override fun onClick(v: View?) {
-            SessionUtils.getInstance().deleteUserInfo(requireActivity(), session.userId)
+            SessionUtils.instance.deleteUserInfo(requireActivity(), session.userId)
             userLists.clear()
             autoFillUserInfo()
         }

library_core/src/main/java/cn/yyxx/eyuangame/core/linking/Linking.kt

@@ -26,20 +26,8 @@ class Linking {
 
 
     companion object {
-        fun getInstance(): Linking {
-            return LinkingHolder.INSTANCE
-        }
-
-
-        private object LinkingHolder {
-            val INSTANCE: Linking = Linking()
-        }
-
-        /**
-         * 防止单例对象在反序列化时重新生成对象
-         */
-        private fun readResolve(): Any {
-            return LinkingHolder.INSTANCE
+        val instance: Linking by lazy(mode = LazyThreadSafetyMode.SYNCHRONIZED) {
+            Linking()
         }
     }
 }

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

@@ -3,6 +3,8 @@ package cn.yyxx.eyuangame.core.network
 import android.content.Context
 import android.text.TextUtils
 import cn.yyxx.eyuangame.Version
+import cn.yyxx.eyuangame.base.entity.SdkChargeInfo
+import cn.yyxx.eyuangame.base.entity.SdkRoleInfo
 import cn.yyxx.eyuangame.base.utils.ParamsUtils
 import cn.yyxx.eyuangame.core.entity.LoginType
 import cn.yyxx.eyuangame.core.internal.IRequestCallback
@@ -19,15 +21,14 @@ import org.json.JSONObject
  */
 class SdkRequest {
 
-
     fun initSdk(context: Context, callback: IRequestCallback) {
         val jsonObject = JSONObject()
-        jsonObject.put("common", getCommon(context))
+//        jsonObject.put("common", getCommon(context))
         jsonObject.put("route_path", Host.BASIC_ROUTE_INIT_SDK)
         VolleyRequest.post(context, Host.HOST, jsonObject, callback)
     }
 
-    fun userVerify(context: Context, jsonObject: JSONObject, callback: IRequestCallback) {
+    fun userLoginVerify(context: Context, jsonObject: JSONObject, callback: IRequestCallback) {
         try {
             jsonObject.put("common", getCommon(context))
             if (jsonObject.getInt("login_type") == LoginType.TYPE_ACCOUNT_LOGIN) {
@@ -51,6 +52,30 @@ class SdkRequest {
         VolleyRequest.post(context, Host.HOST, jsonObject, callback)
     }
 
+    fun forgetUserPwd(context: Context, jsonObject: JSONObject, callback: IRequestCallback) {
+
+    }
+
+    fun modifyUserPwd(context: Context, jsonObject: JSONObject, callback: IRequestCallback) {
+
+    }
+
+    fun bindPhone(context: Context, jsonObject: JSONObject, callback: IRequestCallback) {
+
+    }
+
+    fun bindAccount(context: Context, jsonObject: JSONObject, callback: IRequestCallback) {
+
+    }
+
+    fun createOrder(context: Context, chargeInfo: SdkChargeInfo, callback: IRequestCallback) {
+
+    }
+
+    fun submitRoleData(context: Context, roleInfo: SdkRoleInfo, callback: IRequestCallback) {
+
+    }
+
     private fun getCommon(context: Context): JSONObject {
         val common = JSONObject()
         try {
@@ -83,13 +108,8 @@ class SdkRequest {
 
 
     companion object {
-        fun getInstance(): SdkRequest {
-            return RequestHolder.INSTANCE
-        }
-
-        private object RequestHolder {
-            val INSTANCE = SdkRequest()
+        val instance: SdkRequest by lazy(mode = LazyThreadSafetyMode.SYNCHRONIZED) {
+            SdkRequest()
         }
     }
-
 }

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

@@ -33,7 +33,8 @@ object VolleyRequest {
             val rawKey = Md5Utils.encodeByMD5(randomKey)
             val aesKey = Md5Utils.encodeByMD5(rawKey + StrUtils.reverseString(rawKey))
 //            val p = AesUtils.encrypt(aesKey.substring(8, 24), jsonObject.toString())
-            val hexP = SdkDrive.invokeJob(context, aesKey.substring(8, 24), jsonObject.toString())
+            val hexP =
+                SdkDrive.instance.invokeJob(context, aesKey.substring(8, 24), jsonObject.toString())
             val tmp = HexUtils.hexString2Bytes(hexP)
             val p = Base64Utils.encode(tmp)
 
@@ -101,7 +102,8 @@ object VolleyRequest {
             }
             //设置超时时间
             request.retryPolicy = DefaultRetryPolicy(MAX_TIMEOUT, 1, 1.0f)
-            VolleySingleton.getInstance(context.applicationContext).addToRequestQueue(context.applicationContext, request)
+            VolleySingleton.getInstance(context.applicationContext)
+                .addToRequestQueue(context.applicationContext, request)
         } catch (e: Exception) {
             e.printStackTrace()
         }
@@ -120,7 +122,7 @@ object VolleyRequest {
             val base64P = data.getString("p")
             val tmp = Base64Utils.decode(base64P)
             val p = HexUtils.bytes2HexString(tmp)
-            return SdkDrive.parseJob(context, aesKey.substring(8, 24), p)
+            return SdkDrive.instance.parseJob(context, aesKey.substring(8, 24), p)
         } catch (e: JSONException) {
             e.printStackTrace()
         }

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

@@ -1,6 +1,7 @@
 package cn.yyxx.eyuangame.core.utils
 
 import android.content.Context
+import androidx.annotation.Keep
 import cn.yyxx.eyuangame.base.utils.Logger
 import com.tencent.mmkv.MMKV
 import com.tencent.mmkv.MMKVHandler
@@ -43,12 +44,8 @@ class MMKVUtils private constructor() : MMKVHandler {
     }
 
     companion object {
-        fun getInstance(): MMKVUtils {
-            return MMKVUtilsHolder.INSTANCE
+        val instance:MMKVUtils by lazy(mode = LazyThreadSafetyMode.SYNCHRONIZED){
+            MMKVUtils()
         }
     }
-
-    private object MMKVUtilsHolder {
-        val INSTANCE: MMKVUtils = MMKVUtils()
-    }
 }

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

@@ -2,6 +2,8 @@ package cn.yyxx.eyuangame.core.utils
 
 import android.content.Context
 import android.text.TextUtils
+import androidx.annotation.Keep
+import cn.yyxx.eyuangame.base.EYuanGame
 import cn.yyxx.eyuangame.base.utils.Logger
 import cn.yyxx.eyuangame.core.entity.LoginType
 import cn.yyxx.eyuangame.core.entity.Session
@@ -57,7 +59,7 @@ class SessionUtils private constructor() {
                 HostModelUtils.ENV_TEST -> "test"
                 else -> "online"
             }
-            MMKVUtils.getInstance().mmkv?.encode(keyName, jsonObject.toString())
+            MMKVUtils.instance.mmkv?.encode(keyName, jsonObject.toString())
 //            FileUtils.writeFile(jsonObject.toString(), filePath)
         }
     }
@@ -102,7 +104,7 @@ class SessionUtils private constructor() {
             HostModelUtils.ENV_TEST -> "test"
             else -> "online"
         }
-        val json = MMKVUtils.getInstance().mmkv?.decodeString(keyName)
+        val json = MMKVUtils.instance.mmkv?.decodeString(keyName)
 //        val json = FileUtils.readFile(FileUtils.getUserInfoFilePath(context))
         return if (TextUtils.isEmpty(json)) {
             mutableListOf()
@@ -151,7 +153,7 @@ class SessionUtils private constructor() {
             HostModelUtils.ENV_TEST -> "test"
             else -> "online"
         }
-        MMKVUtils.getInstance().mmkv?.encode(keyName, jsonObject.toString())
+        MMKVUtils.instance.mmkv?.encode(keyName, jsonObject.toString())
 //        FileUtils.writeFile(jsonObject.toString(), filePath)
     }
 
@@ -192,12 +194,9 @@ class SessionUtils private constructor() {
     }
 
     companion object {
-        fun getInstance(): SessionUtils {
-            return SessionUtilsHolder.INSTANCE
-        }
-    }
 
-    private object SessionUtilsHolder {
-        val INSTANCE: SessionUtils = SessionUtils()
+        val instance: SessionUtils by lazy(mode = LazyThreadSafetyMode.SYNCHRONIZED) {
+            SessionUtils()
+        }
     }
 }