tools/ios-unity
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug fix: logout google call tiktok login

Browse Source
This commit is contained in:
CounterFire2023 2024-02-20 18:48:53 +08:00
parent c1236fa604
commit 526cc133ad
8 changed files with 835 additions and 737 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Classes_cocos/JcWallet.mm
View File

@ -448,7 +448,7 @@ bool jsb_signOutGoogle(se::State& s) {
NSString *nfunid = [NSString stringWithCString:funid.c_str() encoding:NSUTF8StringEncoding]; NSString *nfunid = [NSString stringWithCString:funid.c_str() encoding:NSUTF8StringEncoding];
dispatch_async(dispatch_get_main_queue(), ^{ dispatch_async(dispatch_get_main_queue(), ^{
UIWindow* window = [[[UIApplication sharedApplication] delegate] window]; UIWindow* window = [[[UIApplication sharedApplication] delegate] window];
[window.rootViewController signWithTikTok:nfunid]; [window.rootViewController signOutGoogle:nfunid];
}); });
return true; return true;
} }
@ -673,7 +673,6 @@ static bool JSB_storageGameInfo(se::State& s)
ok = seval_to_std_string(args[1], &param0); ok = seval_to_std_string(args[1], &param0);
SE_PRECONDITION2(ok, false, "param0 is invalid!"); SE_PRECONDITION2(ok, false, "param0 is invalid!");
NSString *nParam0 = [NSString stringWithCString:param0.c_str() encoding: NSUTF8StringEncoding]; NSString *nParam0 = [NSString stringWithCString:param0.c_str() encoding: NSUTF8StringEncoding];
NSString *nfunid = [NSString stringWithCString:funid.c_str() encoding: NSUTF8StringEncoding];
[[GlobalData shareInstance] setGameData:nParam0]; [[GlobalData shareInstance] setGameData:nParam0];
return true; return true;
} }

1
Classes_cocos/UIViewController+Wallet.mm
View File

