修改iOS配置

Assets/AdSDK/AD/CSJ/UnionPlatform.meta

+fileFormatVersion: 2
+guid: 6915fe3cccc9344909d4516bf2cd6714
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/AdSDK/AD/CSJ/UnionPlatform/Plugins.meta

+fileFormatVersion: 2
+guid: 390fc920191800446ac0ea22e38b6f1e
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/AdSDK/AD/CSJ/UnionPlatform/Scripts.meta

+fileFormatVersion: 2
+guid: cc3f54bf649c642c892c9ea1b422cb2f
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Plugins/iOS/Bridage/BridageManager.h

@@ -12,6 +12,9 @@
 NS_ASSUME_NONNULL_BEGIN
 @interface BridageManager : UIResponder<UIApplicationDelegate, WXApiDelegate>
 
+@property (nonatomic, strong) NSString *udid;
+@property (nonatomic, strong) NSString *idfaString;
+
 +(instancetype)shareManager;
 
 -(void)bridage;

Assets/Plugins/iOS/Bridage/BridageManager.m

@@ -9,8 +9,8 @@
 #import "BridageManager.h"
 #import "UserData.h"
 #import "BGKeychainTool.h"
-//#import <BUAdSDK/BUAdSDK.h>
-//#import <UMCommon/UMCommon.h>
+#import <BUAdSDK/BUAdSDK.h>
+#import <UMCommon/UMCommon.h>
 
 @interface BridageManager ()
 
@@ -86,11 +86,11 @@ char* MakeStringCopy(const char* string){
 //信息提示
 void OnShowMessage(const char* msg)
 {
-//    UnitySendMessage("WxLogin","LoginCallBack",MakeStringCopy(msg));
+    UnitySendMessage("LoginView", "LoginCallBack", MakeStringCopy(msg));
 }
 void OnShareShowMessage(const char* msg)
 {
-    //UnitySendMessage("MainPanel","ShareCallBack",MakeStringCopy(msg));
+//    UnitySendMessage("MainPanel","ShareCallBack",MakeStringCopy(msg));
 }
 
 -(void)bridage
@@ -99,13 +99,13 @@ void OnShareShowMessage(const char* msg)
     NSDictionary *userDic = [data readPlist];
 
     if ([BGKeychainTool getDeviceIDInKeychain].length > 0) {
-        NSString *udid = [BGKeychainTool getDeviceIDInKeychain];
+        _udid = [BGKeychainTool getDeviceIDInKeychain];
 
         
     }
     
     if (userDic[@"idfa"]) {
-        NSString *idfaString = [NSString stringWithFormat:@"%@",userDic[@"idfa"]];
+        _idfaString = [NSString stringWithFormat:@"%@",userDic[@"idfa"]];
 
     }
     
@@ -125,12 +125,12 @@ extern "C" {
         NSLog(@"穿山甲appid:%@", [NSString stringWithUTF8String:appId]);
         
         //穿山甲
-//        [BUAdSDKManager setAppID:[NSString stringWithUTF8String:appId]];
-////        [BUAdSDKManager setAppID:@"5000546"];
-//        [BUAdSDKManager setGDPR:0];
-//        [BUAdSDKManager setCoppa:0];
-//        [BUAdSDKManager setIsPaidApp:NO];
-//        [BUAdSDKManager setLoglevel:BUAdSDKLogLevelDebug];
+        [BUAdSDKManager setAppID:[NSString stringWithUTF8String:appId]];
+//        [BUAdSDKManager setAppID:@"5000546"];
+        [BUAdSDKManager setGDPR:0];
+        [BUAdSDKManager setCoppa:0];
+        [BUAdSDKManager setIsPaidApp:NO];
+        [BUAdSDKManager setLoglevel:BUAdSDKLogLevelDebug];
     }
     
     // 初始化友盟SDK
@@ -138,14 +138,14 @@ extern "C" {
     {
         NSLog(@"unity传值:%@", [NSString stringWithUTF8String:appKey]);
         
-//        [UMConfigure initWithAppkey:[NSString stringWithUTF8String:appKey] channel:@"App Store"];
-//        [UMConfigure setLogEnabled: NO];
+        [UMConfigure initWithAppkey:[NSString stringWithUTF8String:appKey] channel:@"App Store"];
+        [UMConfigure setLogEnabled: NO];
     }
     
     typedef void (*ResultHandler) (const char *device, const char *idfa);
     void BridageDeviceAndIDFA(ResultHandler resultHandler)
     {
-        resultHandler(@"非托管方法交互成功1".UTF8String, @"非托管方法交互成功2".UTF8String);
+        resultHandler([BridageManager shareManager].udid.UTF8String, [BridageManager shareManager].idfaString.UTF8String);
     }
     
      

Assets/Plugins/iOS/KeyChain/KeychainItemManager.m

@@ -11,6 +11,7 @@
 #import <AppTrackingTransparency/AppTrackingTransparency.h>
 #import "KeychainItemWrapper.h"
 #import "UserData.h"
+#import "BridageManager.h"
 
 NSString * const FCLogin        = @"SKLogin";
 NSString * const FCIdentifier   = @"SKIdentifier";
@@ -36,6 +37,8 @@ NSString * const FCIdentifier   = @"SKIdentifier";
                 NSString *idfa = [[[ASIdentifierManager sharedManager] advertisingIdentifier] UUIDString];
                 if (idfa.length) {
                     [data writeValue:idfa Key:@"idfa"];
+                    
+                    [[BridageManager shareManager] bridage];
                 }
             }
         }];

