浏览代码

移除IOS支付宝

LiuQilin 7 年之前
父节点
当前提交
1c703dd243
共有 38 个文件被更改,包括 135 次插入85 次删除
  1. 9 0
      Alipay/Android.meta
  2. 二进制
      Alipay/Android/alipaySdk-20170710.jar
  3. 24 0
      Alipay/Android/alipaySdk-20170710.jar.meta
  4. 二进制
      Alipay/Android/unitytool.jar
  5. 24 0
      Alipay/Android/unitytool.jar.meta
  6. 0 0
      Alipay/IOS.meta
  7. 0 0
      Alipay/IOS/AliPay.h
  8. 0 0
      Alipay/IOS/AliPay.h.meta
  9. 0 0
      Alipay/IOS/AliPay.mm
  10. 0 0
      Alipay/IOS/AliPay.mm.meta
  11. 0 0
      Alipay/IOS/AlipaySDK.bundle.meta
  12. 0 0
      Alipay/IOS/AlipaySDK.bundle/bar@2x.png
  13. 0 0
      Alipay/IOS/AlipaySDK.bundle/bar@2x.png.meta
  14. 0 0
      Alipay/IOS/AlipaySDK.bundle/refresh@2x.png
  15. 0 0
      Alipay/IOS/AlipaySDK.bundle/refresh@2x.png.meta
  16. 0 0
      Alipay/IOS/AlipaySDK.bundle/refresh_click@2x.png
  17. 0 0
      Alipay/IOS/AlipaySDK.bundle/refresh_click@2x.png.meta
  18. 0 0
      Alipay/IOS/AlipaySDK.bundle/shutdown@2x.png
  19. 0 0
      Alipay/IOS/AlipaySDK.bundle/shutdown@2x.png.meta
  20. 0 0
      Alipay/IOS/AlipaySDK.bundle/shutdown_click@2x.png
  21. 0 0
      Alipay/IOS/AlipaySDK.bundle/shutdown_click@2x.png.meta
  22. 0 0
      Alipay/IOS/AlipaySDK.framework.meta
  23. 0 0
      Alipay/IOS/AlipaySDK.framework/AlipaySDK
  24. 0 0
      Alipay/IOS/AlipaySDK.framework/AlipaySDK.meta
  25. 0 0
      Alipay/IOS/AlipaySDK.framework/Headers.meta
  26. 0 0
      Alipay/IOS/AlipaySDK.framework/Headers/APayAuthInfo.h
  27. 0 0
      Alipay/IOS/AlipaySDK.framework/Headers/APayAuthInfo.h.meta
  28. 0 0
      Alipay/IOS/AlipaySDK.framework/Headers/AlipaySDK.h
  29. 0 0
      Alipay/IOS/AlipaySDK.framework/Headers/AlipaySDK.h.meta
  30. 0 0
      Alipay/IOS/AlipaySDK.framework/Info.plist
  31. 0 0
      Alipay/IOS/AlipaySDK.framework/Info.plist.meta
  32. 0 0
      Alipay/IOS/AlipaySDK.framework/en.lproj.meta
  33. 0 0
      Alipay/IOS/AlipaySDK.framework/en.lproj/InfoPlist.strings
  34. 0 0
      Alipay/IOS/AlipaySDK.framework/en.lproj/InfoPlist.strings.meta
  35. 74 74
      Assets/Script/Editor/PostProcessor.cs
  36. 1 1
      Assets/Script/Manage/HttpManager.cs
  37. 2 9
      Assets/Script/Manage/IAPManager.cs
  38. 1 1
      Assets/Script/Tool/Lib.cs

+ 9 - 0
Alipay/Android.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 5f5aa4c955f14fb45b05b862c99420d3
+folderAsset: yes
+timeCreated: 1502760984
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

二进制
Alipay/Android/alipaySdk-20170710.jar


+ 24 - 0
Alipay/Android/alipaySdk-20170710.jar.meta

