Merge branch 'phiz_2.41.5.10' of https://git-dev.xyue.zip:8443/phiz/mop-flutter-sdk into phiz_2.41.13.1

# Conflicts: # ios/Classes/Api/MOP_initialize.m # ios/mop.podspec # ios/mop.podspec.tpl
加入iOS蓝牙SDK
2023-09-26 15:37:08 +08:00 · 2023-09-26 14:15:08 +08:00
3 changed files with 10 additions and 4 deletions
--- a/ios/Classes/Api/MOP_initialize.m
+++ b/ios/Classes/Api/MOP_initialize.m
@ -9,7 +9,12 @@
 #import <FinApplet/FinApplet.h>
 //#import <FinAppletExt/FinAppletExt.h>
 #import "FinAppletExt.h"
+<<<<<<< HEAD
 //#import <FinAppletClipBoard/FinAppletClipBoard.h>
+=======
+#import <FinAppletClipBoard/FinAppletClipBoard.h>
+#import <FinAppletBLE/FinAppletBLE.h>
+>>>>>>> 52e29a405e7ec23920852d84766efd035191edc2
 #import "MOPTools.h"

@implementation MOP_initialize
--- a/ios/mop.podspec
+++ b/ios/mop.podspec
@ -22,8 +22,8 @@ A finclip miniprogram flutter sdk.
  s.static_framework = true

  s.dependency 'FinApplet' , '2.41.13'
-# s.dependency 'FinAppletExt' , '2.41.13'
-# s.dependency 'FinAppletClipBoard', '2.41.5'
-
+  # s.dependency 'FinAppletExt' , '2.41.5'
+  # s.dependency 'FinAppletClipBoard', '2.41.5'
+  s.dependency 'FinAppletBLE', '2.41.13'
 end

--- a/ios/mop.podspec.tpl
+++ b/ios/mop.podspec.tpl
@ -23,6 +23,7 @@ A finclip miniprogram flutter sdk.

  s.dependency 'FinApplet' , '__finapplet_version__'
  # s.dependency 'FinAppletExt' , '__finapplet_version__'
-  # s.dependency 'FinAppletClipBoard', '2.41.5'
+  s.dependency 'FinAppletBLE', '__finapplet_version__'
+
 end
Author	SHA1	Message	Date
Stewen	5606f294e5	Merge branch 'phiz_2.41.5.10' of https://git-dev.xyue.zip:8443/phiz/mop-flutter-sdk into phiz_2.41.13.1 # Conflicts: # ios/Classes/Api/MOP_initialize.m # ios/mop.podspec # ios/mop.podspec.tpl	2023-09-26 15:37:08 +08:00
Stewen	52e29a405e	加入iOS蓝牙SDK	2023-09-26 14:15:08 +08:00