@ -100,6 +100,7 @@ static WebPageViewController *webpageVC = nil;
} }
-(void)signWithGoogle:(NSString *)funid { -(void)signWithGoogle:(NSString *)funid {
// UnitySendMessage("WalletPanel1", "onNativeCallback", "2222222222");
[GIDSignIn.sharedInstance restorePreviousSignInWithCompletion:^(GIDGoogleUser * _Nullable user, [GIDSignIn.sharedInstance restorePreviousSignInWithCompletion:^(GIDGoogleUser * _Nullable user,
NSError * _Nullable error) { NSError * _Nullable error) {
if (error) { if (error) {

10
Info.plist
View File

@ -15,7 +15,7 @@
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string> <string>${EXECUTABLE_NAME}</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
<string>${PRODUCT_BUNDLE_IDENTIFIER}</string> <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key> <key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string> <string>6.0</string>
<key>CFBundleName</key> <key>CFBundleName</key>
@ -66,6 +66,14 @@
<string>cfoauthcb</string> <string>cfoauthcb</string>
</array> </array>
</dict> </dict>
<dict>
<key>CFBundleTypeRole</key>
<string>Editor</string>
<key>CFBundleURLSchemes</key>
<array>
<string>com.googleusercontent.apps.53206975661-qan0rnefniegjv53ohild375pv0p7ekd</string>
</array>
</dict>
</array> </array>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>0</string> <string>0</string>

1268
Unity-iPhone.xcodeproj/project.pbxproj
View File

File diff suppressed because it is too large Load Diff

BIN
Unity-iPhone.xcworkspace/xcuserdata/zhl.xcuserdatad/UserInterfaceState.xcuserstate generated
View File

Binary file not shown.

162
Unity-iPhone.xcworkspace/xcuserdata/zhl.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View File

@ -14,8 +14,8 @@
filePath = "Classes_cocos/UIViewController+Wallet.mm" filePath = "Classes_cocos/UIViewController+Wallet.mm"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "156" startingLineNumber = "157"
endingLineNumber = "156" endingLineNumber = "157"
landmarkName = "-signWithTikTok:" landmarkName = "-signWithTikTok:"
landmarkType = "7"> landmarkType = "7">
<Locations> <Locations>
@ -346,8 +346,8 @@
filePath = "Classes_cocos/UIViewController+Wallet.mm" filePath = "Classes_cocos/UIViewController+Wallet.mm"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "220" startingLineNumber = "221"
endingLineNumber = "220" endingLineNumber = "221"
landmarkName = "-signWithOAuth:jsondata:" landmarkName = "-signWithOAuth:jsondata:"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@ -583,8 +583,8 @@
filePath = "../../crypto/cocos_js/cocos/scripting/js-bindings/manual/jsb_global.cpp" filePath = "../../crypto/cocos_js/cocos/scripting/js-bindings/manual/jsb_global.cpp"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "1384" startingLineNumber = "1385"
endingLineNumber = "1384" endingLineNumber = "1385"
landmarkName = "JSB_walletSign(s)" landmarkName = "JSB_walletSign(s)"
landmarkType = "9"> landmarkType = "9">
</BreakpointContent> </BreakpointContent>
@ -593,7 +593,7 @@
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint"> BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent <BreakpointContent
uuid = "463FD24C-5F99-4FA1-AE20-9FB8C1B7855C" uuid = "463FD24C-5F99-4FA1-AE20-9FB8C1B7855C"
shouldBeEnabled = "Yes" shouldBeEnabled = "No"
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
filePath = "Classes_cocos/AppDelegate.mm" filePath = "Classes_cocos/AppDelegate.mm"
@ -743,8 +743,8 @@
filePath = "../../crypto/cocos_js/cocos/scripting/js-bindings/manual/jsb_global.cpp" filePath = "../../crypto/cocos_js/cocos/scripting/js-bindings/manual/jsb_global.cpp"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "1402" startingLineNumber = "1403"
endingLineNumber = "1402" endingLineNumber = "1403"
landmarkName = "JSB_preRegistClient(s)" landmarkName = "JSB_preRegistClient(s)"
landmarkType = "9"> landmarkType = "9">
</BreakpointContent> </BreakpointContent>
@ -759,8 +759,8 @@
filePath = "../../crypto/cocos_js/cocos/scripting/js-bindings/manual/jsb_global.cpp" filePath = "../../crypto/cocos_js/cocos/scripting/js-bindings/manual/jsb_global.cpp"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "1401" startingLineNumber = "1402"
endingLineNumber = "1401" endingLineNumber = "1402"
landmarkName = "JSB_preRegistClient(s)" landmarkName = "JSB_preRegistClient(s)"
landmarkType = "9"> landmarkType = "9">
</BreakpointContent> </BreakpointContent>
@ -775,8 +775,8 @@
filePath = "../../crypto/cocos_js/cocos/scripting/js-bindings/manual/jsb_global.cpp" filePath = "../../crypto/cocos_js/cocos/scripting/js-bindings/manual/jsb_global.cpp"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "1405" startingLineNumber = "1406"
endingLineNumber = "1405" endingLineNumber = "1406"
landmarkName = "JSB_preRegistClient(s)" landmarkName = "JSB_preRegistClient(s)"
landmarkType = "9"> landmarkType = "9">
</BreakpointContent> </BreakpointContent>
@ -797,22 +797,6 @@
landmarkType = "9"> landmarkType = "9">
</BreakpointContent> </BreakpointContent>
</BreakpointProxy> </BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "D8BB00DC-AA20-47C3-93F9-9D03FDFA9F42"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Classes_cocos/UIViewController+Wallet.mm"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "217"
endingLineNumber = "217"
landmarkName = "-signWithOAuth:jsondata:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy <BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint"> BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent <BreakpointContent
@ -823,8 +807,8 @@
filePath = "Classes_cocos/UIViewController+Wallet.mm" filePath = "Classes_cocos/UIViewController+Wallet.mm"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "219" startingLineNumber = "220"
endingLineNumber = "219" endingLineNumber = "220"
landmarkName = "-signWithOAuth:jsondata:" landmarkName = "-signWithOAuth:jsondata:"
landmarkType = "7"> landmarkType = "7">
<Locations> <Locations>
@ -871,11 +855,123 @@
filePath = "Classes_cocos/UIViewController+Wallet.mm" filePath = "Classes_cocos/UIViewController+Wallet.mm"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "205" startingLineNumber = "206"
endingLineNumber = "205" endingLineNumber = "206"
landmarkName = "-signWithOAuth:jsondata:" landmarkName = "-signWithOAuth:jsondata:"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
</BreakpointProxy> </BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "38A416AE-DB0D-4382-906F-23D619F4FCDD"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "../../crypto/cocos_js/cocos/scripting/js-bindings/jswrapper/Value.cpp"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "539"
endingLineNumber = "539"
landmarkName = "Value::toObject()"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "5F4DFE27-E1BE-4125-A5AC-132BF2C3EA48"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Classes_cocos/UIViewController+Wallet.mm"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "229"
endingLineNumber = "229"
landmarkName = "-receiveDeepLinkNotification:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "5129FE12-2D47-4464-B451-57DB8A8D6339"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Classes_cocos/UIViewController+Wallet.mm"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "255"
endingLineNumber = "255"
landmarkName = "-receiveDeepLinkNotification:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "A1C67AE0-9CC3-4141-AD20-CA7987936EB9"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Classes_cocos/UIViewController+Wallet.mm"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "118"
endingLineNumber = "118"
landmarkName = "-signOutGoogle:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "657BDF5B-746F-4A89-96C2-B74236984F18"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Classes_cocos/UIViewController+Wallet.mm"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "104"
endingLineNumber = "104"
landmarkName = "-signWithGoogle:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "B7FBBE9B-363A-4ED2-AB46-FC6E758639BC"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Classes_cocos/UIViewController+Wallet.mm"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "106"
endingLineNumber = "106"
landmarkName = "-signWithGoogle:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "65C26B1C-0A9A-43D7-9945-1AB1480B4D62"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Classes_cocos/UIViewController+Wallet.mm"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "109"
endingLineNumber = "109"
landmarkName = "-signWithGoogle:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints> </Breakpoints>
</Bucket> </Bucket>

46
Unity-iPhone.xcworkspace/xcuserdata/zhl.xcuserdatad/xcdebugger/Expressions.xcexplist
View File

@ -3,26 +3,16 @@
version = "1.0"> version = "1.0">
<ContextStates> <ContextStates>
<ContextState <ContextState
contextName = "-[UnityAppController application:openURL:options:]:UnityAppController.mm"> contextName = "-[UIViewController(Wallet) receiveDeepLinkNotification:]:UIViewController+Wallet.mm">
<PersistentStrings> <PersistentStrings>
<PersistentString <PersistentString
value = "sourceApplication"> value = "components.queryItems">
</PersistentString> </PersistentString>
</PersistentStrings>
</ContextState>
<ContextState
contextName = "JSB_prepareRelayRSAKey(se::State&amp;):jsb_global.cpp">
<PersistentStrings>
<PersistentString <PersistentString
value = "key_str.length()"> value = "[url fragment]">
</PersistentString> </PersistentString>
</PersistentStrings>
</ContextState>
<ContextState
contextName = "-[StoreObserver handlePurchasedTransaction:]:StoreObserver.m">
<PersistentStrings>
<PersistentString <PersistentString
value = "&#10;transaction.originalID"> value = "components.fragment">
</PersistentString> </PersistentString>
</PersistentStrings> </PersistentStrings>
</ContextState> </ContextState>
@ -35,10 +25,18 @@
</PersistentStrings> </PersistentStrings>
</ContextState> </ContextState>
<ContextState <ContextState
contextName = "(anonymous namespace)::require(se::State&amp;):jsb_global.cpp"> contextName = "-[StoreObserver handlePurchasedTransaction:]:StoreObserver.m">
<PersistentStrings> <PersistentStrings>
<PersistentString <PersistentString
value = "args[0].toString()"> value = "&#10;transaction.originalID">
</PersistentString>
</PersistentStrings>
</ContextState>
<ContextState
contextName = "-[UnityAppController application:openURL:options:]:UnityAppController.mm">
<PersistentStrings>
<PersistentString
value = "sourceApplication">
</PersistentString> </PersistentString>
</PersistentStrings> </PersistentStrings>
</ContextState> </ContextState>
@ -50,5 +48,21 @@
</PersistentString> </PersistentString>
</PersistentStrings> </PersistentStrings>
</ContextState> </ContextState>
<ContextState
contextName = "JSB_prepareRelayRSAKey(se::State&amp;):jsb_global.cpp">
<PersistentStrings>
<PersistentString
value = "key_str.length()">
</PersistentString>
</PersistentStrings>
</ContextState>
<ContextState
contextName = "(anonymous namespace)::require(se::State&amp;):jsb_global.cpp">
<PersistentStrings>
<PersistentString
value = "args[0].toString()">
</PersistentString>
</PersistentStrings>
</ContextState>
</ContextStates> </ContextStates>
</VariablesViewState> </VariablesViewState>

82
js/jcwallet.js
View File

File diff suppressed because one or more lines are too long