Packages/packages-lock.json

@@ -11,7 +11,7 @@
         "com.unity.modules.animation": "1.0.0",
         "com.unity.modules.uielements": "1.0.0"
       },
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.2d.common": {
       "version": "2.1.0",
@@ -21,21 +21,21 @@
         "com.unity.2d.sprite": "1.0.0",
         "com.unity.modules.uielements": "1.0.0"
       },
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.2d.path": {
       "version": "2.1.0",
       "depth": 1,
       "source": "registry",
       "dependencies": {},
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.2d.pixel-perfect": {
       "version": "2.1.0",
       "depth": 0,
       "source": "registry",
       "dependencies": {},
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.2d.psdimporter": {
       "version": "2.1.6",
@@ -46,7 +46,7 @@
         "com.unity.2d.animation": "3.2.5",
         "com.unity.2d.sprite": "1.0.0"
       },
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.2d.sprite": {
       "version": "1.0.0",
@@ -63,7 +63,7 @@
         "com.unity.2d.common": "2.0.2",
         "com.unity.2d.path": "2.0.6"
       },
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.2d.tilemap": {
       "version": "1.0.0",
@@ -76,14 +76,14 @@
       "depth": 0,
       "source": "registry",
       "dependencies": {},
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.ext.nunit": {
       "version": "1.0.6",
       "depth": 1,
       "source": "registry",
       "dependencies": {},
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.ide.rider": {
       "version": "1.1.4",
@@ -92,28 +92,28 @@
       "dependencies": {
         "com.unity.test-framework": "1.1.1"
       },
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.ide.vscode": {
       "version": "1.2.3",
       "depth": 0,
       "source": "registry",
       "dependencies": {},
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.mathematics": {
       "version": "1.1.0",
       "depth": 1,
       "source": "registry",
       "dependencies": {},
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.mobile.android-logcat": {
       "version": "1.2.1",
       "depth": 0,
       "source": "registry",
       "dependencies": {},
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.mobile.notifications": {
       "version": "1.3.2",
@@ -122,7 +122,7 @@
       "dependencies": {
         "com.unity.modules.androidjni": "1.0.0"
       },
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.test-framework": {
       "version": "1.1.22",
@@ -133,7 +133,7 @@
         "com.unity.modules.imgui": "1.0.0",
         "com.unity.modules.jsonserialize": "1.0.0"
       },
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.textmeshpro": {
       "version": "2.1.3",
@@ -142,7 +142,7 @@
       "dependencies": {
         "com.unity.ugui": "1.0.0"
       },
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.timeline": {
       "version": "1.2.18",
@@ -154,7 +154,7 @@
         "com.unity.modules.audio": "1.0.0",
         "com.unity.modules.particlesystem": "1.0.0"
       },
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.ugui": {
       "version": "1.0.0",

ProjectSettings/PackageManagerSettings.asset

@@ -17,7 +17,7 @@ MonoBehaviour:
   m_Registries:
   - m_Id: main
     m_Name: 
-    m_Url: https://packages.unity.cn
+    m_Url: https://packages.unity.com
     m_Scopes: []
     m_IsDefault: 1
   m_UserSelectedRegistryName: 

ProjectSettings/ProjectVersion.txt

-m_EditorVersion: 2019.4.19f1c1
-m_EditorVersionWithRevision: 2019.4.19f1c1 (e27b4ba3cbee)
+m_EditorVersion: 2019.4.19f1
+m_EditorVersionWithRevision: 2019.4.19f1 (ca5b14067cec)