From 69359b93eab6e6e20fd7e53217f705d713c04fa0 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期四, 11 十月 2018 15:11:23 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/U3DRepository
---
ChannelDiff/iOS/jisugameios/The2thWorldSDK/UniversalSDK.mm | 17 +++++++----------
ChannelDiff/iOS/jisugameios/SDK/XHAuxiliaryResource.bundle/XHAuxiliaryConfig.plist | 2 +-
2 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/ChannelDiff/iOS/jisugameios/SDK/XHAuxiliaryResource.bundle/XHAuxiliaryConfig.plist b/ChannelDiff/iOS/jisugameios/SDK/XHAuxiliaryResource.bundle/XHAuxiliaryConfig.plist
index 7b3b0c6..46d6b20 100644
--- a/ChannelDiff/iOS/jisugameios/SDK/XHAuxiliaryResource.bundle/XHAuxiliaryConfig.plist
+++ b/ChannelDiff/iOS/jisugameios/SDK/XHAuxiliaryResource.bundle/XHAuxiliaryConfig.plist
@@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>APPID</key>
- <string>1059</string>
+ <string>1071</string>
<key>SID</key>
<string>59</string>
</dict>
diff --git a/ChannelDiff/iOS/jisugameios/The2thWorldSDK/UniversalSDK.mm b/ChannelDiff/iOS/jisugameios/The2thWorldSDK/UniversalSDK.mm
index 802bcfd..39d98f1 100644
--- a/ChannelDiff/iOS/jisugameios/The2thWorldSDK/UniversalSDK.mm
+++ b/ChannelDiff/iOS/jisugameios/The2thWorldSDK/UniversalSDK.mm
@@ -31,6 +31,7 @@
static int sBatteryLevel = -1;
static int sBatteryState = -1;
static NSThread * _thread;
+static NSString* APP_ID;
-(void) Init
{
@@ -102,7 +103,7 @@
/* 鍒濆鍖朣DK */
[XHAuxiliarySDK setDelegate:self];
- [[XHAuxiliarySDK defaultXHAuxiliary] XHAuxiliarySDKInitWithCompletion:^(XHAuxiliaryInitErrorCode result) {
+ [[XHAuxiliarySDK defaultXHAuxiliary] XHAuxiliarySDKInitWithAPPID:@"1071" Completion:^(XHAuxiliaryInitErrorCode result) {
if (result == XHAuxiliaryInitErrorCodeNone) {
// 鍒濆鍖朣DK鎴愬姛
@@ -127,14 +128,6 @@
}
}];
-
-// [[MRSDK getInstance] registerLogoutSuccess:^{
-// NSLog(@"DK鍐呴儴娉ㄩ攢璐﹀彿鎸夐挳娉ㄩ攢鎴愬姛");
-// NSDictionary *_dict = [NSDictionary dictionaryWithObjectsAndKeys:
-// [NSNumber numberWithInt:S2U_FreePlatformLogoutOk], @"code", nil];
-//
-// [self SendMessageToUnity:_dict];
-// }];
}
@@ -167,6 +160,7 @@
[NSNumber numberWithInt:S2U_FreePlatformPayOk],@"code",nil];
[self SendMessageToUnity:_dict];
}else if (result == XHAuxiliary_CANCEL){
+ NSLog(@"鍙栨秷 %@",data);
NSMutableDictionary *_dict = [NSMutableDictionary dictionaryWithObjectsAndKeys:
[NSNumber numberWithInt:S2U_FreePlatformPayFail],@"code",nil];
[ self SendMessageToUnity:_dict];
@@ -360,6 +354,7 @@
switch([[_dict objectForKey:@"code"] intValue]){
case U2S_Init:
[self Init];
+ APP_ID = [_dict objectForKey:@"appID"];
break;
case U2S_CopyContent:
[UIPasteboard generalPasteboard].string = _dict[@"content"];
@@ -418,7 +413,7 @@
_roleName = [_temp stringByReplacingOccurrencesOfString:@"\u0000" withString:@""];
NSString* _extraData = [NSString stringWithFormat:@"{\"appid\":\"%@\",\"cpinfo\":\"%@\",\"cporderid\":\"%@\"}",
- @"jsgameios",
+ APP_ID,
[_dict objectForKey:@"cpInfo"],
[_dict objectForKey:@"orderId"]];
@@ -427,6 +422,8 @@
andWithLLItemP:[[_dict objectForKey:@"mount"] intValue] * 100
andWithLLReserved:_extraData
andWithLLDesc:[_dict objectForKey:@"title"]];
+
+
}
break;
case U2S_PayFinished:
--
Gitblit v1.8.0