@@ -0,0 +1,24 @@
+fileFormatVersion: 2
+guid: 64878379aff94463eaf455f4f80b6513
+timeCreated: 1501229734
+licenseType: Pro
+PluginImporter:
+  serializedVersion: 1
+  iconMap: {}
+  executionOrder: {}
+  isPreloaded: 0
+  isOverridable: 0
+  platformData:
+    Android:
+      enabled: 1
+      settings: {}
+    Any:
+      enabled: 0
+      settings: {}
+    Editor:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

二进制
Alipay/Android/unitytool.jar


+ 24 - 0
Alipay/Android/unitytool.jar.meta

@@ -0,0 +1,24 @@
+fileFormatVersion: 2
+guid: 2a994674615364276ab1aa8270a5b837
+timeCreated: 1501233154
+licenseType: Pro
+PluginImporter:
+  serializedVersion: 1
+  iconMap: {}
+  executionOrder: {}
+  isPreloaded: 0
+  isOverridable: 0
+  platformData:
+    Android:
+      enabled: 1
+      settings: {}
+    Any:
+      enabled: 0
+      settings: {}
+    Editor:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 0
Assets/Plugins/Alipay/IOS.meta → Alipay/IOS.meta


+ 0 - 0
Assets/Plugins/Alipay/IOS/AliPay.h → Alipay/IOS/AliPay.h


+ 0 - 0
Assets/Plugins/Alipay/IOS/AliPay.h.meta → Alipay/IOS/AliPay.h.meta


+ 0 - 0
Assets/Plugins/Alipay/IOS/AliPay.mm → Alipay/IOS/AliPay.mm


+ 0 - 0
Assets/Plugins/Alipay/IOS/AliPay.mm.meta → Alipay/IOS/AliPay.mm.meta


+ 0 - 0
Assets/Plugins/Alipay/IOS/AlipaySDK.bundle.meta → Alipay/IOS/AlipaySDK.bundle.meta


+ 0 - 0
Assets/Plugins/Alipay/IOS/AlipaySDK.bundle/bar@2x.png → Alipay/IOS/AlipaySDK.bundle/bar@2x.png


+ 0 - 0
Assets/Plugins/Alipay/IOS/AlipaySDK.bundle/bar@2x.png.meta → Alipay/IOS/AlipaySDK.bundle/bar@2x.png.meta


+ 0 - 0
Assets/Plugins/Alipay/IOS/AlipaySDK.bundle/refresh@2x.png → Alipay/IOS/AlipaySDK.bundle/refresh@2x.png


+ 0 - 0
Assets/Plugins/Alipay/IOS/AlipaySDK.bundle/refresh@2x.png.meta → Alipay/IOS/AlipaySDK.bundle/refresh@2x.png.meta


+ 0 - 0
Assets/Plugins/Alipay/IOS/AlipaySDK.bundle/refresh_click@2x.png → Alipay/IOS/AlipaySDK.bundle/refresh_click@2x.png


+ 0 - 0
Assets/Plugins/Alipay/IOS/AlipaySDK.bundle/refresh_click@2x.png.meta → Alipay/IOS/AlipaySDK.bundle/refresh_click@2x.png.meta


+ 0 - 0
Assets/Plugins/Alipay/IOS/AlipaySDK.bundle/shutdown@2x.png → Alipay/IOS/AlipaySDK.bundle/shutdown@2x.png


+ 0 - 0
Assets/Plugins/Alipay/IOS/AlipaySDK.bundle/shutdown@2x.png.meta → Alipay/IOS/AlipaySDK.bundle/shutdown@2x.png.meta


+ 0 - 0
Assets/Plugins/Alipay/IOS/AlipaySDK.bundle/shutdown_click@2x.png → Alipay/IOS/AlipaySDK.bundle/shutdown_click@2x.png


+ 0 - 0
Assets/Plugins/Alipay/IOS/AlipaySDK.bundle/shutdown_click@2x.png.meta → Alipay/IOS/AlipaySDK.bundle/shutdown_click@2x.png.meta


+ 0 - 0
Assets/Plugins/Alipay/IOS/AlipaySDK.framework.meta → Alipay/IOS/AlipaySDK.framework.meta


