From 5aa1e7662f1ce198c538d4a9edc190932fe6b953 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期四, 19 十一月 2020 11:40:52 +0800
Subject: [PATCH] 0312 横竖转向问题,主线程调用问题
---
Project/qkcw2_sdk/build.gradle | 2
Project/qkcw2_sdk/src/game_qk/java/com/secondworld/universalsdk/H2EngineSDK.java | 51 +++++++++++++++++++++++--
Project/qkcw2_sdk/src/main/java/com/secondworld/universalsdk/MainActivity.java | 19 +++++++++
ChannelDiff/Android/qkcwgame/libs/qkcw2_sdk-game_qk-release.aar | 0
ChannelDiff/Android/qkcwgame/AndroidManifest.xml | 2
5 files changed, 67 insertions(+), 7 deletions(-)
diff --git a/ChannelDiff/Android/qkcwgame/AndroidManifest.xml b/ChannelDiff/Android/qkcwgame/AndroidManifest.xml
index 2cc402c..ae04649 100644
--- a/ChannelDiff/Android/qkcwgame/AndroidManifest.xml
+++ b/ChannelDiff/Android/qkcwgame/AndroidManifest.xml
@@ -7,7 +7,7 @@
android:versionName="1.0" >
<uses-sdk
- android:minSdkVersion="16"
+ android:minSdkVersion="17"
android:targetSdkVersion="26" />
<uses-permission android:name="android.permission.INTERNET" />
diff --git a/ChannelDiff/Android/qkcwgame/libs/qkcw2_sdk-game_qk-release.aar b/ChannelDiff/Android/qkcwgame/libs/qkcw2_sdk-game_qk-release.aar
index bee35d4..8c71696 100644
--- a/ChannelDiff/Android/qkcwgame/libs/qkcw2_sdk-game_qk-release.aar
+++ b/ChannelDiff/Android/qkcwgame/libs/qkcw2_sdk-game_qk-release.aar
Binary files differ
diff --git a/Project/qkcw2_sdk/build.gradle b/Project/qkcw2_sdk/build.gradle
index 83cec01..2f812ae 100644
--- a/Project/qkcw2_sdk/build.gradle
+++ b/Project/qkcw2_sdk/build.gradle
@@ -6,7 +6,7 @@
defaultConfig {
- minSdkVersion 16
+ minSdkVersion 17
targetSdkVersion 26
versionCode 1
versionName "1.0"
diff --git a/Project/qkcw2_sdk/src/game_qk/java/com/secondworld/universalsdk/H2EngineSDK.java b/Project/qkcw2_sdk/src/game_qk/java/com/secondworld/universalsdk/H2EngineSDK.java
index 640e2f6..35aa4c7 100644
--- a/Project/qkcw2_sdk/src/game_qk/java/com/secondworld/universalsdk/H2EngineSDK.java
+++ b/Project/qkcw2_sdk/src/game_qk/java/com/secondworld/universalsdk/H2EngineSDK.java
@@ -100,12 +100,14 @@
case CodeU2A.FreePlatformInit:
break;
case CodeU2A.FreePlatformLogin:
- QuickPlatformUtil.getInstance().login(_activity);
+ //QuickPlatformUtil.getInstance().login(_activity);
+ LoginEx(_activity);
break;
case CodeU2A.FreePlatformSwitchAccount:
break;
case CodeU2A.FreePlatformLogout:
- QuickPlatformUtil.getInstance().logout(_activity);
+ //QuickPlatformUtil.getInstance().logout(_activity);
+ LogoutEx(_activity);
break;
case CodeU2A.FreePlatformPay:
@@ -212,7 +214,8 @@
roleInfo.setProfession("娉曞笀"); //360娓犻亾鍙傛暟锛岃缃鑹茶亴涓氬悕绉�
roleInfo.setFriendlist(
"鏃�"); //360娓犻亾鍙傛暟锛岃缃ソ鍙嬪叧绯诲垪琛紝鏍煎紡璇峰弬鑰冿細http://open.quicksdk.net/help/detail/aid/190
- User.getInstance().setGameRoleInfo(_activity, roleInfo, true);
+ //User.getInstance().setGameRoleInfo(_activity, roleInfo, true);
+ SetRoleInfoEx(_activity, roleInfo, true);
// QuickPlatformUtil.getInstance().createRole(_activity,
// _json.getString("sid"),
@@ -250,7 +253,8 @@
roleInfo1.setProfession("娉曞笀"); //360娓犻亾鍙傛暟锛岃缃鑹茶亴涓氬悕绉�
roleInfo1.setFriendlist(
"鏃�"); //360娓犻亾鍙傛暟锛岃缃ソ鍙嬪叧绯诲垪琛紝鏍煎紡璇峰弬鑰冿細http://open.quicksdk.net/help/detail/aid/190
- User.getInstance().setGameRoleInfo(_activity, roleInfo1, false);
+ //User.getInstance().setGameRoleInfo(_activity, roleInfo1, false);
+ SetRoleInfoEx(_activity, roleInfo1, false);
// QuickPlatformUtil.getInstance().enterWorld(_activity,
// _json.getString("sid"),
// _json.getString("serverName"),
@@ -288,7 +292,8 @@
roleInfo2.setFriendlist(
"鏃�"); //360娓犻亾鍙傛暟锛岃缃ソ鍙嬪叧绯诲垪琛紝鏍煎紡璇峰弬鑰冿細http://open.quicksdk.net/help/detail/aid/190
- User.getInstance().setGameRoleInfo(_activity, roleInfo2, false);
+ //User.getInstance().setGameRoleInfo(_activity, roleInfo2, false);
+ SetRoleInfoEx(_activity, roleInfo2, false);
// QuickPlatformUtil.getInstance().levelUp(_activity,
// _json.getString("sid"),
// _json.getString("serverName"),
@@ -422,6 +427,42 @@
});
}
+ public static void LoginEx(final Activity activity)
+ {
+ activity.runOnUiThread(new Runnable()
+ {
+ @Override
+ public void run()
+ {
+ QuickPlatformUtil.getInstance().login(activity);
+ }
+ });
+ }
+
+ public static void LogoutEx(final Activity activity)
+ {
+ activity.runOnUiThread(new Runnable()
+ {
+ @Override
+ public void run()
+ {
+ QuickPlatformUtil.getInstance().logout(activity);
+ }
+ });
+ }
+
+ public static void SetRoleInfoEx(final Activity activity, final GameRoleInfo roleInfo, final boolean createRole)
+ {
+ activity.runOnUiThread(new Runnable()
+ {
+ @Override
+ public void run()
+ {
+ User.getInstance().setGameRoleInfo(activity, roleInfo, createRole);
+ }
+ });
+ }
+
public static void RestartApp(final Activity activity)
{
activity.runOnUiThread(new Runnable()
diff --git a/Project/qkcw2_sdk/src/main/java/com/secondworld/universalsdk/MainActivity.java b/Project/qkcw2_sdk/src/main/java/com/secondworld/universalsdk/MainActivity.java
index ec0ca54..1a97ee6 100644
--- a/Project/qkcw2_sdk/src/main/java/com/secondworld/universalsdk/MainActivity.java
+++ b/Project/qkcw2_sdk/src/main/java/com/secondworld/universalsdk/MainActivity.java
@@ -26,6 +26,7 @@
import com.secondworld.univeralsdk.R;
import com.unity3d.player.UnityPlayer;
import com.unity3d.player.UnityPlayerActivity;
+import android.util.DisplayMetrics;
public class MainActivity extends UnityPlayerActivity
{
@@ -40,6 +41,9 @@
private RelativeLayout m_MainContainer;
private int mType;
private boolean isNotch = false;
+
+ private int gameWidth;
+ private int gameHeight;
@Override
protected void onCreate(Bundle savedInstanceState)
@@ -104,6 +108,17 @@
Sdk.getInstance().init(this, "55748756613777418058915575591656", "23010677");
}
QuickSDK.getInstance().setIsLandScape(true);
+
+ DisplayMetrics dm = new DisplayMetrics();
+ this.getWindowManager().getDefaultDisplay().getRealMetrics(dm);
+ if(gameWidth == 0){
+ gameWidth = dm.widthPixels;
+ }
+
+ if(gameHeight == 0)
+ {
+ gameHeight = dm.heightPixels;
+ }
}
@Override
@@ -187,6 +202,10 @@
H2EngineSDK.onConfigurationChanged(newConfig);
super.onConfigurationChanged(newConfig);
+
+ mUnityPlayer.getView().getLayoutParams().width = gameWidth;
+
+ mUnityPlayer.getView().getLayoutParams().height = gameHeight;
}
@Override
--
Gitblit v1.8.0