From b02f6a1c4c07e0f5ef49f649f3a8b123df6d7ffb Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期四, 18 一月 2024 17:04:47 +0800
Subject: [PATCH] 0312 欢游越南sdk

---
 Channel/Android/hyyngame/release/libs/library-release-hyyngame.aar                   |    0 
 SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdPlatformPay.java     |    2 
 SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdTraceEvent.java      |   23 ++++
 SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdGoToShop.java        |   21 ++++
 SdkProject/library/proguard-rules.pro                                                |    8 +
 Channel/Android/hyyngame/debug/libs/library-debug-hyyngame.aar                       |    0 
 SdkProject/library/build.gradle                                                      |    6 
 SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdRoleLogout.java      |   31 ++++++
 SdkProject/channel/GTGame/java/com/secondworld/sdk/GTGamePlatform.java               |    2 
 /dev/null                                                                            |    0 
 SdkProject/channel/hyyngame/AndroidManifest.xml                                      |   14 +-
 SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdGoToReview.java      |   20 ++++
 SdkProject/channel/hyyngame/res/xml/network_security_config.xml                      |    4 
 SdkProject/channel/hyyngame/java/com/secondworld/sdk/MySdkMgr.java                   |   80 +++++++++++++--
 SdkProject/library/libs/ald_v1.6.9.aar                                               |    0 
 SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdShareToFaceBook.java |   20 ++++
 SdkProject/library/google-services.json                                              |   10 +-
 SdkProject/library/src/main/java/com/secondworld/sdk/utils/CodeU2A.java              |    7 +
 SdkProject/channel/hyyngame/res/values/strings.xml                                   |    7 
 SdkProject/channel/hyyngame/java/com/secondworld/sdk/GTGameMain.java                 |    8 -
 SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdFansHouse.java       |   20 ++++
 21 files changed, 239 insertions(+), 44 deletions(-)

diff --git a/Channel/Android/hyyngame/debug/libs/library-debug-hyyngame.aar b/Channel/Android/hyyngame/debug/libs/library-debug-hyyngame.aar
new file mode 100644
index 0000000..8475fac
--- /dev/null
+++ b/Channel/Android/hyyngame/debug/libs/library-debug-hyyngame.aar
Binary files differ
diff --git a/Channel/Android/hyyngame/release/libs/library-release-hyyngame.aar b/Channel/Android/hyyngame/release/libs/library-release-hyyngame.aar
new file mode 100644
index 0000000..b95dcde
--- /dev/null
+++ b/Channel/Android/hyyngame/release/libs/library-release-hyyngame.aar
Binary files differ
diff --git a/SdkProject/channel/GTGame/java/com/secondworld/sdk/GTGamePlatform.java b/SdkProject/channel/GTGame/java/com/secondworld/sdk/GTGamePlatform.java
index 900e859..7ce2834 100644
--- a/SdkProject/channel/GTGame/java/com/secondworld/sdk/GTGamePlatform.java
+++ b/SdkProject/channel/GTGame/java/com/secondworld/sdk/GTGamePlatform.java
@@ -4,6 +4,6 @@
 
     @Override
     public String platformName() {
-        return "sanxia";
+        return "hyyn";
     }
 }
diff --git a/SdkProject/channel/hyyngame/AndroidManifest.xml b/SdkProject/channel/hyyngame/AndroidManifest.xml
index 2229205..01b03ac 100644
--- a/SdkProject/channel/hyyngame/AndroidManifest.xml
+++ b/SdkProject/channel/hyyngame/AndroidManifest.xml
@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.secondworld.sdk">
 