+ 0 - 0
Assets/Plugins/Alipay/IOS/AlipaySDK.framework/AlipaySDK → Alipay/IOS/AlipaySDK.framework/AlipaySDK


+ 0 - 0
Assets/Plugins/Alipay/IOS/AlipaySDK.framework/AlipaySDK.meta → Alipay/IOS/AlipaySDK.framework/AlipaySDK.meta


+ 0 - 0
Assets/Plugins/Alipay/IOS/AlipaySDK.framework/Headers.meta → Alipay/IOS/AlipaySDK.framework/Headers.meta


+ 0 - 0
Assets/Plugins/Alipay/IOS/AlipaySDK.framework/Headers/APayAuthInfo.h → Alipay/IOS/AlipaySDK.framework/Headers/APayAuthInfo.h


+ 0 - 0
Assets/Plugins/Alipay/IOS/AlipaySDK.framework/Headers/APayAuthInfo.h.meta → Alipay/IOS/AlipaySDK.framework/Headers/APayAuthInfo.h.meta


+ 0 - 0
Assets/Plugins/Alipay/IOS/AlipaySDK.framework/Headers/AlipaySDK.h → Alipay/IOS/AlipaySDK.framework/Headers/AlipaySDK.h


+ 0 - 0
Assets/Plugins/Alipay/IOS/AlipaySDK.framework/Headers/AlipaySDK.h.meta → Alipay/IOS/AlipaySDK.framework/Headers/AlipaySDK.h.meta


+ 0 - 0
Assets/Plugins/Alipay/IOS/AlipaySDK.framework/Info.plist → Alipay/IOS/AlipaySDK.framework/Info.plist


+ 0 - 0
Assets/Plugins/Alipay/IOS/AlipaySDK.framework/Info.plist.meta → Alipay/IOS/AlipaySDK.framework/Info.plist.meta


+ 0 - 0
Assets/Plugins/Alipay/IOS/AlipaySDK.framework/en.lproj.meta → Alipay/IOS/AlipaySDK.framework/en.lproj.meta


+ 0 - 0
Assets/Plugins/Alipay/IOS/AlipaySDK.framework/en.lproj/InfoPlist.strings → Alipay/IOS/AlipaySDK.framework/en.lproj/InfoPlist.strings


+ 0 - 0
Assets/Plugins/Alipay/IOS/AlipaySDK.framework/en.lproj/InfoPlist.strings.meta → Alipay/IOS/AlipaySDK.framework/en.lproj/InfoPlist.strings.meta


+ 74 - 74
Assets/Script/Editor/PostProcessor.cs

@@ -31,21 +31,21 @@ public class NewBehaviourScript
 
 
         //添加引用库
-        string targetGuid = project.TargetGuidByName("Unity-iPhone");
-
-        project.AddFrameworkToProject(targetGuid, "libc++.tbd", false);
-        project.AddFrameworkToProject(targetGuid, "libz.tbd", false);
-        project.AddFrameworkToProject(targetGuid, "SystemConfiguration.framework", false);
-        project.AddFrameworkToProject(targetGuid, "CoreTelephony.framework", false);
-        project.AddFrameworkToProject(targetGuid, "QuartzCore.framework", false);
-        project.AddFrameworkToProject(targetGuid, "CoreText.framework", false);
-        project.AddFrameworkToProject(targetGuid, "CoreGraphics.framework", false);
-        project.AddFrameworkToProject(targetGuid, "UIKit.framework", false);
-        project.AddFrameworkToProject(targetGuid, "Foundation.framework", false);
-        project.AddFrameworkToProject(targetGuid, "CFNetwork.framework", false);
-        project.AddFrameworkToProject(targetGuid, "CoreMotion.framework", false);
-        project.AddFrameworkToProject(targetGuid, "AlipaySDK.framework", false);
-        project.AddFrameworkToProject(targetGuid, "Security.framework", false);
+        //string targetGuid = project.TargetGuidByName("Unity-iPhone");
+
+        //project.AddFrameworkToProject(targetGuid, "libc++.tbd", false);
+        //project.AddFrameworkToProject(targetGuid, "libz.tbd", false);
+        //project.AddFrameworkToProject(targetGuid, "SystemConfiguration.framework", false);
+        //project.AddFrameworkToProject(targetGuid, "CoreTelephony.framework", false);
+        //project.AddFrameworkToProject(targetGuid, "QuartzCore.framework", false);
+        //project.AddFrameworkToProject(targetGuid, "CoreText.framework", false);
+        //project.AddFrameworkToProject(targetGuid, "CoreGraphics.framework", false);
+        //project.AddFrameworkToProject(targetGuid, "UIKit.framework", false);
+        //project.AddFrameworkToProject(targetGuid, "Foundation.framework", false);
+        //project.AddFrameworkToProject(targetGuid, "CFNetwork.framework", false);
+        //project.AddFrameworkToProject(targetGuid, "CoreMotion.framework", false);
+        //project.AddFrameworkToProject(targetGuid, "AlipaySDK.framework", false);
+        //project.AddFrameworkToProject(targetGuid, "Security.framework", false);
 
 
         //App名称本地化
