From b7c805127d3941863fd1a52cec0d4c686e6157a5 Mon Sep 17 00:00:00 2001
From: liuxue <q3213421wrwqr>
Date: 星期四, 29 四月 2021 20:08:50 +0800
Subject: [PATCH] 8918 【BTZF】9917平台接入专服增加快手SDK   代码测试成功

---
 Project/qkbtzf/src/game_qk/java/com/secondworld/universalsdk/QuickPlatformUtil.java |    5 ++
 Project/qkbtzf/build.gradle                                                         |    7 ++-
 Project/qkbtzf/src/game_qk/java/com/secondworld/universalsdk/H2EngineSDK.java       |   69 +++++++++++++++++++++++++++++++++-
 Project/qkbtzf/src/main/java/com/secondworld/universalsdk/MainActivity.java         |    8 ++++
 4 files changed, 84 insertions(+), 5 deletions(-)

diff --git a/Project/qkbtzf/build.gradle b/Project/qkbtzf/build.gradle
index ad5faea..2a00527 100644
--- a/Project/qkbtzf/build.gradle
+++ b/Project/qkbtzf/build.gradle
@@ -10,6 +10,7 @@
         targetSdkVersion 26
         versionCode 1
         versionName "1.0"
+        multiDexEnabled true
     }
 
     buildTypes {
@@ -42,6 +43,7 @@
 }
 
 dependencies {
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'com.android.support:appcompat-v7:26.0.0-beta1'
     implementation files('libs/android-support-v4.jar')
     implementation files('libs/bugly.jar')
@@ -49,6 +51,7 @@
     implementation files('libs/jcore-android-1.2.1.jar')
     implementation files('libs/jpush-android-3.1.3.jar')
     implementation files('libs/tracking1.3.0.jar')
+    implementation files('libs/monitorsdk-1.0.6.jar')
     compileOnly files('libs/unity-classes.jar')
     compileOnly files('libs/quicksdk_v2.7.1_20200309.jar')
 }
@@ -58,12 +61,12 @@
     dependsOn 'assembleGame_qkRelease'
     from zipTree("build/outputs/aar/qkbtzf-game_qk-release.aar")
     include "AndroidManifest.xml"
-    into "D:\\u3dpro\\U3DRepository\\ChannelDiff\\Android\\qkbtzf\\"
+    into "G:\\U3DRepository\\ChannelDiff\\Android\\qkbtzf\\"
 }
 
 task autoCopy_qkbtzf(type: Copy) {
     dependsOn autoCopy_qkbtzf_Manifest
     from "build/outputs/aar/"
     include "qkbtzf-game_qk-release.aar"
-    into "D:\\u3dpro\\U3DRepository\\ChannelDiff\\Android\\qkbtzf\\libs\\"
+    into "G:\\U3DRepository\\ChannelDiff\\Android\\qkbtzf\\libs\\"
 }
diff --git a/Project/qkbtzf/src/game_qk/java/com/secondworld/universalsdk/H2EngineSDK.java b/Project/qkbtzf/src/game_qk/java/com/secondworld/universalsdk/H2EngineSDK.java
index 0365715..77b33af 100644
--- a/Project/qkbtzf/src/game_qk/java/com/secondworld/universalsdk/H2EngineSDK.java
+++ b/Project/qkbtzf/src/game_qk/java/com/secondworld/universalsdk/H2EngineSDK.java
@@ -43,6 +43,11 @@
 import cn.jpush.android.api.JPushInterface;
 import cn.jpush.android.data.JPushLocalNotification;
 
+import android.text.TextUtils;
+import com.kwai.monitor.log.TurboAgent;
+import com.kwai.monitor.log.TurboConfig;
+
+
 public class H2EngineSDK
 {
     private static final String TAG = "H2EngineSDK";
@@ -63,6 +68,7 @@
                 case CodeU2A.Init:
                     APP_ID = _json.getString("appID");
                     init(_activity);
+                    ActiveTurbo(_activity);
                     break;
                 case CodeU2A.CopyOneAsset:
                     FileUtil.copy(_activity, _json.getString("fileName"));
@@ -182,6 +188,7 @@
                                 URLEncoder.encode(_extraData.toString(), "utf-8"));
                         //Payment.getInstance().pay(_activity, orderInfo, roleInfo3);
                         PayEx(_activity, orderInfo, roleInfo3);
+                        PayExTurbo(_activity,convertToDouble(_json.getString("money"),0));
 
                     } catch (UnsupportedEncodingException e)
                     {
@@ -217,6 +224,7 @@
                             "鏃�"); //360娓犻亾鍙傛暟锛岃缃ソ鍙嬪叧绯诲垪琛紝鏍煎紡璇峰弬鑰冿細http://open.quicksdk.net/help/detail/aid/190
                     //User.getInstance().setGameRoleInfo(_activity, roleInfo, true);
                     SetRoleInfoEx(_activity, roleInfo, true);
+                    RegistTurbo(_activity);
 //                    QuickPlatformUtil.getInstance().createRole(_activity,
 //                                                            _json.getString("sid"),
 //                                                            _json.getString("serverName"),
@@ -460,6 +468,7 @@
         });
     }
 
