更新iOS

Assets/Plugins/iOS/AD/IOSADManager.h

-//
-//  IOSADManager.h
-//  caiyuan
-//
-//  Created by 张哲 on 2021/3/8.
-//
-
-#import <Foundation/Foundation.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface IOSADManager : NSObject
-
-@end
-
-NS_ASSUME_NONNULL_END

Assets/Plugins/iOS/AD/IOSADManager.mm

-//
-//  IOSADManager.m
-//  caiyuan
-//
-//  Created by 张哲 on 2021/3/8.
-//
-
-#import "IOSADManager.h"
-#import <BUAdSDK/BUAdSDK.h>
-#import <UMCommon/UMCommon.h>
-#import "ViewController.h"
-
-@implementation IOSADManager
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-    // 初始化穿山甲SDK
-    void InitCSJSDK(char *appId)
-    {
-        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];
-    }
-    
-    // 初始化友盟SDK
-    void InitUMSDK(char *appKey)
-    {
-        NSLog(@"unity传值:%@", [NSString stringWithUTF8String:appKey]);
-        
-        [UMConfigure initWithAppkey:[NSString stringWithUTF8String:appKey] channel:@"App Store"];
-        [UMConfigure setLogEnabled: NO];
-    }
-    
-    void ReSendIDFA()
-    {
-        [[ViewController shareManager] sendIDFA];
-    }
-    
-     
-#if defined(__cplusplus)
-}
-#endif
-
-@end

Assets/Plugins/iOS/API/UnitySignInWithApple.m.meta

-fileFormatVersion: 2
-guid: 1620ed796125a46a0ba04c2a4de7b6fe
-PluginImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  iconMap: {}
-  executionOrder: {}
-  defineConstraints: []
-  isPreloaded: 0
-  isOverridable: 0
-  isExplicitlyReferenced: 0
-  validateReferences: 1
-  platformData:
-  - first:
-      Any: 
-    second:
-      enabled: 0
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
-      enabled: 0
-      settings:
-        DefaultValueInitialized: true
-  - first:
-      iPhone: iOS
-    second:
-      enabled: 1
-      settings: {}
-  - first:
-      tvOS: tvOS
-    second:
-      enabled: 1
-      settings: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Plugins/iOS/AD.meta → Assets/Plugins/iOS/Bridage.meta

 fileFormatVersion: 2
-guid: c66f7e7746c4c404f888d1bf0c2c1cc2
+guid: 51787a7fbbb17459db707fb0c2f45ebe
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/Plugins/iOS/WeChat/ViewController.h → Assets/Plugins/iOS/Bridage/BridageManager.h

@@ -10,12 +10,11 @@
 #import "WXApi.h"
  
 NS_ASSUME_NONNULL_BEGIN
-@interface ViewController : UIResponder<UIApplicationDelegate, WXApiDelegate>
-+ (instancetype)shareManager;
+@interface BridageManager : UIResponder<UIApplicationDelegate, WXApiDelegate>
 
--(void)sendUdid;
++(instancetype)shareManager;
 
--(void)sendIDFA;
+-(void)bridage;
 
 
 @end

Assets/Plugins/iOS/AD/IOSADManager.mm.meta → Assets/Plugins/iOS/Bridage/BridageManager.h.meta

 fileFormatVersion: 2
-guid: d6e0521b9d1e445d188514697e917d63
+guid: b24133e6186444d3f85a6c2035ce141c
 PluginImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/Plugins/iOS/WeChat/ViewController.m → Assets/Plugins/iOS/Bridage/BridageManager.m

 
 //
-//  ViewController.m
+//  BridageManager.m
 //  iosPlugins
 //
 //  Created by os on 2020/4/10.
 //  Copyright © 2020 os. All rights reserved.
 //
-#import "ViewController.h"
+#import "BridageManager.h"
 #import "UserData.h"
 #import "BGKeychainTool.h"
+//#import <BUAdSDK/BUAdSDK.h>
+//#import <UMCommon/UMCommon.h>
+
+@interface BridageManager ()
+
+@end
+
+@implementation BridageManager
 