@@ -63,68 +63,68 @@ public class NewBehaviourScript
 
 
         //修改UnityAppController.mm
-        string scriptPath = buildPath + "/Classes/UnityAppController.mm";
-
-        List<string> lines = new List<string>();
-
-        StreamReader streamReader = new StreamReader(scriptPath);
-
-        while (!streamReader.EndOfStream)
-        {
-            lines.Add(streamReader.ReadLine());
-        }
-
-        streamReader.Close();
-
-        lines.Insert
-            (
-                0,
-                "#import <AlipaySDK/AlipaySDK.h>"
-            );
-
-        lines.Insert
-            (
-                231,
-                "if ([url.host isEqualToString:@\"safepay\"]) {\n" +
-                "//跳转支付宝钱包进行支付,处理支付结果\n" +
-                "[[AlipaySDK defaultService] processOrderWithPaymentResult: url standbyCallback:^ (NSDictionary * resultDic) {\n" +
-                "NSLog(@\"result 1 = %@\", resultDic);\n" +
-                " }];\n" +
-                "}\n"
-            );
-
-        lines.Insert
-            (
-                247,
-                "// NOTE: 9.0以后使用新API接口\n" +
-                "-(BOOL)application:(UIApplication*)app openURL: (NSURL*)url options: (NSDictionary<NSString*, id>*)options\n" +
-                "{\n" +
-                "if ([url.host isEqualToString: @\"safepay\"])\n" +
-                "{\n" +
-                "//跳转支付宝钱包进行支付,处理支付结果\n" +
-                "[[AlipaySDK defaultService]\n" +
-                "processOrderWithPaymentResult:url standbyCallback:^(NSDictionary* resultDic) {\n" +
-                "NSLog(@\"result 2 = %@\", resultDic);\n" +
-                "}];\n" +
-                "}\n" +
-                "return YES;\n" +
-                "}\n"
-            );
-
-        StreamWriter streamWriter = new StreamWriter(scriptPath);
-
-        for (int i = 0; i < lines.Count; i++)
-        {
-            streamWriter.WriteLine(lines[i]);
-        }
-
-        streamWriter.Close();
+        //string scriptPath = buildPath + "/Classes/UnityAppController.mm";
+
+        //List<string> lines = new List<string>();
+
+        //StreamReader streamReader = new StreamReader(scriptPath);
+
+        //while (!streamReader.EndOfStream)
+        //{
+        //    lines.Add(streamReader.ReadLine());
+        //}
+
+        //streamReader.Close();
+
+        //lines.Insert
+        //    (
+        //        0,
+        //        "#import <AlipaySDK/AlipaySDK.h>"
+        //    );
+
+        //lines.Insert
+        //    (
+        //        231,
+        //        "if ([url.host isEqualToString:@\"safepay\"]) {\n" +
+        //        "//跳转支付宝钱包进行支付,处理支付结果\n" +
+        //        "[[AlipaySDK defaultService] processOrderWithPaymentResult: url standbyCallback:^ (NSDictionary * resultDic) {\n" +
+        //        "NSLog(@\"result 1 = %@\", resultDic);\n" +
+        //        " }];\n" +
+        //        "}\n"
+        //    );
+
+        //lines.Insert
+        //    (
+        //        247,
+        //        "// NOTE: 9.0以后使用新API接口\n" +
+        //        "-(BOOL)application:(UIApplication*)app openURL: (NSURL*)url options: (NSDictionary<NSString*, id>*)options\n" +
+        //        "{\n" +
+        //        "if ([url.host isEqualToString: @\"safepay\"])\n" +
+        //        "{\n" +
+        //        "//跳转支付宝钱包进行支付,处理支付结果\n" +
+        //        "[[AlipaySDK defaultService]\n" +
+        //        "processOrderWithPaymentResult:url standbyCallback:^(NSDictionary* resultDic) {\n" +
+        //        "NSLog(@\"result 2 = %@\", resultDic);\n" +
+        //        "}];\n" +
+        //        "}\n" +
+        //        "return YES;\n" +
+        //        "}\n"
+        //    );
+
+        //StreamWriter streamWriter = new StreamWriter(scriptPath);
+
+        //for (int i = 0; i < lines.Count; i++)
+        //{
+        //    streamWriter.WriteLine(lines[i]);
+        //}
+
+        //streamWriter.Close();
 
 
         //添加URLScheme