+
     public static void CopyContent(final Activity activity, final String content)
     {
         activity.runOnUiThread(new Runnable()
@@ -602,13 +611,20 @@
 
     public static void onCreate(Activity activity, Bundle savedInstanceState)
     {
+        //鍒濆鍖杝dk,娉ㄦ剰鐩稿叧鏉冮檺鐨勭敵璇凤紝濡侷MEI鏉冮檺锛屽己鐑堝缓璁厛杩涜鐢宠鏉冮檺鍚庤繘琛屽垵濮嬪寲
+        TurboAgent.init(TurboConfig.TurboConfigBuilder.create(activity.getBaseContext())
+                .setAppId("70261") //璇峰~鍐欏钩鍙扮敵璇风殑appId
+                .setAppName("djmx_ay") //璇峰~鍐欑敵璇稟ppid鏃跺~鍐欑殑appName
+                .setEnableDebug(true)
+                .build());
+
         Sdk.getInstance().onCreate(activity);
         try {
             // check鏉冮檺
             if ((ContextCompat.checkSelfPermission(activity,
-                                                   Manifest.permission.READ_PHONE_STATE) != PackageManager.PERMISSION_GRANTED)
+                    Manifest.permission.READ_PHONE_STATE) != PackageManager.PERMISSION_GRANTED)
                     || (ContextCompat.checkSelfPermission(activity,
-                                                          Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED)) {
+                    Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED)) {
                 // 娌℃湁 锛� 鐢宠鏉冮檺 鏉冮檺鏁扮粍
                 ActivityCompat.requestPermissions(activity, new String[] {
                         Manifest.permission.READ_PHONE_STATE, Manifest.permission.WRITE_EXTERNAL_STORAGE }, 1);
@@ -621,8 +637,57 @@
             Sdk.getInstance().init(activity, "16738592021815700006389081047799", "46221152");
         }
         QuickSDK.getInstance().setIsLandScape(true);
+
+
     }
 
+    //浠樿垂
+    public static void PayExTurbo(final Activity activity, final double money)
+    {
+        activity.runOnUiThread(new Runnable()
+        {
+            @Override
+            public void run()
+            {
+                TurboAgent.onPay(money);
+            }
+        });
+    }
+    //娉ㄥ唽
+    public static void RegistTurbo(final Activity activity)
+    {
+        activity.runOnUiThread(new Runnable()
+        {
+            @Override
+            public void run()
+            {
+                TurboAgent.onRegister();
+            }
+        });
+    }
+    //婵�娲�
+    public static void ActiveTurbo(final Activity activity)
+    {
+        activity.runOnUiThread(new Runnable()
+        {
+            @Override
+            public void run()
+            {
+                TurboAgent.onAppActive();
+            }
+        });
+    }
+    public static double convertToDouble(String number, double defaultValue) {
+        if (TextUtils.isEmpty(number)) {
+            return defaultValue;
+        }
+        try {
+            return Double.parseDouble(number);
+        } catch (Exception e) {
+            return defaultValue;
+        }
+
+    }
     private static boolean m_IsFocus = true;
 
     public static void onWindowFocusChanged(boolean b)
diff --git a/Project/qkbtzf/src/game_qk/java/com/secondworld/universalsdk/QuickPlatformUtil.java b/Project/qkbtzf/src/game_qk/java/com/secondworld/universalsdk/QuickPlatformUtil.java
index ed6deff..5a3323e 100644
--- a/Project/qkbtzf/src/game_qk/java/com/secondworld/universalsdk/QuickPlatformUtil.java
+++ b/Project/qkbtzf/src/game_qk/java/com/secondworld/universalsdk/QuickPlatformUtil.java
@@ -76,7 +76,10 @@
                 //鏍规嵁鍥炶皟鑾峰彇鐢ㄦ埛淇℃伅
                 String token = USER.getToken();
                 //閫氱煡鍒皍nity涓殑璐﹀彿宸茬粡鍔犱笂娓犻亾ID,淇濊瘉appid鍜宻pid鍞竴瀵瑰簲
-                String userId = USER.getUID() + "@" + com.quicksdk.Extend.getInstance().getChannelType();
+                String channel = com.quicksdk.Extend.getInstance().getExtrasConfig("channel");
+                if (channel == null || channel.isEmpty())
+                    channel = com.quicksdk.Extend.getInstance().getChannelType() + "";
+                String userId = USER.getUID() + "@" + channel;
                 String userName = USER.getUserName();
                 try
                 {
diff --git a/Project/qkbtzf/src/main/java/com/secondworld/universalsdk/MainActivity.java b/Project/qkbtzf/src/main/java/com/secondworld/universalsdk/MainActivity.java
index d71b5b1..3ba9d9f 100644
--- a/Project/qkbtzf/src/main/java/com/secondworld/universalsdk/MainActivity.java
+++ b/Project/qkbtzf/src/main/java/com/secondworld/universalsdk/MainActivity.java
@@ -21,6 +21,8 @@
 import android.widget.RelativeLayout;
 import android.widget.Toast;
 
+import com.kwai.monitor.log.TurboAgent;
+import com.kwai.monitor.log.TurboConfig;
 import com.quicksdk.QuickSDK;
 import com.quicksdk.Sdk;
 import com.secondworld.univeralsdk.R;
@@ -88,6 +90,12 @@
         _frameLayout.addView(unityView);
 
         //H2EngineSDK.onCreate(this, savedInstanceState);
+        //鍒濆鍖杝dk,娉ㄦ剰鐩稿叧鏉冮檺鐨勭敵璇凤紝濡侷MEI鏉冮檺锛屽己鐑堝缓璁厛杩涜鐢宠鏉冮檺鍚庤繘琛屽垵濮嬪寲
+        TurboAgent.init(TurboConfig.TurboConfigBuilder.create(this.getBaseContext())
+                .setAppId("70261") //璇峰~鍐欏钩鍙扮敵璇风殑appId
+                .setAppName("djmx_ay") //璇峰~鍐欑敵璇稟ppid鏃跺~鍐欑殑appName
+                .setEnableDebug(true)
+                .build());
 
         Sdk.getInstance().onCreate(this);
         try {

--
Gitblit v1.8.0