-@implementation ViewController
 +(instancetype) shareManager
 {
     static dispatch_once_t onceToken;
-    static ViewController *instance;
+    static BridageManager *instance;
     dispatch_once(&onceToken, ^{
-        instance = [[ViewController alloc] init];
+        instance = [[BridageManager alloc] init];
     });
     return instance;
 }
+
 //微信发送请求到第三方应用时，会回调到该方法
 -(void) onReq:(BaseReq *)req {}
 //第三方应用发送到微信的请求处理后的响应结果，会回调到该方法
@@ -78,73 +86,72 @@ char* MakeStringCopy(const char* string){
 //信息提示
 void OnShowMessage(const char* msg)
 {
-    UnitySendMessage("WxLogin","LoginCallBack",MakeStringCopy(msg));
+//    UnitySendMessage("WxLogin","LoginCallBack",MakeStringCopy(msg));
 }
 void OnShareShowMessage(const char* msg)
 {
-    UnitySendMessage("MainPanel","ShareCallBack",MakeStringCopy(msg));
+    //UnitySendMessage("MainPanel","ShareCallBack",MakeStringCopy(msg));
 }
 
--(void)sendUdid
+-(void)bridage
 {
     UserData *data = [[UserData alloc] init];
     NSDictionary *userDic = [data readPlist];
 
     if ([BGKeychainTool getDeviceIDInKeychain].length > 0) {
         NSString *udid = [BGKeychainTool getDeviceIDInKeychain];
-        const char *codeInfo = [udid cStringUsingEncoding:NSASCIIStringEncoding];
-        SendUDID(codeInfo);
+
+        
     }
     
     if (userDic[@"idfa"]) {
         NSString *idfaString = [NSString stringWithFormat:@"%@",userDic[@"idfa"]];
-        const char *codeInfo = [idfaString cStringUsingEncoding:NSASCIIStringEncoding];
-        SendIDFA(codeInfo);
+
     }
     
-    const char *login = [@"login" cStringUsingEncoding:NSASCIIStringEncoding];
-    SendTouristLogin(login);
 }
 
--(void)sendIDFA
+void SendTouristLogin(const char *str)
 {
-    UserData *data = [[UserData alloc] init];
-    NSDictionary *userDic = [data readPlist];
+   // UnitySendMessage("Main Camera","TouristLogin", MakeStringCopy(str));
+}
 
-    if ([BGKeychainTool getDeviceIDInKeychain].length > 0) {
-        NSString *udid = [BGKeychainTool getDeviceIDInKeychain];
-        const char *codeInfo = [udid cStringUsingEncoding:NSASCIIStringEncoding];
-        SendUDID(codeInfo);
+#if defined(__cplusplus)
+extern "C" {
+#endif
+    // 初始化穿山甲SDK
+    void InitCSJSDK(char *appId)
+    {
+        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];
     }
     
-    if (userDic[@"idfa"]) {
-        NSString *idfaString = [NSString stringWithFormat:@"%@",userDic[@"idfa"]];
-        const char *codeInfo = [idfaString cStringUsingEncoding:NSASCIIStringEncoding];
-        SendSplashIDFA(codeInfo);
+    // 初始化友盟SDK
+    void InitUMSDK(char *appKey)
+    {
+        NSLog(@"unity传值:%@", [NSString stringWithUTF8String:appKey]);
+        
+//        [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);
+    }
+    
+     
+#if defined(__cplusplus)
 }
-
-void SendSplashIDFA(const char *str)
-{
-    UnitySendMessage("Canvas","SetIDFA", MakeStringCopy(str));
-}
-
-void SendUDID(const char *str)
-{
-    UnitySendMessage("Main Camera","SetUDID", MakeStringCopy(str));
-}
-
-void SendIDFA(const char *str)
-{
-    UnitySendMessage("Main Camera","SetIDFA", MakeStringCopy(str));
-}
-
-void SendTouristLogin(const char *str)
-{
-    UnitySendMessage("Main Camera","TouristLogin", MakeStringCopy(str));
-}
-
+#endif
 
 
 

Assets/Plugins/iOS/AD/IOSADManager.h.meta → Assets/Plugins/iOS/Bridage/BridageManager.m.meta

 fileFormatVersion: 2
-guid: 5b6a371f436e0434c96e6f5089f57bfb
+guid: 9231f6ad929664f4596a448a72a740f4
 PluginImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/Plugins/iOS/WeChat/Native.h.meta → Assets/Plugins/iOS/Bridage/Native.h.meta

 fileFormatVersion: 2
-guid: 517b97a0c8d97412e872329c9a0e7e03
+guid: a15f2fa74b26f4e03b1434ed9bde5ea1
 PluginImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/Plugins/iOS/WeChat/Native.mm.meta → Assets/Plugins/iOS/Bridage/Native.mm.meta

 fileFormatVersion: 2
-guid: bd76b9bd0af0d4972bf48a162d64eed2
+guid: 1688625fa7cd347bf983bec6b3e15644
 PluginImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/Plugins/iOS/Bridage/UnitySignInWithApple.m.meta

+fileFormatVersion: 2
+guid: 81f60b393d9a64277b6f8db14ce0c4b5
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  - first:
+      iPhone: iOS
+    second:
+      enabled: 1
+      settings:
+        AddToEmbeddedBinaries: false
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Plugins/iOS/KeyChain/KeychainItemManager.m.meta

@@ -11,24 +11,6 @@ PluginImporter:
   isExplicitlyReferenced: 0
   validateReferences: 1
   platformData:
-  - first:
-      : Any
-    second:
-      enabled: 0
-      settings:
-        Exclude Android: 1
-        Exclude Editor: 1
-        Exclude Linux64: 1
-        Exclude OSXUniversal: 1
-        Exclude Win: 1
-        Exclude Win64: 1
-        Exclude iOS: 0
-  - first:
-      Android: Android
-    second:
-      enabled: 0
-      settings:
-        CPU: ARMv7
   - first:
       Any: 
     second:
@@ -39,42 +21,13 @@ PluginImporter:
     second:
       enabled: 0
       settings:
-        CPU: AnyCPU
         DefaultValueInitialized: true
-        OS: AnyOS
-  - first:
-      Standalone: Linux64
-    second:
-      enabled: 0
-      settings:
-        CPU: AnyCPU
-  - first:
-      Standalone: OSXUniversal
-    second:
-      enabled: 0
-      settings:
-        CPU: x86_64
-  - first:
-      Standalone: Win
-    second:
-      enabled: 0
-      settings:
-        CPU: x86
-  - first:
-      Standalone: Win64
-    second:
-      enabled: 0
-      settings:
-        CPU: x86_64
   - first:
       iPhone: iOS
     second:
       enabled: 1
       settings:
         AddToEmbeddedBinaries: false
-        CPU: AnyCPU
-        CompileFlags: 
-        FrameworkDependencies: 
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/Plugins/iOS/KeyChain/KeychainItemWrapper.m.meta

@@ -16,19 +16,12 @@ PluginImporter:
     second:
       enabled: 0
       settings:
-        Exclude Android: 1
         Exclude Editor: 1
         Exclude Linux64: 1
         Exclude OSXUniversal: 1
         Exclude Win: 1
         Exclude Win64: 1
         Exclude iOS: 0
-  - first:
-      Android: Android
-    second:
-      enabled: 0
-      settings:
-        CPU: ARMv7
   - first:
       Any: 
     second:
@@ -47,7 +40,7 @@ PluginImporter:
     second:
       enabled: 0
       settings:
-        CPU: AnyCPU
+        CPU: x86_64
   - first:
       Standalone: OSXUniversal
     second:

Assets/Plugins/iOS/WeChat/ViewController.h.meta

-fileFormatVersion: 2
-guid: 3ca9905b6a7184e59adb16669bfbe932
-PluginImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  iconMap: {}
-  executionOrder: {}
-  defineConstraints: []
-  isPreloaded: 0
-  isOverridable: 0
-  isExplicitlyReferenced: 0
-  validateReferences: 1
-  platformData:
-  - first:
-      Any: 
-    second:
-      enabled: 0
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
-      enabled: 0
-      settings:
-        DefaultValueInitialized: true
-  - first:
-      iPhone: iOS
-    second:
-      enabled: 1
-      settings:
-        AddToEmbeddedBinaries: false
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Plugins/iOS/WeChat/ViewController.m.meta

-fileFormatVersion: 2
-guid: cbcb521cb7b7e45d4bddf9861d5217ec
-PluginImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  iconMap: {}
-  executionOrder: {}
-  defineConstraints: []
-  isPreloaded: 0
-  isOverridable: 0
-  isExplicitlyReferenced: 0
-  validateReferences: 1
-  platformData:
-  - first:
-      Any: 
-    second:
-      enabled: 0
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
-      enabled: 0
-      settings:
-        DefaultValueInitialized: true
-  - first:
-      iPhone: iOS
-    second:
-      enabled: 1
-      settings:
-        AddToEmbeddedBinaries: false
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Plugins/iOS/umeng_analytics.meta

 fileFormatVersion: 2
 guid: ccfd845a8e6a04b35ae06b55c7a7a5ea
 folderAsset: yes
-timeCreated: 1506304401
-licenseType: Free
 DefaultImporter:
+  externalObjects: {}
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/Plugins/iOS/umeng_analytics/UMAnalytics.framework.meta

 fileFormatVersion: 2
 guid: b2df5f25d45684b11a962550a24bc31a
 folderAsset: yes
-timeCreated: 1506304401
-licenseType: Free
 PluginImporter:
+  externalObjects: {}
   serializedVersion: 2
   iconMap: {}
   executionOrder: {}
+  defineConstraints: []
   isPreloaded: 0
   isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
   platformData:
-    data:
-      first:
-        Any: 
-      second:
-        enabled: 0
-        settings: {}
-    data:
-      first:
-        Editor: Editor
-      second:
-        enabled: 0
-        settings:
-          DefaultValueInitialized: true
-    data:
-      first:
-        iPhone: iOS
-      second:
-        enabled: 1
-        settings: {}
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  - first:
+      iPhone: iOS
+    second:
+      enabled: 1
+      settings: {}
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/Plugins/iOS/umeng_common.meta

 fileFormatVersion: 2
 guid: 053cdf1283ee84e2fbf00722dc80b879
 folderAsset: yes
-timeCreated: 1506304401
-licenseType: Free
 DefaultImporter:
+  externalObjects: {}
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/Plugins/iOS/umeng_common/UMCommon.framework.meta

@@ -6,8 +6,11 @@ PluginImporter:
   serializedVersion: 2
   iconMap: {}
   executionOrder: {}
+  defineConstraints: []
   isPreloaded: 0
   isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
   platformData:
   - first:
       Any: 

Assets/Plugins/iOS/umeng_common/UMCommonLog.bundle.meta

@@ -6,8 +6,11 @@ PluginImporter:
   serializedVersion: 2
   iconMap: {}
   executionOrder: {}
+  defineConstraints: []
   isPreloaded: 0
   isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
   platformData:
   - first:
       Any: 

Assets/UnityTool/AppConfig.cs

@@ -24,6 +24,11 @@ public class AppConfig
     /// <param name="IsShowLog">是否显示Log</param>
     public void InitProgect(bool isTest,bool IsShowLog,string appls)
     {
+        // 初始化iOS交互
+#if !UNITY_EDITOR && UNITY_IOS
+        iOSHander.Instance.Handler();
+#endif
+
         Constant.Instance.IsTestNet = isTest;
         //log日志
         Debug.unityLogger.logEnabled = IsShowLog;
@@ -31,7 +36,6 @@ public class AppConfig
         Constant.Instance.ZXAD_VC = ZXADConfig.ZXAD_VC+"";
         Constant.Instance.ZXAD_VN = ZXADConfig.ZXAD_VN;
 
-        Constant.Instance.AppLs = appls;
         Constant.Instance.Token = getToken();
         Constant.Instance.Uid = getUid();
         Constant.Instance.Imsi = UnityPhoneUtils.Instance.GetImsi();

Assets/UnityTool/CallingNativeMethods.cs

@@ -78,7 +78,7 @@ public class CallingNativeMethods
         isInstalled = _isWechatInstalled();
         if (isInstalled)
         {
-            _WechatLogin(WX_APPID, state, universalLink);
+            _WechatLogin(Constant.Instance.WX_APP_ID, "state", Constant.Instance.universalLink);
         }
         else
         {
@@ -94,7 +94,7 @@ public class CallingNativeMethods
     {
         Debug.Log("微信登录的回调在这里: " + msg);
         // 051AdH000dJnkL1KyK300KeBye2AdH0d
-        BingWxLogin(msg);
+
     }
 #endif
 

Assets/UnityTool/Constant.cs

@@ -14,19 +14,37 @@ public class Constant
             return singleInstance;
         }
     }
+
     /// <summary>
     /// 是否是测试网络环境
     /// </summary>
-    public bool IsTestNet{ get; set; }
+    public bool IsTestNet { get; set; }
+
     //微信key
-    public string WX_APP_ID= "wxeb614acc314efbfb";
-    public string WX_APP_Key= "89abbb00107cc6255198cf1285181b4e";
+    public string WX_APP_ID = "wxeb614acc314efbfb";
+    public string WX_APP_Key = "89abbb00107cc6255198cf1285181b4e";
+    public string universalLink = "universalLink";
+
+    // 友盟key
+    public string UM_ID
+    {
+        get
+        {
+            return "";
+        }
+    }
 
     public string Token { get; set; }
 
     public string Uid { get; set; }
 
-    public string AppLs { get; set; }
+    public string AppLs
+    {
+        get
+        {
+            return "";
+        }
+    }
 
     public string Imsi { get; set; }
 
@@ -68,12 +86,16 @@ public class Constant
 
     public string source { get; set; }
 
-    public string ua { get; set; }   
-    
+    public string ua { get; set; }
+
     public string idfa { get; set; }
     public string ZXAD_VC { get; set; }
     public string ZXAD_VN { get; set; }
 
+    /// <summary>
+    /// 0 shen 1 tou
+    /// </summary>
+    public bool shubiao { get; set; }
 
 
 
@@ -84,5 +106,4 @@ public class Constant
 
 
 
-
-}
+}
\ No newline at end of file