-        PlistElementDict urlDict = plist.root["CFBundleURLTypes"].AsArray().AddDict();
-        PlistElementArray urlArray = urlDict.CreateArray("CFBundleURLSchemes");
-        urlArray.AddString("MyLovelyGarden");
+        //PlistElementDict urlDict = plist.root["CFBundleURLTypes"].AsArray().AddDict();
+        //PlistElementArray urlArray = urlDict.CreateArray("CFBundleURLSchemes");
+        //urlArray.AddString("MyLovelyGarden");
 
 
         //保存Plist

+ 1 - 1
Assets/Script/Manage/HttpManager.cs

@@ -892,7 +892,7 @@ public class HttpManager : Regist
         (
             data =>
             {
-                IAPManager.UseAlipayOnIOS = Auxiliary.StringToBool(data["l"][2]["val"].ToJson().Trim('"'), false);
+                //IAPManager.UseAlipayOnIOS = Auxiliary.StringToBool(data["l"][2]["val"].ToJson().Trim('"'), false);
             }
         );
     }

+ 2 - 9
Assets/Script/Manage/IAPManager.cs

@@ -35,7 +35,7 @@ public class IAPManager : MonoBehaviour, IStoreListener
     public static bool Inited;
     public static IAPManager Instance;
 
-    public static bool UseAlipayOnIOS = false;
+    //public static bool UseAlipayOnIOS = false;
     public static PayChannel PayChannel;
     public static IStoreController IStoreController;
     public static IExtensionProvider IExtensionProvider;
@@ -156,14 +156,7 @@ public class IAPManager : MonoBehaviour, IStoreListener
 
         if (Application.platform == RuntimePlatform.IPhonePlayer)
         {
-            if (UseAlipayOnIOS)
-            {
-                InitAlipay();
-            }
-            else
-            {
-                InitUnityIAP();
-            }
+            InitUnityIAP();
         }
         else
         {

+ 1 - 1
Assets/Script/Tool/Lib.cs

@@ -17,7 +17,7 @@ public class Lib
     public static Color ThirdRank = new Color(54/255f, 205/255f, 124/255f, 1);
     public static Color NormalRank = new Color(185/255f, 185/255f, 185/255f, 1);
 
-    public static Color Pink = new Color(1, 60/255f, 60/255f, 1);
+    public static Color Pink = new Color(1, 128/255f, 171/255f, 1);
 	public static Color Orange = new Color(233/255f, 63/255f, 20/255f, 1);
 	public static Color LightGray = new Color(165/255f, 192/255f, 200/255f, 1);