+    `<!-- PROTECTION_NORMAL -->
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
     <uses-permission android:name="android.permission.INTERNET"/>
@@ -11,9 +12,6 @@
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
     <uses-permission android:name="com.android.vending.BILLING"/>
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"  android:maxSdkVersion="32"/>
-    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
-    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
 
     <!-- 鐗规畩鏉冮檺锛岄渶瑕佺敵璇� -->
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
@@ -86,16 +84,16 @@
 
         <meta-data
             android:name="ALD_GAME_MAIN_ACTIVITY"
-            android:value="com.demo.MainActivity[涓籥ctivity璺緞]" />
+            android:value="com.secondworld.sdk.GameActivity" />
         <meta-data
             android:name="ALD_GAME_CHANNELID"
             android:value="331" />
         <meta-data
             android:name="ALD_GAME_APPID"
-            android:value=""/>
+            android:value="34"/>
         <meta-data
             android:name="ALD_GAME_GAMEID"
-            android:value=""/>
+            android:value="1135"/>
         <!--facebook-->
         <meta-data
             android:name="com.facebook.sdk.ApplicationId"
@@ -106,11 +104,11 @@
         <!--搴旂敤璋锋瓕id -->
         <meta-data
             android:name="google-signin-client_id"
-            android:value=""/>
+            android:value="572611835891-45je6quohe8267idafv3vua25cdjd10u.apps.googleusercontent.com"/>
         <!--appflyer鍙傛暟 -->
         <meta-data
             android:name="appflyer-key"
-            android:value=""/>
+            android:value="DNHmZrBYWUwuBAKf8sAhM"/>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/SdkProject/channel/hyyngame/java/com/secondworld/sdk/GTGameMain.java b/SdkProject/channel/hyyngame/java/com/secondworld/sdk/GTGameMain.java
index dd5719f..cd24dfc 100644
--- a/SdkProject/channel/hyyngame/java/com/secondworld/sdk/GTGameMain.java
+++ b/SdkProject/channel/hyyngame/java/com/secondworld/sdk/GTGameMain.java
@@ -63,13 +63,7 @@
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         if (keyCode == KeyEvent.KEYCODE_BACK) {
-                // 娓告垙璋冪敤鑷韩鐨勯��鍑哄璇濇锛岀偣鍑荤‘瀹氬悗锛岃皟鐢╭uick鐨別xit鎺ュ彛
-                new AlertDialog.Builder(activity).setTitle("閫�鍑�").setMessage("鏄惁閫�鍑烘父鎴�?").setPositiveButton("纭畾", new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface arg0, int arg1) {
-                        MySdkMgr.manger.exit(GTGameMain.I.activity);
-                    }
-                }).setNegativeButton("鍙栨秷", null).show();
+            MySdkMgr.manger.exit(GTGameMain.I.activity);
             return true;
         }
         return super.onKeyDown(keyCode, event);
diff --git a/SdkProject/channel/hyyngame/java/com/secondworld/sdk/MySdkMgr.java b/SdkProject/channel/hyyngame/java/com/secondworld/sdk/MySdkMgr.java
index 4010450..8227e2d 100644
--- a/SdkProject/channel/hyyngame/java/com/secondworld/sdk/MySdkMgr.java
+++ b/SdkProject/channel/hyyngame/java/com/secondworld/sdk/MySdkMgr.java
@@ -7,7 +7,10 @@
 import androidx.annotation.NonNull;
 
 import com.lp.overseas.sdk.external.AldGameManger;
+import com.lp.overseas.sdk.external.Extend;
+import com.lp.overseas.sdk.external.callback.ExtendCallBack;
 import com.lp.overseas.sdk.external.conts.AldUserHolder;
+import com.lp.overseas.sdk.external.conts.FuncType;
 import com.lp.overseas.sdk.external.model.AldUserData;
 import com.lp.overseas.sdk.external.model.OrderInfo;
 import com.secondworld.sdk.utils.CodeA2U;
@@ -93,7 +96,7 @@
             public void onExit(boolean isSuccess) {
                 if (isSuccess) {
                     //閫�鍑烘父鎴�
-                    System.exit(0);
+                    GameActivityProxy.I.activity.finish();
                 } else {
                     //缁х画娓告垙
                 }
@@ -174,19 +177,72 @@
     }
 
 
+    /**
+     * 鍒嗕韩
+     * @param type  FuncType.SHARE_URL//鍒嗕韩閾炬帴  FuncType.SHARE_IMG//鍒嗕韩鍥剧墖
+     */
+    public void facebookShare(int type) {
+        // 鍒ゆ柇鏄惁鏀寔鍒嗕韩鍔熻兘
+        if (Extend.getInstance().isFunctionSupported(type)) {
+            Extend.getInstance().callFunctionWithParamsCallBack(GTGameMain.I.activity, type, new ExtendCallBack() {
+                @Override
+                public void onSuccess(Object... arg0) {
+                    //鍒嗕韩鎴愬姛
+                    args.clear();
+                    args.put("state", 1);
+                    UnityMsgHandler.sendMessageToUnity(CodeA2U.ShareState, args);
+                }
 
-//        @Override
-//        public void onPaySuccessCallback(PaySuccessInfo paySuccessInfo) {
-//            //鏀粯鎴愬姛
-//            UnityMsgHandler.sendMessageToUnity(CodeA2U.PlatformPayOk);
-//            }
-//
-//        @Override
-//        public void onPayFaildCallback(PayFaildInfo payFaildInfo) {
-//            //鏀粯澶辫触
-//            UnityMsgHandler.sendMessageToUnity(CodeA2U.PlatformPayFail);
-//            }
+                @Override
+                public void onFailed(Object... arg0) {
+                    //鍒嗕韩澶辫触
+                    args.clear();
+                    args.put("state", 2);
+                    UnityMsgHandler.sendMessageToUnity(CodeA2U.ShareState, args);
+                }
+            });
+        } else {
+            //姝ゆ笭閬撴殏涓嶆敮鎸佸姛鑳�
+        }
+    }
 
+    /**
+     * 璺冲埌绮夌挡闋�
+     */
+    public void facebookFansHome() {
+        // 鍒ゆ柇鏄惁鏀寔鍔熻兘
+        if (Extend.getInstance().isFunctionSupported(FuncType.FANSHOME)) {
+            Extend.getInstance().callFunctionWithParamsCallBack(GTGameMain.I.activity, FuncType.FANSHOME, new ExtendCallBack() {
+                @Override
+                public void onSuccess(Object... arg0) {
+                    //璺宠綁鎴愬姛
+                }
 
+                @Override
+                public void onFailed(Object... arg0) {
 
+                }
+            });
+        } else {
+            //姝ゆ笭閬撴殏涓嶆敮鎸佸姛鑳�
+        }
+    }
+
+    public void transferToAppStore() {
+        // 鍒ゆ柇鏄惁鏀寔鍒嗕韩鍔熻兘
+        if (Extend.getInstance().isFunctionSupported(FuncType.APPSTORE)) {
+            Extend.getInstance().callFunctionWithParamsCallBack(GTGameMain.I.activity, FuncType.APPSTORE, new ExtendCallBack() {
+                @Override
+                public void onSuccess(Object... arg0) {
+                    //璺宠綁鎴愬姛
+                }
+
+                @Override
+                public void onFailed(Object... arg0) {
+                }
+            });
+        } else {
+            //姝ゆ笭閬撴殏涓嶆敮鎸佸姛鑳�
+        }
+    }
 }
diff --git a/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdFansHouse.java b/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdFansHouse.java
new file mode 100644
index 0000000..7b1565e
--- /dev/null
+++ b/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdFansHouse.java
@@ -0,0 +1,20 @@
+package com.secondworld.sdk.command;
+
+
+import com.secondworld.sdk.GTGameMain;
+import com.secondworld.sdk.MySdkMgr;
+import com.secondworld.sdk.utils.CodeU2A;
+
+import org.json.JSONObject;
+
+public class CmdFansHouse implements ICommand {
+    @Override
+    public int getCode() {
+        return CodeU2A.FansHouse;
+    }
+
+    @Override
+    public void process(JSONObject json) throws Exception {
+        MySdkMgr.I.facebookFansHome();
+    }
+}
diff --git a/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdGoToReview.java b/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdGoToReview.java
new file mode 100644
index 0000000..2f8bd35
--- /dev/null
+++ b/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdGoToReview.java
@@ -0,0 +1,20 @@
+package com.secondworld.sdk.command;
+
+
+import com.secondworld.sdk.GTGameMain;
+import com.secondworld.sdk.MySdkMgr;
+import com.secondworld.sdk.utils.CodeU2A;
+import org.json.JSONObject;
+
+//璇勮
+public class CmdGoToReview implements ICommand {
+    @Override
+    public int getCode() {
+        return CodeU2A.GoToReview;
+    }
+
+    @Override
+    public void process(JSONObject json) throws Exception {
+        MySdkMgr.manger.launchReviewFlow(GTGameMain.I.activity);
+    }
+}
diff --git a/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdGoToShop.java b/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdGoToShop.java
new file mode 100644
index 0000000..1aec2cf
--- /dev/null
+++ b/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdGoToShop.java
@@ -0,0 +1,21 @@
+package com.secondworld.sdk.command;
+
+
+import com.secondworld.sdk.GTGameMain;
+import com.secondworld.sdk.MySdkMgr;
+import com.secondworld.sdk.utils.CodeU2A;
+
+import org.json.JSONObject;
+
+//璇勮
+public class CmdGoToShop implements ICommand {
+    @Override
+    public int getCode() {
+        return CodeU2A.GotoShop;
+    }
+
+    @Override
+    public void process(JSONObject json) throws Exception {
+        MySdkMgr.I.transferToAppStore();
+    }
+}
diff --git a/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdPlatformPay.java b/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdPlatformPay.java
index 804923c..78e8b0d 100644
--- a/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdPlatformPay.java
+++ b/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdPlatformPay.java
@@ -28,7 +28,7 @@
         payInfo.setProducId(json.getString("cpInfo"));//浜у搧ID
         payInfo.setCpOrderId(json.getString("orderId"));//璁㈠崟鍙�
         payInfo.setAmount(json.getDouble("mount"));//鏀粯閲戦  绮剧‘鍒颁袱浣嶅皬鏁�
-        payInfo.setCallbackURL("callbackUrl");//鍥炶皟鍦板潃锛涢�氱煡鍙戣揣鍦板潃(闇�鍔犲瘑)宸ュ叿鍦ㄤ笅鏂癸紝255涓瓧绗﹀唴
+        payInfo.setCallbackURL("Pxrv%3A%3EW%3B%26A%26qGEf%5D1%3B4Pip6Lrvc%5BChojgYPV%2A%3B%3Bm%7BBDbK%28kX%3Bm%60Ey40%2CO%609HKz%26T0%268");//鍥炶皟鍦板潃锛涢�氱煡鍙戣揣鍦板潃(闇�鍔犲瘑)宸ュ叿鍦ㄤ笅鏂癸紝255涓瓧绗﹀唴
         payInfo.setCallbackInfo(attach);//閫忎紶鍙傛暟锛涙父鎴忔柟鐨勫洖璋冨湴鍧�鎵�闇�閫忎紶鍙傛暟锛屾湇鍔$鏀粯鍥炶皟鏃跺師鏍疯繑鍥�
 
         MySdkMgr.I.pay(payInfo);
diff --git a/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdRoleLogout.java b/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdRoleLogout.java
new file mode 100644
index 0000000..02f7dc9
--- /dev/null
+++ b/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdRoleLogout.java
@@ -0,0 +1,31 @@
+package com.secondworld.sdk.command;
+
+import com.lp.overseas.sdk.external.model.RoleData;
+import com.secondworld.sdk.GTGameMain;
+import com.secondworld.sdk.MySdkMgr;
+import com.secondworld.sdk.utils.CodeU2A;
+
+import org.json.JSONObject;
+
+public class CmdRoleLogout implements  ICommand{
+    @Override
+    public int getCode() {
+        return CodeU2A.RoleLogout;
+    }
+
+    @Override
+    public void process(JSONObject json) throws Exception {
+
+        //涓婃姤瑙掕壊淇℃伅
+        RoleData data = new RoleData();
+        data.setRoleId(json.getString("roleID"));// 瑙掕壊id
+        data.setUid(MySdkMgr.I.uid);//鐧诲綍鏃惰幏鍙栫殑sdk uid
+        data.setRoleName(json.getString("roleName"));// 瑙掕壊鍚�
+        data.setRoleLevel(json.getString("level"));// 瑙掕壊绛夌骇
+        data.setServerId(json.getString("sid"));// 鎵�鍦ㄦ湇id
+        data.setServerName(json.getString("serverName"));// 鎵�鍦ㄦ湇鍚嶇О
+        data.setBalance(json.getString("money"));//娓告垙瑙掕壊浣欓
+        data.setVipLevel(json.getString("vipLevel"));//娓告垙瑙掕壊绛夌骇
+        MySdkMgr.manger.roleLogout(GTGameMain.I.activity, data);
+    }
+}
diff --git a/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdShareToFaceBook.java b/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdShareToFaceBook.java
new file mode 100644
index 0000000..fa6359d
--- /dev/null
+++ b/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdShareToFaceBook.java
@@ -0,0 +1,20 @@
+package com.secondworld.sdk.command;
+
+
+import com.secondworld.sdk.GTGameMain;
+import com.secondworld.sdk.MySdkMgr;
+import com.secondworld.sdk.utils.CodeU2A;
+
+import org.json.JSONObject;
+
+public class CmdShareToFaceBook implements ICommand {
+    @Override
+    public int getCode() {
+        return CodeU2A.ShareToFaceBook;
+    }
+
+    @Override
+    public void process(JSONObject json) throws Exception {
+        MySdkMgr.I.facebookShare(json.getInt("type"));
+    }
+}
diff --git a/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdTraceEvent.java b/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdTraceEvent.java
new file mode 100644
index 0000000..912997b
--- /dev/null
+++ b/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdTraceEvent.java
@@ -0,0 +1,23 @@
+package com.secondworld.sdk.command;
+
+
+import com.secondworld.sdk.GTGameMain;
+import com.secondworld.sdk.MySdkMgr;
+import com.secondworld.sdk.utils.CodeU2A;
+
+import org.json.JSONObject;
+
+public class CmdTraceEvent implements ICommand {
+    @Override
+    public int getCode() {
+        return CodeU2A.TrackEvent;
+    }
+
+    @Override
+    public void process(JSONObject json) throws Exception {
+        MySdkMgr.manger.trackEvent(GTGameMain.I.activity,
+                json.getString("eventName"),
+                json.getString("value"),
+                json.getBoolean("isRepeatReport"));
+    }
+}
diff --git a/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/GoToReview.java b/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/GoToReview.java
deleted file mode 100644
index 17d2cb0..0000000
--- a/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/GoToReview.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.secondworld.sdk.command;
-
-
-import com.secondworld.sdk.utils.CodeU2A;
-import org.json.JSONObject;
-
-public class GoToReview implements ICommand {
-    @Override
-    public int getCode() {
-        return CodeU2A.GoToReview;
-    }
-
-    @Override
-    public void process(JSONObject json) throws Exception {
-    }
-}
diff --git a/SdkProject/channel/hyyngame/res/values/strings.xml b/SdkProject/channel/hyyngame/res/values/strings.xml
index 9ec0e14..c43e973 100644
--- a/SdkProject/channel/hyyngame/res/values/strings.xml
+++ b/SdkProject/channel/hyyngame/res/values/strings.xml
@@ -1,7 +1,6 @@
 <resources>
-    <string name="facebook_app_id">4125229144241169
-</string> <string name="fb_login_protocol_scheme">fb4125229144241169
-</string>
-    <string name="facebook_client_token">a0ac8136a5d7dd1657d29cc34c5bdfe5</string>
+    <string name="facebook_app_id">377129091673449</string>
+    <string name="fb_login_protocol_scheme">fb377129091673449</string>
+    <string name="facebook_client_token">dc263970f9b4718c30685995d64a73f1</string>
 
 </resources>
\ No newline at end of file
diff --git a/SdkProject/channel/hyyngame/res/xml/network_security_config.xml b/SdkProject/channel/hyyngame/res/xml/network_security_config.xml
new file mode 100644
index 0000000..b7ced7d
--- /dev/null
+++ b/SdkProject/channel/hyyngame/res/xml/network_security_config.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <base-config cleartextTrafficPermitted="true" />
+</network-security-config>
\ No newline at end of file
diff --git a/SdkProject/library/build.gradle b/SdkProject/library/build.gradle
index 9c7d235..e60819e 100644
--- a/SdkProject/library/build.gradle
+++ b/SdkProject/library/build.gradle
@@ -205,12 +205,12 @@
     }
 
 //浠ヤ笅涓哄繀闇�渚濊禆鐨勫簱
-    implementation(name: 'lp_v1.1.3', ext: 'aar') //x.x.x涓哄叿浣撶増鏈�
+    implementation(name: 'ald_v1.6.9', ext: 'aar') //x.x.x涓哄叿浣撶増鏈�
     implementation("com.android.billingclient:billing:5.0.0")
     implementation 'com.google.android.gms:play-services-auth:20.1.0'
-    implementation 'com.facebook.android:facebook-login:latest.release'
-    implementation 'com.facebook.android:facebook-share:latest.release'
     implementation 'androidx.percentlayout:percentlayout:1.0.0'
+    implementation 'com.facebook.android:facebook-android-sdk:[13,14)'
+    implementation 'com.facebook.android:facebook-share:[13,14)'
     implementation 'com.appsflyer:af-android-sdk:6.9.0'
     implementation 'com.android.installreferrer:installreferrer:2.2'
     implementation platform('com.google.firebase:firebase-bom:30.4.0') {
diff --git a/SdkProject/library/google-services.json b/SdkProject/library/google-services.json
index 8cba496..6ef0dab 100644
--- a/SdkProject/library/google-services.json
+++ b/SdkProject/library/google-services.json
@@ -1,13 +1,13 @@
 {
   "project_info": {
-    "project_number": "732138931273",
-    "project_id": "djmx666-b7853",
-    "storage_bucket": "djmx666-b7853.appspot.com"
+    "project_number": "572611835891",
+    "project_id": "djmx-yn",
+    "storage_bucket": "djmx-yn.appspot.com"
   },
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "1:732138931273:android:739ec3eaddfaaf4a73eb98",
+        "mobilesdk_app_id": "1:572611835891:android:19da7dc5865854da3dc486",
         "android_client_info": {
           "package_name": "com.secondworld.sdk"
         }
@@ -15,7 +15,7 @@
       "oauth_client": [],
       "api_key": [
         {
-          "current_key": "AIzaSyBg1OT3J7ClBNviEYrL3S6gXkWIUNvjYjs"
+          "current_key": "AIzaSyAx9QSSg4YnYu7eLDhoYbR7gpXWd21NipQ"
         }
       ],
       "services": {
diff --git a/SdkProject/library/libs/ald_v1.6.9.aar b/SdkProject/library/libs/ald_v1.6.9.aar
new file mode 100644
index 0000000..39679a3
--- /dev/null
+++ b/SdkProject/library/libs/ald_v1.6.9.aar
Binary files differ
diff --git a/SdkProject/library/libs/lp_v1.1.3.aar b/SdkProject/library/libs/lp_v1.1.3.aar
deleted file mode 100644
index bfb866e..0000000
--- a/SdkProject/library/libs/lp_v1.1.3.aar
+++ /dev/null
Binary files differ
diff --git a/SdkProject/library/proguard-rules.pro b/SdkProject/library/proguard-rules.pro
index b90f3b1..b954b8c 100644
--- a/SdkProject/library/proguard-rules.pro
+++ b/SdkProject/library/proguard-rules.pro
@@ -18,4 +18,10 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
\ No newline at end of file
+#-renamesourcefileattribute SourceFile
+-keep class com.appsflyer.** { *; }
+-keep class tw.* { *; }
+-keep class com.ald.* { *; }
+-keep class com.lp.* { *; }
+-keep class com.google.* { *; }
+-keep class com.facebook.* { *; }
\ No newline at end of file
diff --git a/SdkProject/library/src/main/java/com/secondworld/sdk/utils/CodeU2A.java b/SdkProject/library/src/main/java/com/secondworld/sdk/utils/CodeU2A.java
index ed2da27..9b8e384 100644
--- a/SdkProject/library/src/main/java/com/secondworld/sdk/utils/CodeU2A.java
+++ b/SdkProject/library/src/main/java/com/secondworld/sdk/utils/CodeU2A.java
@@ -77,11 +77,14 @@
     int RoleLevelUp = 108;
     int TencentLogin = 109;
     int ShareToFaceBook = 112;
-    int GoToReview = 113;   //鍓嶅線璇勫垎锛堟墦寮�鍟嗗簵锛�
+    int GoToReview = 113;   //鍓嶅線璇勫垎
     int TutorialFinish = 115;
     int TrackingCloseVote = 116; // 鍏抽棴璇勫垎鐣岄潰
     int OpenDashboard = 118;//鎵撳紑dashboard
-
+    int RoleLogout = 119;
+    int FansHouse = 120;
+    int GotoShop = 121;  //鍓嶅線鍟嗗簵
+    int TrackEvent = 122; //鑷畾涔変簨浠�
     /**
      * 鎻掍欢
      */

--
Gitblit v1.8.0