Assets/UnityTool/UnityPhoneUtils.cs

@@ -29,9 +29,6 @@ public class UnityPhoneUtils
         return activity;
     }
 
-    private string device_iOS = "";
-    private string idfa_iOS = "";
-
     private AndroidJavaObject phoneUtil;
     private AndroidJavaObject GetPhoneUtil()
     {
@@ -52,7 +49,7 @@ public class UnityPhoneUtils
 #elif UNITY_IOS
         
 #endif
-        Debug.unityLogger.Log("GetImsi "+imsi);
+        Debug.unityLogger.Log("GetImsi " + imsi);
         return imsi;
     }
     public string GetImei()
@@ -114,7 +111,7 @@ public class UnityPhoneUtils
     public string GetIP(bool isIpv4)
     {
         string ip = "";
-       
+
 #if UNITY_EDITOR
         Debug.unityLogger.Log("GetIP");
 #elif UNITY_ANDROID
@@ -129,7 +126,7 @@ public class UnityPhoneUtils
     public string GetSVN()
     {
         string svn = "";
-        
+
 #if UNITY_EDITOR
         Debug.unityLogger.Log("GetSVN");
 #elif UNITY_ANDROID
@@ -154,7 +151,7 @@ public class UnityPhoneUtils
         Debug.unityLogger.Log("GetNTT " + ntt);
         return ntt;
     }
-    
+
     public string GetCarrier()
     {
         string carrier = "";
@@ -176,7 +173,7 @@ public class UnityPhoneUtils
     public string GetVC()
     {
         string vc = "";
-        
+
 #if UNITY_EDITOR
         Debug.unityLogger.Log("GetVC");
 #elif UNITY_ANDROID
@@ -207,7 +204,7 @@ public class UnityPhoneUtils
     public string GetAid()
     {
         string aid = PlayerPrefs.GetString("app_aid", "");
-       
+
         if (aid.Equals(""))
         {
 #if UNITY_EDITOR
@@ -223,35 +220,6 @@ public class UnityPhoneUtils
         return aid;
     }
 
-#if UNITY_IOS
-
- /// <summary>
-    /// 声明交互方法
-    /// </summary>
-    /// <param name="resultString"></param>
-    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-    public delegate void ResultHandlerIDFA(string resultString);
-    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-    public delegate void ResultHandlerDevice(string resultString);
-
-    /// <summary>
-    /// 接受交互值  在iOS代码中调用 resultHandlerIDFA("传值");
-    /// </summary>
-    /// <param name="resultStr"></param>
-    [MonoPInvokeCallback(typeof(ResultHandlerIDFA))]
-    static void resultHandlerIDFA(string resultStr)
-    {
-        Instance.idfa_iOS = resultStr;
-    }
-
-    [MonoPInvokeCallback(typeof(ResultHandlerDevice))]
-    static void resultHandlerDevice(string resultStr)
-    {
-        Instance.device_iOS = resultStr;
-    }
-
-#endif
-
     public string GetDevice()
     {
         string device = PlayerPrefs.GetString("user_device", "");
@@ -263,7 +231,7 @@ public class UnityPhoneUtils
              device = GetPhoneUtil().Call<string>("getAndroidID", GetActivity());
 #elif UNITY_IOS
 
-            device = device_iOS;
+            device = Constant.Instance.device;
 
 #endif
 
@@ -321,7 +289,9 @@ public class UnityPhoneUtils
 #elif UNITY_ANDROID
        idfaStr ="";
 #elif UNITY_IOS
-        idfaStr = idfa_iOS;
+
+        idfaStr = Constant.Instance.idfa;
+
 #endif
 
         Debug.unityLogger.Log("GetIDFA " + idfaStr);

Assets/UnityTool/WxLoginUtil.cs

@@ -95,7 +95,7 @@ public class WxLoginUtil : MonoBehaviour
     /// <param name="code"></param>
     public void BingWxLogin(string code)
     {
-        Debug.unityLogger.Log("WxCode"+code);
+        Debug.unityLogger.Log("WxCode" + code);
         Dictionary<string, object> parms = new Dictionary<string, object>();
         parms.Add("appid", Constant.Instance.WX_APP_ID);
         parms.Add("secret", Constant.Instance.WX_APP_Key);

Assets/UnityTool/iOSHander.cs

+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Runtime.InteropServices;
+using AOT;
+using UnityEngine;
+
+public class iOSHander
+{
+    private iOSHander() { }
+    private static readonly iOSHander singleInstance = new iOSHander();
+    public static iOSHander Instance
+    {
+        get
+        {
+            return singleInstance;
+        }
+    }
+
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+    public delegate void ResultHandler(string device, string IDFA);
+
+
+    [MonoPInvokeCallback(typeof(ResultHandler))]
+    static void resultHandler(string deviceStr, string IDFAStr)
+    {
+        Debug.Log("resultHandler : deviceStr = " + deviceStr + "IDFAStr = " + IDFAStr);
+
+
+        Constant.Instance.device = deviceStr;
+
+        Constant.Instance.idfa = IDFAStr;
+
+    }
+
+    [DllImport("__Internal")]
+    static extern void BridageDeviceAndIDFA(IntPtr resultHandler);
+
+
+    public void Handler()
+    {
+        ResultHandler handler = new ResultHandler(resultHandler);
+        IntPtr fp = Marshal.GetFunctionPointerForDelegate(handler);
+        BridageDeviceAndIDFA(fp);
+    }
+
+
+}

Assets/Plugins/iOS/API.meta → Assets/UnityTool/iOSHander.cs.meta

 fileFormatVersion: 2
-guid: b803d513b69b14353a28e60eba7f5d42
-folderAsset: yes
-DefaultImporter:
+guid: 3046b42bbeae947ffb400d0fc7a48d24
+MonoImporter:
   externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
   userData: 
   assetBundleName: 
   assetBundleVariant: 

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)