phiz-bak
/
mop-flutter-sdk
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
phiz_2.41.13.1
Stewen 2023-09-26 15:37:08 +08:00
parent ac757dbfb5 52e29a405e
commit 5606f294e5
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ios/Classes/Api/MOP_initialize.m
View File

@ -9,7 +9,12 @@
#import <FinApplet/FinApplet.h> #import <FinApplet/FinApplet.h>
//#import <FinAppletExt/FinAppletExt.h> //#import <FinAppletExt/FinAppletExt.h>
#import "FinAppletExt.h" #import "FinAppletExt.h"
<<<<<<< HEAD
//#import <FinAppletClipBoard/FinAppletClipBoard.h> //#import <FinAppletClipBoard/FinAppletClipBoard.h>
=======
#import <FinAppletClipBoard/FinAppletClipBoard.h>
#import <FinAppletBLE/FinAppletBLE.h>
>>>>>>> 52e29a405e7ec23920852d84766efd035191edc2
#import "MOPTools.h" #import "MOPTools.h"
@implementation MOP_initialize @implementation MOP_initialize

6
ios/mop.podspec
View File

@ -22,8 +22,8 @@ A finclip miniprogram flutter sdk.
s.static_framework = true s.static_framework = true
s.dependency 'FinApplet' , '2.41.13' s.dependency 'FinApplet' , '2.41.13'
# s.dependency 'FinAppletExt' , '2.41.13' # s.dependency 'FinAppletExt' , '2.41.5'
# s.dependency 'FinAppletClipBoard', '2.41.5' # s.dependency 'FinAppletClipBoard', '2.41.5'
s.dependency 'FinAppletBLE', '2.41.13'
end end

3
ios/mop.podspec.tpl
View File

@ -23,6 +23,7 @@ A finclip miniprogram flutter sdk.
s.dependency 'FinApplet' , '__finapplet_version__' s.dependency 'FinApplet' , '__finapplet_version__'
# s.dependency 'FinAppletExt' , '__finapplet_version__' # s.dependency 'FinAppletExt' , '__finapplet_version__'
# s.dependency 'FinAppletClipBoard', '2.41.5' s.dependency 'FinAppletBLE', '__finapplet_version__'
end end