From e9ce011b8d7362bd2ae4ebba52cf638559bcef62 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期四, 28 十二月 2023 16:40:21 +0800
Subject: [PATCH] 0312 越南
---
SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdRoleLogin.java | 27 +-
SdkProject/channel/hyyngame/java/com/secondworld/sdk/GTGameApp.java | 6
SdkProject/channel/hyyngame/AndroidManifest.xml | 119 ++++++++++--
SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdPlatformPay.java | 33 +-
SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdCreateRole.java | 30 +-
SdkProject/channel/hyyngame/java/com/secondworld/sdk/MySdkMgr.java | 213 +++++++++++------------
SdkProject/library/build.gradle | 4
SdkProject/channel/hyyngame/res/values/strings.xml | 7
SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdRoleLevelUp.java | 27 +-
SdkProject/library/src/main/java/com/secondworld/sdk/GameActivity.java | 29 +--
SdkProject/channel/hyyngame/java/com/secondworld/sdk/GTGameMain.java | 3
11 files changed, 273 insertions(+), 225 deletions(-)
diff --git a/SdkProject/channel/hyyngame/AndroidManifest.xml b/SdkProject/channel/hyyngame/AndroidManifest.xml
index 3306452..2229205 100644
--- a/SdkProject/channel/hyyngame/AndroidManifest.xml
+++ b/SdkProject/channel/hyyngame/AndroidManifest.xml
@@ -3,43 +3,114 @@
xmlns:tools="http://schemas.android.com/tools"
package="com.secondworld.sdk">
- <uses-permission android:name="android.permission.INTERNET" />
- <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
- <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
- <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
- <!-- GooglePay-->
- <uses-permission android:name="com.android.vending.BILLING" />
+ <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"/>
+ <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>
+ <uses-permission android:name="android.permission.SYSTEM_OVERLAY_WINDOW"/>
+ <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"/>
+ <uses-permission android:name="android.permission.CAMERA" />
+ <!--facebook -->
+ <queries><provider android:authorities="com.facebook.katana.provider.PlatformProvider" /></queries>
+
+
+
<application
android:name=".GTGameApp"
android:requestLegacyExternalStorage="true"
- android:usesCleartextTraffic="true"
+ android:usesCleartextTraffic="false"
android:supportsPictureInPicture= "true"
android:resizeableActivity="true"
android:exported="false"
android:extractNativeLibs="true"
+ android:networkSecurityConfig="@xml/network_security_config"
tools:replace="android:name">
- <provider
- android:name="androidx.core.content.FileProvider"
- android:authorities="${applicationId}.fileprovider"
- android:exported="false"
- android:grantUriPermissions="true">
- <meta-data
- android:name="android.support.FILE_PROVIDER_PATHS"
- android:resource="@xml/file_paths" />
+<!-- <provider-->
+<!-- android:name="androidx.core.content.FileProvider"-->
+<!-- android:authorities="${applicationId}.fileprovider"-->
+<!-- android:exported="false"-->
+<!-- android:grantUriPermissions="true">-->
+<!-- <meta-data-->
+<!-- android:name="android.support.FILE_PROVIDER_PATHS"-->
+<!-- android:resource="@xml/file_paths" />-->
- </provider>
- <meta-data
- android:name="JF_APPID"
- android:value="81445"/>
- <meta-data
- android:name="JF_APPKEY"
- android:value="538D489BFA57BAF0AF6401745118D6EA"/>
+<!-- </provider>-->
+
+ <uses-library
+ android:name="org.apache.http.legacy"
+ android:required="false" />
+
+
<activity
- android:name="com.juefeng.sdk.juefengsdk.ui.activity.InitdataActivity"
- android:screenOrientation="sensorLandscape" />
+ android:exported="false"
+ android:name="com.facebook.FacebookActivity"
+ android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation" />
+
+ <activity
+ android:name="com.facebook.CustomTabActivity"
+ android:exported="true">
+ <intent-filter><action android:name="android.intent.action.VIEW" />
+
+ <category android:name="android.intent.category.DEFAULT" />
+ <category android:name="android.intent.category.BROWSABLE" />
+
+ <data android:scheme="@string/fb_login_protocol_scheme" />
+ </intent-filter>
+ </activity>
+
+ <!-- 渚嬪锛� <provider android:authorities="com.facebook.app.FacebookContentProvider123456789"-->
+ <provider android:authorities="com.facebook.app.FacebookContentProvider+Facebook_APP_ID"
+ android:name="com.facebook.FacebookContentProvider"
+ android:exported="true" />
+
+ <receiver
+ android:name="com.appsflyer.SingleInstallBroadcastReceiver"
+ android:exported="true">
+ <intent-filter>
+ <action android:name="com.android.vending.INSTALL_REFERRER" />
+ </intent-filter>
+ </receiver>
+ <!--SDK end-->
+
+
+ <meta-data
+ android:name="ALD_GAME_MAIN_ACTIVITY"
+ android:value="com.demo.MainActivity[涓籥ctivity璺緞]" />
+ <meta-data
+ android:name="ALD_GAME_CHANNELID"
+ android:value="331" />
+ <meta-data
+ android:name="ALD_GAME_APPID"
+ android:value=""/>
+ <meta-data
+ android:name="ALD_GAME_GAMEID"
+ android:value=""/>
+ <!--facebook-->
+ <meta-data
+ android:name="com.facebook.sdk.ApplicationId"
+ android:value="@string/facebook_app_id" />
+ <meta-data
+ android:name="com.facebook.sdk.ClientToken"
+ android:value="@string/facebook_client_token"/>
+ <!--搴旂敤璋锋瓕id -->
+ <meta-data
+ android:name="google-signin-client_id"
+ android:value=""/>
+ <!--appflyer鍙傛暟 -->
+ <meta-data
+ android:name="appflyer-key"
+ android:value=""/>
</application>
</manifest>
\ No newline at end of file
diff --git a/SdkProject/channel/hyyngame/java/com/secondworld/sdk/GTGameApp.java b/SdkProject/channel/hyyngame/java/com/secondworld/sdk/GTGameApp.java
index 9c71e51..a7687c8 100644
--- a/SdkProject/channel/hyyngame/java/com/secondworld/sdk/GTGameApp.java
+++ b/SdkProject/channel/hyyngame/java/com/secondworld/sdk/GTGameApp.java
@@ -1,10 +1,8 @@
package com.secondworld.sdk;
-import android.app.Application;
+import com.lp.overseas.sdk.AldApplication;
-
-
-public class GTGameApp extends Application {
+public class GTGameApp extends AldApplication {
@Override
public void onCreate() {
diff --git a/SdkProject/channel/hyyngame/java/com/secondworld/sdk/GTGameMain.java b/SdkProject/channel/hyyngame/java/com/secondworld/sdk/GTGameMain.java
index 0f9d41e..dd5719f 100644
--- a/SdkProject/channel/hyyngame/java/com/secondworld/sdk/GTGameMain.java
+++ b/SdkProject/channel/hyyngame/java/com/secondworld/sdk/GTGameMain.java
@@ -8,7 +8,6 @@
import androidx.annotation.NonNull;
-import com.juefeng.sdk.juefengsdk.JFSDK;
public class GTGameMain extends GameActivityProxy {
@@ -68,7 +67,7 @@
new AlertDialog.Builder(activity).setTitle("閫�鍑�").setMessage("鏄惁閫�鍑烘父鎴�?").setPositiveButton("纭畾", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface arg0, int arg1) {
- JFSDK.getInstance().exitLogin(GTGameMain.I.activity);
+ MySdkMgr.manger.exit(GTGameMain.I.activity);
}
}).setNegativeButton("鍙栨秷", null).show();
return true;
diff --git a/SdkProject/channel/hyyngame/java/com/secondworld/sdk/MySdkMgr.java b/SdkProject/channel/hyyngame/java/com/secondworld/sdk/MySdkMgr.java
index a3e6753..4010450 100644
--- a/SdkProject/channel/hyyngame/java/com/secondworld/sdk/MySdkMgr.java
+++ b/SdkProject/channel/hyyngame/java/com/secondworld/sdk/MySdkMgr.java
@@ -6,16 +6,12 @@
import androidx.annotation.NonNull;
-import com.juefeng.sdk.juefengsdk.interf.SDKEventListener;
-import com.juefeng.sdk.juefengsdk.services.bean.CreatOrderInfo;
-import com.juefeng.sdk.juefengsdk.services.bean.JfOrderInfo;
-import com.juefeng.sdk.juefengsdk.services.bean.LoginErrorMsg;
-import com.juefeng.sdk.juefengsdk.services.bean.LogincallBack;
-import com.juefeng.sdk.juefengsdk.services.bean.PayFaildInfo;
-import com.juefeng.sdk.juefengsdk.services.bean.PaySuccessInfo;
+import com.lp.overseas.sdk.external.AldGameManger;
+import com.lp.overseas.sdk.external.conts.AldUserHolder;
+import com.lp.overseas.sdk.external.model.AldUserData;
+import com.lp.overseas.sdk.external.model.OrderInfo;
import com.secondworld.sdk.utils.CodeA2U;
import com.secondworld.sdk.utils.LogUtil;
-import com.juefeng.sdk.juefengsdk.JFSDK;
import org.json.JSONException;
import org.json.JSONObject;
@@ -24,21 +20,94 @@
private static final String TAG = MySdkMgr.class.getSimpleName();
public static MySdkMgr I = new MySdkMgr();
public static String uid;
- public static int viplevel;
+ public static AldGameManger manger = AldGameManger.getInstance();
public void init(Activity activity) {
sdkInitState = SdkInitState.LOADING;
- JFSDK.getInstance().init(activity, mSDKEventListener);
+ manger = AldGameManger.getInstance();
+ //sdk鍒濆鍖栵紝鍒濆鍖栫粨鏋滃洖璋冮噷闈㈡父鎴忛渶鑷繁澶勭悊璺宠浆閫昏緫
+ manger.init(activity, new AldGameManger.SDKCallback() {
+
+ @Override
+ public void onInitFinished(boolean isSuccess) {
+ if (isSuccess) {
+ //鍒濆鍖栨垚鍔燂紝杩涘叆娓告垙
+ sdkInitState = SdkInitState.SUCCEED;
+ LogUtil.debug("SdkManager", "鍒濆鍖栨垚鍔�");
+ UnityMsgHandler.sendMessageToUnity(CodeA2U.PlatformInitOk);
+ } else {
+ //鍒濆鍖栧け璐ワ紝鍒欐棤娉曡皟璧风櫥褰曘�傛父鎴忛渶缁х画璋冪敤SDK鍒濆鍖栨帴鍙ｅ強鑷澶勭悊閫昏緫璺宠浆
+ Toast.makeText(GameAppProxy.app, "init fail ", Toast.LENGTH_LONG).show();
+ //鍒濆鍖栧け璐�
+ sdkInitState = SdkInitState.FAILED;
+ LogUtil.e("SdkManager", "鍒濆鍖栧け璐�");
+ UnityMsgHandler.sendMessageToUnity(CodeA2U.PlatformInitFail);
+ }
+ }
+
+ @Override
+ public void onLoginFinished(AldUserData userData, AldUserHolder loginState) {
+ if (loginState.getStateCode() == AldUserHolder.LOGIN_SUCCESS) {
+ //鐧诲叆鎴愬姛
+ uid = userData.getUserId(); //浣滀负鍞竴鏍囩ず
+ String sign = userData.getSign();//鑾峰彇绛惧悕
+ String timestamp = userData.getTimestamp();//鐧诲叆鏃堕棿
+ //鍒ゆ柇鐧诲綍鏂瑰紡: 3锛歡oole鐧诲叆锛�4锛歠acebook鐧诲叆
+ int logintype = userData.getOpenType();
+
+ try
+ {
+ args.clear();
+ JSONObject info = new JSONObject();
+ String channelID = "1";
+ String account = uid + "@" + channelID;
+ info.put("account", account);
+ info.put("userName", uid);
+ info.put("token", sign);
+ info.put("token_expire", timestamp);//鏃堕棿鎴�
+ info.put("session_id", String.valueOf(logintype));//鍒ゆ柇鐧诲綍鏂瑰紡
+ args.put("info", info);
+ UnityMsgHandler.sendMessageToUnity(CodeA2U.PlatformLoginOk, args);
+ } catch (JSONException e) {
+ e.printStackTrace();
+ LogUtil.e("SdkManager 鐧诲綍鎴愬姛 浣嗕俊鎭鐞嗗け璐�", e);
+ }
+
+ LogUtil.i(TAG, "login success,uid:" + uid);
+ } else {
+ //鐧诲綍鍙栨秷
+ Toast.makeText(GameAppProxy.app, "login fail " , Toast.LENGTH_LONG).show();
+ //鐧诲綍澶辫触
+ LogUtil.e("SdkManager", "鐧诲綍澶辫触");
+ UnityMsgHandler.sendMessageToUnity(CodeA2U.PlatformLoginFail);
+ }
+ }
+
+ @Override
+ public void onLogout() {
+ //鎮诞绐� 娉ㄩ攢璐﹀彿鎴愬姛锛屾敞閿�璐﹀彿鎴愬姛鍚庯紝娓告垙搴斾粠娓告垙鐨勭晫闈㈤��鍥炲埌鐧诲綍鐣岄潰涓�
+ UnityMsgHandler.sendMessageToUnity(CodeA2U.PlatformLogoutOk);
+ }
+
+ @Override
+ public void onExit(boolean isSuccess) {
+ if (isSuccess) {
+ //閫�鍑烘父鎴�
+ System.exit(0);
+ } else {
+ //缁х画娓告垙
+ }
+ }
+ });
}
public void OnCreate(Activity activity) {
- JFSDK.getInstance().onCreate(GTGameMain.I.activity);
init(activity);
}
public void onStart()
{
- JFSDK.getInstance().onStart(GTGameMain.I.activity);
+ manger.onStart(GTGameMain.I.activity);
}
public void login() {
@@ -53,7 +122,7 @@
@Override
public void run() {
- JFSDK.getInstance().doLogin(GTGameMain.I.activity);
+ manger.login(GTGameMain.I.activity);
}
});
@@ -69,133 +138,55 @@
public void LogOutInitialize() {
- JFSDK.getInstance().logoutLogin(GTGameMain.I.activity);
+ manger.logout(GTGameMain.I.activity);
}
- public void pay(JfOrderInfo roleInfo) {
- JFSDK.getInstance().showPay(GTGameMain.I.activity, roleInfo);
+ public void pay(OrderInfo pauInfo) {
+ manger.pay(GTGameMain.I.activity, pauInfo);
}
public void onResume() {
- JFSDK.getInstance().onResume(GTGameMain.I.activity);
+ manger.onResume(GTGameMain.I.activity);
}
public void onPause() {
- JFSDK.getInstance().onPause(GTGameMain.I.activity);
+ manger.onPause(GTGameMain.I.activity);
}
public void onStop() {
- JFSDK.getInstance().onStop(GTGameMain.I.activity);
+ manger.onStop(GTGameMain.I.activity);
}
public void onDestroy() {
//閫�鍑虹櫥褰曘�侀��鍑烘父鎴忚皟鐢�
- JFSDK.getInstance().onDestroy(GTGameMain.I.activity);
+ manger.onDestroy(GTGameMain.I.activity);
}
public void onActivityResult(int requestCode, int resultCode, Intent data)
{
- JFSDK.getInstance().onActivityResult(GTGameMain.I.activity, requestCode, resultCode, data);
+ manger.onActivityResult(requestCode, resultCode, data);
}
public void onRequestPermissionsResult(int requestCode,
@NonNull String[] permissions, @NonNull int[] grantResults) {
- JFSDK.getInstance().onRequestPermissionsResult(GTGameMain.I.activity, requestCode, permissions, grantResults);
+ manger.onRequestPermissionsResult(requestCode, permissions, grantResults);
}
- SDKEventListener mSDKEventListener = new SDKEventListener(){
- @Override
- public void onLoginSuccess(LogincallBack logincallBack) {//鐧诲綍鎴愬姛
- JFSDK.getInstance().showFloatView(GTGameMain.I.activity);
- try
- {
- args.clear();
- JSONObject info = new JSONObject();
- String channelID = "9996";
- uid = logincallBack.userId;
- String account = uid + "@" + channelID;
- info.put("account", account);
- info.put("userName", uid);
- info.put("token", logincallBack.token);
- args.put("info", info);
- UnityMsgHandler.sendMessageToUnity(CodeA2U.PlatformLoginOk, args);
- } catch (JSONException e) {
- e.printStackTrace();
- LogUtil.e("SdkManager 鐧诲綍鎴愬姛 浣嗕俊鎭鐞嗗け璐�", e);
- }
+// @Override
+// public void onPaySuccessCallback(PaySuccessInfo paySuccessInfo) {
+// //鏀粯鎴愬姛
+// UnityMsgHandler.sendMessageToUnity(CodeA2U.PlatformPayOk);
+// }
+//
+// @Override
+// public void onPayFaildCallback(PayFaildInfo payFaildInfo) {
+// //鏀粯澶辫触
+// UnityMsgHandler.sendMessageToUnity(CodeA2U.PlatformPayFail);
+// }
- LogUtil.i(TAG, "login success,uid:" + uid + " userName:" + logincallBack.userName);
- }
- @Override
- public void onLoginFailed(LoginErrorMsg loginErrorMsg) {//鐧诲綍澶辫触
- Toast.makeText(GameAppProxy.app, "login fail " + loginErrorMsg.getCode(), Toast.LENGTH_LONG).show();
- //鐧诲綍澶辫触
- LogUtil.e("SdkManager", "鐧诲綍澶辫触锛�" + loginErrorMsg.getErrorMsg());
- UnityMsgHandler.sendMessageToUnity(CodeA2U.PlatformLoginFail);
- }
- @Override
- public void onInitSuccess(String desc,boolean isAutoLogin) {
- sdkInitState = SdkInitState.SUCCEED;
- LogUtil.debug("SdkManager", "鍒濆鍖栨垚鍔�");
- UnityMsgHandler.sendMessageToUnity(CodeA2U.PlatformInitOk);
- }
- @Override
- public void onInitFaild(String desc) {
- Toast.makeText(GameAppProxy.app, "init fail "+desc, Toast.LENGTH_LONG).show();
- //鍒濆鍖栧け璐�
- sdkInitState = SdkInitState.FAILED;
- LogUtil.e("SdkManager", "鍒濆鍖栧け璐� msg锛�" + desc);
- UnityMsgHandler.sendMessageToUnity(CodeA2U.PlatformInitFail);
- }
- @Override
- public void onPaySuccessCallback(PaySuccessInfo paySuccessInfo) {
- //鏀粯鎴愬姛
- UnityMsgHandler.sendMessageToUnity(CodeA2U.PlatformPayOk);
- }
-
- @Override
- public void onPayFaildCallback(PayFaildInfo payFaildInfo) {
- //鏀粯澶辫触
- UnityMsgHandler.sendMessageToUnity(CodeA2U.PlatformPayFail);
- }
-
- @Override
- public void onExit(String desc) {//閫�鍑烘垚鍔�
-
- }
- @Override
- public void onCancleExit(String desc) {
-
- }
- @Override
- public void onCreatedOrder(CreatOrderInfo infoBean) {
- //璁㈠崟鍒涘缓鎴愬姛
- LogUtil.i("SdkManager", "璁㈠崟鍒涘缓鎴愬姛");
- }
- @Override
- public void onLogoutLogin(){//姝ゅ闇�鍥炲埌娓告垙鐧诲綍鐣岄潰娓告垙鏂规墽琛�
- UnityMsgHandler.sendMessageToUnity(CodeA2U.PlatformLogoutOk);
- }
- public void onSwitchAccountSuccess(LogincallBack login)
- {
- /*姝ゅ洖璋冩帴鍙ｆ槸鍦ㄥ綋SDK鍐呴儴鏈夊垏鎹㈠笎鍙风殑鍔熻兘锛屼笖鍒囨崲鎴愬姛鏃朵細璋冪敤锛屾父
- 鎴忔柟闇�瑕佸湪杩欎釜鍥炶皟鎺ュ彛涓敞閿�鍘熸潵鐨勮鑹叉暟鎹紝鐒跺悗鏍规嵁鏂扮殑openid(鍙傛暟
- login涓彲浠ヨ幏鍙栧埌)鏉ラ噸鏂板姞杞借鑹叉暟鎹紱*/
- UnityMsgHandler.sendMessageToUnity(CodeA2U.PlatformLogoutOk);
- }
- @Override
- public void onGameSwitchAccount()
- {
- /*姝ゆ帴鍙ｆ槸鍦ㄦ父鎴忓唴鏈夎处鍙峰垏鎹㈠姛鑳界偣鍑� 璋冪敤 JFSDK.getInstance().switchAccount(MainActivity.this);鍚庡洖璋�
- 娓告垙鏂硅处鍙峰垏鎹㈤�昏緫闇�瑕佸湪姝ゅ洖璋冧腑鎵ц
- * */
- UnityMsgHandler.sendMessageToUnity(CodeA2U.PlatformLogoutOk);
- }
-
- };
}
diff --git a/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdCreateRole.java b/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdCreateRole.java
index 168dcd6..3efdabf 100644
--- a/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdCreateRole.java
+++ b/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdCreateRole.java
@@ -1,7 +1,7 @@
package com.secondworld.sdk.command;
-import com.juefeng.sdk.juefengsdk.JFSDK;
-import com.juefeng.sdk.juefengsdk.services.bean.JfRoleInfo;
+import com.lp.overseas.sdk.external.model.RoleData;
+import com.secondworld.sdk.GTGameMain;
import com.secondworld.sdk.MySdkMgr;
import com.secondworld.sdk.utils.CodeU2A;
@@ -16,20 +16,16 @@
@Override
public void process(JSONObject json) throws Exception {
- //涓婃姤瑙掕壊淇℃伅
- JfRoleInfo roleInfo = new JfRoleInfo();
- roleInfo.setGameRoleLevel(json.getString("level"));
- roleInfo.setRoleId(json.getString("roleID"));
- roleInfo.setGameRolePower(json.getInt("fightPower"));
- roleInfo.setServerId(json.getString("sid"));
- roleInfo.setServerName(json.getString("serverName"));
- roleInfo.setRoleName(json.getString("roleName"));
- roleInfo.setExperience("1");
- roleInfo.setPartyId(json.getString("familyID"));
- roleInfo.setPartyName(json.getString("familyName"));
- roleInfo.setRoleCreateTime(System.currentTimeMillis());
- roleInfo.setVipLevel(json.getInt("vipLevel"));
- roleInfo.setType("1");
- JFSDK.getInstance().syncInfo(roleInfo);
+ 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.roleCreate(GTGameMain.I.activity, data);
+
}
}
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 59e9895..804923c 100644
--- a/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdPlatformPay.java
+++ b/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdPlatformPay.java
@@ -1,6 +1,6 @@
package com.secondworld.sdk.command;
-import com.juefeng.sdk.juefengsdk.services.bean.JfOrderInfo;
+import com.lp.overseas.sdk.external.model.OrderInfo;
import com.secondworld.sdk.MySdkMgr;
import com.secondworld.sdk.utils.CodeU2A;
@@ -14,24 +14,23 @@
@Override
public void process(JSONObject json) throws Exception {
- //channelID_cp璁㈠崟id_鍖烘湇id_娓告垙鍏呭�肩紪鍙� 闀垮害涓嶈秴杩�100 鍙兘鐢ㄤ笅鍒掔嚎
- JfOrderInfo roleInfo = new JfOrderInfo ();
+ String attach = "1_" + json.getString("orderId") + "_" + json.getString("sid") + "_" + json.getString("cpInfo");
- roleInfo.setLevel(json.getString("level"));
- roleInfo.setGoodsId(json.getString("cpInfo"));
- roleInfo.setGoodsName(json.getString("title"));
- roleInfo.setGoodsDes(json.getString("title"));
- roleInfo.setPrice(json.getString("mount"));
- roleInfo.setServerId(json.getString("sid"));
- roleInfo.setServerName(json.getString("serverName"));
- roleInfo.setRoleId(json.getString("roleID"));
- roleInfo.setRoleName(json.getString("roleName"));
- roleInfo.setVip(json.getString("vipLevel"));
+ OrderInfo payInfo = new OrderInfo();
+ payInfo.setServerId(json.getString("sid"));//鎵�鍦ㄦ湇鍔″櫒ID
+ payInfo.setUid(MySdkMgr.I.uid);//鐧诲綍鏃惰幏鍙栫殑sdk uid
+ payInfo.setServerName(json.getString("serverName"));//鎵�鍦ㄦ湇鍔″櫒鍚嶇О
+ payInfo.setRoleId(json.getString("roleID"));//娓告垙瑙掕壊ID
+ payInfo.setRoleName(json.getString("roleName"));//娓告垙瑙掕壊鍚嶇О
+ payInfo.setRoleLevel(json.getString("level"));//娓告垙瑙掕壊绛夌骇
+ payInfo.setProductDesc(json.getString("title"));//浜у搧鎻忚堪
+ payInfo.setProducId(json.getString("cpInfo"));//浜у搧ID
+ payInfo.setCpOrderId(json.getString("orderId"));//璁㈠崟鍙�
+ payInfo.setAmount(json.getDouble("mount"));//鏀粯閲戦 绮剧‘鍒颁袱浣嶅皬鏁�
+ payInfo.setCallbackURL("callbackUrl");//鍥炶皟鍦板潃锛涢�氱煡鍙戣揣鍦板潃(闇�鍔犲瘑)宸ュ叿鍦ㄤ笅鏂癸紝255涓瓧绗﹀唴
+ payInfo.setCallbackInfo(attach);//閫忎紶鍙傛暟锛涙父鎴忔柟鐨勫洖璋冨湴鍧�鎵�闇�閫忎紶鍙傛暟锛屾湇鍔＄鏀粯鍥炶皟鏃跺師鏍疯繑鍥�
- String attach = "9996_" + json.getString("orderId") + "_" + json.getString("sid") + "_" + json.getString("cpInfo");
- roleInfo.setRemark(attach);
- roleInfo.setCpOrderId(json.getString("orderId"));
- MySdkMgr.I.pay(roleInfo);
+ MySdkMgr.I.pay(payInfo);
}
}
diff --git a/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdRoleLevelUp.java b/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdRoleLevelUp.java
index de6f1b1..1f26acb 100644
--- a/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdRoleLevelUp.java
+++ b/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdRoleLevelUp.java
@@ -1,8 +1,8 @@
package com.secondworld.sdk.command;
-import com.juefeng.sdk.juefengsdk.JFSDK;
-import com.juefeng.sdk.juefengsdk.services.bean.JfRoleInfo;
+import com.lp.overseas.sdk.external.model.RoleData;
+import com.secondworld.sdk.GTGameMain;
import com.secondworld.sdk.MySdkMgr;
import com.secondworld.sdk.utils.CodeU2A;
@@ -17,18 +17,15 @@
@Override
public void process(JSONObject json) throws Exception {
//涓婃姤瑙掕壊淇℃伅
- JfRoleInfo roleInfo = new JfRoleInfo();
- roleInfo.setGameRoleLevel(json.getString("level"));
- roleInfo.setRoleId(json.getString("roleID"));
- roleInfo.setGameRolePower(json.getInt("fightPower"));
- roleInfo.setServerId(json.getString("sid"));
- roleInfo.setServerName(json.getString("serverName"));
- roleInfo.setRoleName(json.getString("roleName"));
- roleInfo.setExperience("1");
- roleInfo.setPartyId(json.getString("familyID"));
- roleInfo.setPartyName(json.getString("familyName"));
- roleInfo.setVipLevel(json.getInt("vipLevel"));
- roleInfo.setType("3");
- JFSDK.getInstance().syncInfo(roleInfo);
+ 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.roleLevelUp(GTGameMain.I.activity, data);
}
}
diff --git a/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdRoleLogin.java b/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdRoleLogin.java
index f3c3d87..daac423 100644
--- a/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdRoleLogin.java
+++ b/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdRoleLogin.java
@@ -1,7 +1,7 @@
package com.secondworld.sdk.command;
-import com.juefeng.sdk.juefengsdk.JFSDK;
-import com.juefeng.sdk.juefengsdk.services.bean.JfRoleInfo;
+import com.lp.overseas.sdk.external.model.RoleData;
+import com.secondworld.sdk.GTGameMain;
import com.secondworld.sdk.MySdkMgr;
import com.secondworld.sdk.utils.CodeU2A;
@@ -17,18 +17,15 @@
public void process(JSONObject json) throws Exception {
//涓婃姤瑙掕壊淇℃伅
- JfRoleInfo roleInfo = new JfRoleInfo();
- roleInfo.setGameRoleLevel(json.getString("level"));
- roleInfo.setRoleId(json.getString("roleID"));
- roleInfo.setGameRolePower(json.getInt("fightPower"));
- roleInfo.setServerId(json.getString("sid"));
- roleInfo.setServerName(json.getString("serverName"));
- roleInfo.setRoleName(json.getString("roleName"));
- roleInfo.setExperience("1");
- roleInfo.setPartyId(json.getString("familyID"));
- roleInfo.setPartyName(json.getString("familyName"));
- roleInfo.setVipLevel(json.getInt("vipLevel"));
- roleInfo.setType("2");
- JFSDK.getInstance().syncInfo(roleInfo);
+ 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.roleLogin(GTGameMain.I.activity, data);
}
}
diff --git a/SdkProject/channel/hyyngame/res/values/strings.xml b/SdkProject/channel/hyyngame/res/values/strings.xml
new file mode 100644
index 0000000..9ec0e14
--- /dev/null
+++ b/SdkProject/channel/hyyngame/res/values/strings.xml
@@ -0,0 +1,7 @@
+<resources>
+ <string name="facebook_app_id">4125229144241169
+</string> <string name="fb_login_protocol_scheme">fb4125229144241169
+</string>
+ <string name="facebook_client_token">a0ac8136a5d7dd1657d29cc34c5bdfe5</string>
+
+</resources>
\ No newline at end of file
diff --git a/SdkProject/library/build.gradle b/SdkProject/library/build.gradle
index 5d332f9..9c7d235 100644
--- a/SdkProject/library/build.gradle
+++ b/SdkProject/library/build.gradle
@@ -208,9 +208,9 @@
implementation(name: 'lp_v1.1.3', 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/src/main/java/com/secondworld/sdk/GameActivity.java b/SdkProject/library/src/main/java/com/secondworld/sdk/GameActivity.java
index c3fc094..e0ec873 100644
--- a/SdkProject/library/src/main/java/com/secondworld/sdk/GameActivity.java
+++ b/SdkProject/library/src/main/java/com/secondworld/sdk/GameActivity.java
@@ -10,7 +10,6 @@
import com.secondworld.sdk.utils.LogUtil;
import com.secondworld.sdk.utils.WebViewUtil;
-import com.juefeng.sdk.juefengsdk.JFSDK;
public class GameActivity extends UnityPlayerActivity {
@@ -60,8 +59,6 @@
super.onRestart();
if (proxy != null)
proxy.onRestart();
-
- JFSDK.getInstance().onRestart(GTGameMain.I.activity);
}
@Override
@@ -97,7 +94,6 @@
super.onNewIntent(intent);
if (proxy != null)
proxy.onNewIntent(intent);
- JFSDK.getInstance().onNewIntent(GTGameMain.I.activity, intent);
}
@Override
@@ -122,28 +118,25 @@
return b ? b : super.onKeyDown(keyCode, event);
}
- @Override
- public boolean dispatchKeyEvent(KeyEvent event) {
- if(event.getKeyCode() == KeyEvent.KEYCODE_BACK) {
- if(event.getAction() == KeyEvent.ACTION_DOWN&&event.getRepeatCount() == 0) {
- JFSDK.getInstance().exitLogin(GTGameMain.I.activity);
- return true;
- }
- }
- return super.dispatchKeyEvent(event);
- }
+
@Override
public void onWindowFocusChanged(boolean hasFocus)
{
super.onWindowFocusChanged(hasFocus);
- JFSDK.getInstance().onWindowFocusChanged(hasFocus);
+ MySdkMgr.manger.onWindowFocusChanged(hasFocus, GTGameMain.I.activity);
}
@Override
- public void onBackPressed()
+ public void onAttachedToWindow()
{
- super.onBackPressed();
- JFSDK.getInstance().onBackPressed(GTGameMain.I.activity);
+ super.onAttachedToWindow();
+ MySdkMgr.manger.onAttachedToWindow();
+ }
+
+ @Override
+ public void onDetachedFromWindow() {
+ super.onDetachedFromWindow();
+ MySdkMgr.manger.onDetachedFromWindow();
}
}
\ No newline at end of file
--
Gitblit v1.8.0