From c3017a967efb2088f88d11bbb753dd9f3d975582 Mon Sep 17 00:00:00 2001 From: wanghualei Date: Fri, 9 Jun 2023 00:15:04 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=94=AF=E6=8C=81=E7=BD=91=E7=BB=9C?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=88=96=E5=B7=A5=E7=A8=8B=E5=86=85=E5=9B=BE?= =?UTF-8?q?=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- example/ios/Podfile | 3 +++ example/ios/Podfile.lock | 20 ++++++++-------- .../ios/Runner/Assets.xcassets/Contents.json | 6 +++++ .../Contents.json | 22 ++++++++++++++++++ .../minipro_list_collect@2x.png | Bin 0 -> 2726 bytes .../minipro_list_collect@3x.png | Bin 0 -> 4349 bytes .../Contents.json | 22 ++++++++++++++++++ .../minipro_list_service@2x.png | Bin 0 -> 2782 bytes .../minipro_list_service@3x.png | Bin 0 -> 4350 bytes 9 files changed, 63 insertions(+), 10 deletions(-) create mode 100644 example/ios/Runner/Assets.xcassets/Contents.json create mode 100644 example/ios/Runner/Assets.xcassets/minipro_list_collect.imageset/Contents.json create mode 100644 example/ios/Runner/Assets.xcassets/minipro_list_collect.imageset/minipro_list_collect@2x.png create mode 100644 example/ios/Runner/Assets.xcassets/minipro_list_collect.imageset/minipro_list_collect@3x.png create mode 100644 example/ios/Runner/Assets.xcassets/minipro_list_service.imageset/Contents.json create mode 100644 example/ios/Runner/Assets.xcassets/minipro_list_service.imageset/minipro_list_service@2x.png create mode 100644 example/ios/Runner/Assets.xcassets/minipro_list_service.imageset/minipro_list_service@3x.png diff --git a/example/ios/Podfile b/example/ios/Podfile index 8933ab5..8f3be61 100644 --- a/example/ios/Podfile +++ b/example/ios/Podfile @@ -1,6 +1,9 @@ # Uncomment this line to define a global platform for your project platform :ios, '9.0' +source 'ssh://gitlab.finogeeks.club/finclip-ios/DevPods' +source 'ssh://gitlab.finogeeks.club/finclip-ios/FinPods' + # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index 22a8d75..fbb69b6 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -1,11 +1,11 @@ PODS: - - FinApplet (2.40.9) - - FinAppletExt (2.40.9): - - FinApplet (= 2.40.9) + - FinApplet (2.40.12-dev20230608v03) + - FinAppletExt (2.40.12-dev20230608v03): + - FinApplet (= 2.40.12-dev20230608v03) - Flutter (1.0.0) - mop (0.1.1): - - FinApplet (= 2.40.9) - - FinAppletExt (= 2.40.9) + - FinApplet (= 2.40.12-dev20230608v03) + - FinAppletExt (= 2.40.12-dev20230608v03) - Flutter DEPENDENCIES: @@ -13,7 +13,7 @@ DEPENDENCIES: - mop (from `.symlinks/plugins/mop/ios`) SPEC REPOS: - trunk: + ssh://gitlab.finogeeks.club/finclip-ios/DevPods: - FinApplet - FinAppletExt @@ -24,11 +24,11 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/mop/ios" SPEC CHECKSUMS: - FinApplet: 9dd3810fb41400c882c8c5d5f528452b0f1f0a63 - FinAppletExt: e9f418e3d11f5cf4ee42b2d64ab405fe747f51fe + FinApplet: 65349d2bff2aa592743da609a534eff8572681e4 + FinAppletExt: 92f01be77bb89ebf500b68e7f536441f62e02670 Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a - mop: 8684b0dad361ce1d9b2d4a98d65a1acb52ce4120 + mop: 51a9fa6dd85e339898d1d602572cccdc0f491b76 -PODFILE CHECKSUM: 2317ba7584871ae8cd67fd0244fbd5e96fd06167 +PODFILE CHECKSUM: 2da0220ee5ba22a2dfcec42dfe5b17d05f3c3da9 COCOAPODS: 1.11.3 diff --git a/example/ios/Runner/Assets.xcassets/Contents.json b/example/ios/Runner/Assets.xcassets/Contents.json new file mode 100644 index 0000000..73c0059 --- /dev/null +++ b/example/ios/Runner/Assets.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/example/ios/Runner/Assets.xcassets/minipro_list_collect.imageset/Contents.json b/example/ios/Runner/Assets.xcassets/minipro_list_collect.imageset/Contents.json new file mode 100644 index 0000000..96dd923 --- /dev/null +++ b/example/ios/Runner/Assets.xcassets/minipro_list_collect.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "minipro_list_collect@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "minipro_list_collect@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/example/ios/Runner/Assets.xcassets/minipro_list_collect.imageset/minipro_list_collect@2x.png b/example/ios/Runner/Assets.xcassets/minipro_list_collect.imageset/minipro_list_collect@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..1b517c17a676e62310515fd402841808c501f4d3 GIT binary patch literal 2726 zcmV;X3R(4uP)Pxe5T6t_-M;V`a`__q*v`upri54YQOdC>E(QsCRRwYRB+D^RdY$0ve zM-oyH0wIK`L=&)-f)vDm5tqr~gW{$edmUd(M4(BLdJ&3xB(&HhDQXdIleA6J9Nzcd z@cZ8Gyv%!kZ!aH0t)FDi%=dlsUGvS%H#5svsb6({LIm~+L`I^GuLt&$2oRaFu9li? z2qB!hgi+}LIpwcJr1O`MnQpi(-<7oQIa4Qka+y4q0dHPKDCSz_!Zf~EVq zZ1bS{0Gf`eD*XqcPUDPFJ6V=3((AJHW8wt1ij34ZZKWW|!A4b_T6f$Yi6yoRi*1!i zIXu)>q@U9`|ISdVvqRFUNCy^FSsUMYOHC~CT^C;A?t-h0+V#zMS4SI9t1zdYk3l5X z+>G#i)gkt)fWZ?1@Nvtw%iFE3t@?tw^Vj)x_JhgcuyN15aAN;(sYG+s%sL7KE~Hak*GN7t!4gR8Y9^C; zg>yDGoa&k-;iZ%ql6BaN`w;bSAnIKS7V+^FECtkU*s{pDbjfzFx*SQoUm1^YT5usV zb_T5fp6=_k^BO-o*NW>U80c=ZHwBGp4|;Jy?PPNIS;E1he+1DGJg?yDSmRfTXsEBF zjY{>aS>OCcxbuh#lXbXv2!VB&imyZVbpCYPa<03!D8SIP)O7uY9s1D*)6KkrmENc)G=n7V+*+F#q;CUC2ppH4A zrzis{cONcUuoN^eT)P~Kjaq^|5~N^0c*%luf=1~ui`3^;C1nqPmE=Z zV{Rn>8`DJEucJyQ>+yKY;tPfah4Cj?1aL=jC~ZM$Cy#gbW5YDRObpaaP%_QaVZp zah0%~x_uWV#6n%uR}G}Pj;K6bf(b$SG{)l%(=eZ)6jdcIrEXsX3QTz<@dLekk(Ic= zae@g=c`$_2^;#d@B)Gd2Zb4xaGozwXn{|^sIe2?HQSC)gTjo#m!W9c;+UiHA!g41` zrdL)jmg%vImvvu@B@%PcK7t5hhSDI&xTP*+Q_rVL2_he%Cf6BBsf5F~JW)$u(XjXWBC! znDM{|#RGxM$5a_u)3EVoVHx#;3my(t9OzH(9-S&#etf6R;I$h!UXyvpIEh7np-T~@ zwBhUZW&L~hoOi*es4*=D=ZrlCV;7Jec&=-v(h{PbO6-1TVf51JFnY=j_8QB$)|5_l zbdsGl(Z;6fHaalrA%!OT-GBeLuSFO;BdZ!qyzNI>IKY;J(I;AR&_w0t>px`%ld)$n zzDIM`4r8yeQYm}1Jw{VsiJ$CpNGSJ{itnoe=@Joc`b)_)0X*qw73pN6cAHkhM zNiWJcI;_K?c&p&7s!Z8uaX|joP^#TNt9o_!HMly~^aEyDJBS!w{x^!J1w2b0#^cY( z9C*B#=Txt-$!yaN9)AB&#Z0rxjxaR!#XAx z91y+9!lADWC);20GWdUJL*GxbjQK|xd;{r&L3&r8t*`8VY|nqZ`uQ3xiRi%_KO;*! zp@mSz#b>qm@>SALcUg{pc@35Z&~MR%7(3*6kh4o%W6`0Wu7i?hI?G738Ap7x7i&x< z$)yP7ykhlGYWK^9^eD<;$)qm6d6|(J`!nXr(j3e{p7=nzw=?iMNA{hJ(tbI&#P7f> zcRj^V>EVid29mo@7R$dRgC*1496y9mUzvm9r?FTW`#OFlX(qG8Mg2E%XZ{QD%<9Ye zF|KQ?v8MdDR5@iCEQQoHG_9n&G-`v<>EXVv#S%A}Wu!jwHm1`e;#m>aR~|_2Jzg&V z38j{%CF-PLBnGYX#x^)B zo0Vm7Ss`5)YyOO3na|luGj<%03@g`e*nER=`N|KW%!6>mtQ<}j10f#XHkjJ;f&{2# zZFJ-9rpRmu%vl7pcz%U*@f&^ite^IG?|Ksli{o(K3c~4H=(7X8?SIYE75~31gYA?~ zh^KW!s0kex;CA=mlKK4S?d|ROQS;0< gP0sXnDumAu607*qoM6N<$f{FGyf&c&j literal 0 HcmV?d00001 diff --git a/example/ios/Runner/Assets.xcassets/minipro_list_collect.imageset/minipro_list_collect@3x.png b/example/ios/Runner/Assets.xcassets/minipro_list_collect.imageset/minipro_list_collect@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..cf4dfb1fc1195e59439cd493ced049f38492528c GIT binary patch literal 4349 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 literal 0 HcmV?d00001 diff --git a/example/ios/Runner/Assets.xcassets/minipro_list_service.imageset/Contents.json b/example/ios/Runner/Assets.xcassets/minipro_list_service.imageset/Contents.json new file mode 100644 index 0000000..4a2d688 --- /dev/null +++ b/example/ios/Runner/Assets.xcassets/minipro_list_service.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "minipro_list_service@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "minipro_list_service@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/example/ios/Runner/Assets.xcassets/minipro_list_service.imageset/minipro_list_service@2x.png b/example/ios/Runner/Assets.xcassets/minipro_list_service.imageset/minipro_list_service@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..5b5e785eeea928ebcef79b771d14b9e2ee43a411 GIT binary patch literal 2782 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 literal 0 HcmV?d00001 diff --git a/example/ios/Runner/Assets.xcassets/minipro_list_service.imageset/minipro_list_service@3x.png b/example/ios/Runner/Assets.xcassets/minipro_list_service.imageset/minipro_list_service@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..bc2db4052bb612ed1a120f6a04443fb1cb7fc82f GIT binary patch literal 4350 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 literal 0 HcmV?d00001 From 5f88cf1c918f11604ca5612058aa792943a4bf4a Mon Sep 17 00:00:00 2001 From: wanghualei Date: Fri, 9 Jun 2023 16:43:26 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=8F=9C?= =?UTF-8?q?=E5=8D=95iOS=E6=94=AF=E6=8C=81=E7=BD=91=E7=BB=9C=E5=9B=BE?= =?UTF-8?q?=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- example/lib/main.dart | 27 ++++++++------ ios/Classes/Api/MOPAppletDelegate.m | 2 +- ios/Classes/Model/MopCustomMenuModel.h | 50 ++++++++++++++++++++++++++ ios/Classes/Model/MopCustomMenuModel.m | 5 +-- ios/mop.podspec | 4 +-- 5 files changed, 73 insertions(+), 15 deletions(-) diff --git a/example/lib/main.dart b/example/lib/main.dart index 30a305c..20b97b3 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -129,16 +129,14 @@ class _MyAppState extends State { // physics: NeverScrollableScrollPhysics(), children: [ _buildAppletItem(appletId, "打开小程序", () { - // Mop.instance.openApplet(appletId, - // path: 'pages/index/index', query: ''); - // TranstionStyle style = TranstionStyle.TranstionStyleUp; - // if (appletId == "5f72e3559a6a7900019b5baa") { - // style = TranstionStyle.TranstionStylePush; - // } - // RemoteAppletRequest request = RemoteAppletRequest(apiServer: 'https://api.finclip.com', appletId: appletId, transitionStyle: style); - // Mop.instance.startApplet(request); + TranstionStyle style = TranstionStyle.TranstionStyleUp; + if (appletId == "5f72e3559a6a7900019b5baa") { + style = TranstionStyle.TranstionStylePush; + } + RemoteAppletRequest request = RemoteAppletRequest(apiServer: 'https://api.finclip.com', appletId: appletId, transitionStyle: style); + Mop.instance.startApplet(request); - Mop.instance.qrcodeOpenApplet('https://api.finclip.com/api/v1/mop/runtime/applet/-f-MGYzN2Q1YTYzMmI2MWIyZg--'); + // Mop.instance.qrcodeOpenApplet('https://api.finclip.com/api/v1/mop/runtime/applet/-f-MGYzN2Q1YTYzMmI2MWIyZg--'); }), _buildAppletItem(appletId, "finishRunningApplet", () { @@ -198,9 +196,18 @@ class MyAppletHandler extends AppletHandler { @override Future> getCustomMenus(String appId) { + String icon1 = 'https://img1.baidu.com/it/u=2878938773,1765835171&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=500'; + if (Platform.isIOS) { + icon1 = 'minipro_list_service'; + } + List customMenus = [ CustomMenu('WXShareAPPFriends', 'https://img1.baidu.com/it/u=2878938773,1765835171&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=500', '微信好朋友', 'common'), - CustomMenu('WXShareAPPMoments', 'https://img2.baidu.com/it/u=3113705544,436318069&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=500', '微信朋友圈', 'common'), + CustomMenu('WXShareAPPMoments', 'minipro_list_collect', '微信朋友圈', 'common'), + CustomMenu('MyFriends', 'https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcSpvugSNLs9R7iopz_noeotAelvgzYj-74iCg&usqp=CAU', '我的好友', 'common'), + + // CustomMenu('WXShareAPPFriends', 'https://img1.baidu.com/it/u=2878938773,1765835171&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=500', '微信好朋友', 'common'), + // CustomMenu('WXShareAPPMoments', 'https://img2.baidu.com/it/u=3113705544,436318069&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=500', '微信朋友圈', 'common'), // CustomMenu('WXShareAPPFriends', 'https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcSpvugSNLs9R7iopz_noeotAelvgzYj-74iCg&usqp=CAU', '微信好朋友', 'common'), // CustomMenu('WXShareAPPMoments', 'https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcR7cO4KB4e5-Ugdcq4pIyWunliH7LZRZzguKQ&usqp=CAU', '微信朋友圈', 'common'), diff --git a/ios/Classes/Api/MOPAppletDelegate.m b/ios/Classes/Api/MOPAppletDelegate.m index 43a8c13..08c416f 100644 --- a/ios/Classes/Api/MOPAppletDelegate.m +++ b/ios/Classes/Api/MOPAppletDelegate.m @@ -91,7 +91,7 @@ NSString *imageUrl = data[@"image"]; if ([imageUrl hasPrefix:@"http"]) { // 需要异步加载，待优化！ - model.menuIconImage = [UIImage fat_getImageWithUrl:imageUrl]; + model.menuIconUrl = imageUrl; } else { model.menuIconImage = [UIImage imageNamed:imageUrl]; } diff --git a/ios/Classes/Model/MopCustomMenuModel.h b/ios/Classes/Model/MopCustomMenuModel.h index 416aea9..1a0d008 100644 --- a/ios/Classes/Model/MopCustomMenuModel.h +++ b/ios/Classes/Model/MopCustomMenuModel.h @@ -12,6 +12,56 @@ NS_ASSUME_NONNULL_BEGIN @interface MopCustomMenuModel : NSObject +/** + 菜单id + */ +@property (nonatomic, copy) NSString *menuId; + +/** + 菜单的icon图标 + 我们固定菜单的大小：3倍图：90*90 + 图标中间小logo与图标宽度比是 5:8。 + 注意：菜单图标显示优先级：后台配置icon > APP注入icon + */ +@property (nonatomic, strong) UIImage *menuIconImage; + +/** + 菜单的icon图标网络链接地址 + 我们固定菜单的大小：3倍图：90*90 + 图标中间小logo与图标宽度比是 5:8，供参考 + 注意：菜单图标显示优先级：后台配置的icon path > App注入的icon + */ +@property (nonatomic, copy) NSString *menuIconUrl; + +/** + 菜单在黑暗模式下的icon图标 + 我们固定菜单的大小：3倍图：90*90 + 图标中间小logo与图标宽度比是 5:8。 + 注意：菜单图标显示优先级：后台配置icon > APP注入icon + */ +@property (nonatomic, strong) UIImage *menuIconDarkImage; + +/** + 菜单的暗黑模式icon图标网络链接地址 + 我们固定菜单的大小：3倍图：90*90 + 图标中间小logo与图标宽度比是 5:8，供参考 + 注意：菜单图标显示优先级：后台配置的darkIcon path > App注入的icon + */ +@property (nonatomic, copy) NSString *menuDarkIconUrl; + +/** + 菜单的标题 + 注意：菜单标题显示优先级：后台配置标题 > APP注入标题 + */ +@property (nonatomic, copy) NSString *menuTitle; + +/** + 菜单的类型 + FATAppletMenuStyleCommon：通用的按钮，不需要小程序提供额外信息就可以调用的，比如收藏； + FATAppletMenuStyleOnMiniProgram：需要小程序配合实现的按钮，也就是说需要小程序提供额外调用参数的按钮，比如分享到微信 + */ +@property (nonatomic, assign) FATAppletMenuStyle menuType; + @end NS_ASSUME_NONNULL_END diff --git a/ios/Classes/Model/MopCustomMenuModel.m b/ios/Classes/Model/MopCustomMenuModel.m index bfea6fc..a937019 100644 --- a/ios/Classes/Model/MopCustomMenuModel.m +++ b/ios/Classes/Model/MopCustomMenuModel.m @@ -9,15 +9,16 @@ @implementation MopCustomMenuModel -@synthesize menuId, menuIconImage, menuTitle, menuType; - - (id)copyWithZone:(NSZone *)zone { MopCustomMenuModel *model = [[MopCustomMenuModel allocWithZone:zone] init]; model.menuId = self.menuId; model.menuIconImage = self.menuIconImage; + model.menuIconDarkImage = self.menuIconDarkImage; model.menuTitle = self.menuTitle; model.menuType = self.menuType; + model.menuIconUrl = self.menuIconUrl; + model.menuDarkIconUrl = self.menuDarkIconUrl; return model; } diff --git a/ios/mop.podspec b/ios/mop.podspec index b1a0d35..6deaa11 100644 --- a/ios/mop.podspec +++ b/ios/mop.podspec @@ -17,7 +17,7 @@ A finclip miniprogram flutter sdk. s.dependency 'Flutter' s.ios.deployment_target = '9.0' - s.dependency 'FinApplet' , '2.41.0-alpha20230602v12' - s.dependency 'FinAppletExt' , '2.41.0-alpha20230602v12' + s.dependency 'FinApplet' , '2.40.12-dev20230608v03' + s.dependency 'FinAppletExt' , '2.40.12-dev20230608v03' end From 599b48fb54fe3587ac7282d009118b3474220776 Mon Sep 17 00:00:00 2001 From: wanghualei Date: Fri, 9 Jun 2023 16:44:06 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- example/lib/main.dart | 5 ----- 1 file changed, 5 deletions(-) diff --git a/example/lib/main.dart b/example/lib/main.dart index 20b97b3..f7aba25 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -196,11 +196,6 @@ class MyAppletHandler extends AppletHandler { @override Future> getCustomMenus(String appId) { - String icon1 = 'https://img1.baidu.com/it/u=2878938773,1765835171&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=500'; - if (Platform.isIOS) { - icon1 = 'minipro_list_service'; - } - List customMenus = [ CustomMenu('WXShareAPPFriends', 'https://img1.baidu.com/it/u=2878938773,1765835171&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=500', '微信好朋友', 'common'), CustomMenu('WXShareAPPMoments', 'minipro_list_collect', '微信朋友圈', 'common'), From 894de700bcd7d463f6af0f08967475e3d87a673a Mon Sep 17 00:00:00 2001 From: wanghualei Date: Sun, 11 Jun 2023 13:59:21 +0800 Subject: [PATCH 4/7] =?UTF-8?q?update=20vconsole=E5=BC=BA=E5=88=B6?= =?UTF-8?q?=E5=BC=80=E5=90=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- example/lib/main.dart | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/example/lib/main.dart b/example/lib/main.dart index f7aba25..e10115e 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -45,6 +45,7 @@ class _MyAppState extends State { Config config = Config(storeConfigs); config.language = LanguageType.English; config.baseLoadingViewClass = "LoadingView"; + config.appletDebugMode = BOOLState.BOOLStateTrue; UIConfig uiconfig = UIConfig(); uiconfig.isAlwaysShowBackInDefaultNavigationBar = false; @@ -168,7 +169,7 @@ class _MyAppState extends State { children: [ _buildAppletWidget("5facb3a52dcbff00017469bd", "画图小程序"), _buildAppletWidget("5f72e3559a6a7900019b5baa", "官方小程序"), - _buildAppletWidget("5fa215459a6a7900019b5cc3", "我的对账单"), + _buildAppletWidget("5f17f457297b540001e06ebb", "测试小程序"), ], ), ), @@ -197,9 +198,9 @@ class MyAppletHandler extends AppletHandler { @override Future> getCustomMenus(String appId) { List customMenus = [ - CustomMenu('WXShareAPPFriends', 'https://img1.baidu.com/it/u=2878938773,1765835171&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=500', '微信好朋友', 'common'), - CustomMenu('WXShareAPPMoments', 'minipro_list_collect', '微信朋友圈', 'common'), - CustomMenu('MyFriends', 'https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcSpvugSNLs9R7iopz_noeotAelvgzYj-74iCg&usqp=CAU', '我的好友', 'common'), + CustomMenu('CustomMenu1', 'https://img1.baidu.com/it/u=2878938773,1765835171&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=500', '百度图标', 'common'), + CustomMenu('CustomMenu2', 'minipro_list_collect', '工程图标', 'common'), + CustomMenu('MyFriends', 'https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcSpvugSNLs9R7iopz_noeotAelvgzYj-74iCg&usqp=CAU', '谷歌图标', 'common'), // CustomMenu('WXShareAPPFriends', 'https://img1.baidu.com/it/u=2878938773,1765835171&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=500', '微信好朋友', 'common'), // CustomMenu('WXShareAPPMoments', 'https://img2.baidu.com/it/u=3113705544,436318069&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=500', '微信朋友圈', 'common'), From 3e22570127e54e5d3e5350afb86a15d7bda7b585 Mon Sep 17 00:00:00 2001 From: wanghualei Date: Wed, 14 Jun 2023 19:06:10 +0800 Subject: [PATCH 5/7] =?UTF-8?q?update=20=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- example/ios/Podfile.lock | 16 ++++++++-------- example/ios/Runner.xcodeproj/project.pbxproj | 1 + example/lib/main.dart | 14 ++++++++++---- ios/Classes/Api/MOPAppletDelegate.m | 6 ++++++ ios/mop.podspec | 4 ++-- lib/api.dart | 3 ++- lib/mop.dart | 3 +++ 7 files changed, 32 insertions(+), 15 deletions(-) diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index fbb69b6..44b619c 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -1,11 +1,11 @@ PODS: - - FinApplet (2.40.12-dev20230608v03) - - FinAppletExt (2.40.12-dev20230608v03): - - FinApplet (= 2.40.12-dev20230608v03) + - FinApplet (2.40.12-dev20230614v02) + - FinAppletExt (2.40.12-dev20230614v02): + - FinApplet (= 2.40.12-dev20230614v02) - Flutter (1.0.0) - mop (0.1.1): - - FinApplet (= 2.40.12-dev20230608v03) - - FinAppletExt (= 2.40.12-dev20230608v03) + - FinApplet (= 2.40.12-dev20230614v02) + - FinAppletExt (= 2.40.12-dev20230614v02) - Flutter DEPENDENCIES: @@ -24,10 +24,10 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/mop/ios" SPEC CHECKSUMS: - FinApplet: 65349d2bff2aa592743da609a534eff8572681e4 - FinAppletExt: 92f01be77bb89ebf500b68e7f536441f62e02670 + FinApplet: de28575dab4c28c200c02844f4909b04d376def2 + FinAppletExt: eea5d939667836c744b5eb4afcc81285e248c9f3 Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a - mop: 51a9fa6dd85e339898d1d602572cccdc0f491b76 + mop: d8bad2214a82a3440c154e496d0d49c1144490a4 PODFILE CHECKSUM: 2da0220ee5ba22a2dfcec42dfe5b17d05f3c3da9 diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj index 95037a5..0551d33 100644 --- a/example/ios/Runner.xcodeproj/project.pbxproj +++ b/example/ios/Runner.xcodeproj/project.pbxproj @@ -496,6 +496,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + DEVELOPMENT_TEAM = 9QCKYFU5M4; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = finclip_example; diff --git a/example/lib/main.dart b/example/lib/main.dart index e10115e..aeaa676 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -60,6 +60,7 @@ class _MyAppState extends State { uiconfig.capsuleConfig = capsuleConfig; uiconfig.appletText = "applet"; uiconfig.loadingLayoutCls = "com.finogeeks.mop_example.CustomLoadingPage"; + uiconfig.autoAdaptDarkMode = true; // if (Platform.isIOS) { // final res = await Mop.instance.initialize( @@ -197,11 +198,16 @@ class MyAppletHandler extends AppletHandler { @override Future> getCustomMenus(String appId) { - List customMenus = [ - CustomMenu('CustomMenu1', 'https://img1.baidu.com/it/u=2878938773,1765835171&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=500', '百度图标', 'common'), - CustomMenu('CustomMenu2', 'minipro_list_collect', '工程图标', 'common'), - CustomMenu('MyFriends', 'https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcSpvugSNLs9R7iopz_noeotAelvgzYj-74iCg&usqp=CAU', '谷歌图标', 'common'), + CustomMenu menu1 = CustomMenu('CustomMenu1', 'https://img1.baidu.com/it/u=2878938773,1765835171&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=500', '百度图标', 'common'); + menu1.darkImage = 'https://img95.699pic.com/xsj/14/46/mh.jpg%21/fw/700/watermark/url/L3hzai93YXRlcl9kZXRhaWwyLnBuZw/align/southeast'; + + CustomMenu menu2 = CustomMenu('CustomMenu2', 'minipro_list_collect', '工程图标', 'common'); + menu2.darkImage = 'minipro_list_service'; + List customMenus = [ + menu1, + menu2, + CustomMenu('MyFriends', 'https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcSpvugSNLs9R7iopz_noeotAelvgzYj-74iCg&usqp=CAU', '谷歌图标', 'common'), // CustomMenu('WXShareAPPFriends', 'https://img1.baidu.com/it/u=2878938773,1765835171&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=500', '微信好朋友', 'common'), // CustomMenu('WXShareAPPMoments', 'https://img2.baidu.com/it/u=3113705544,436318069&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=500', '微信朋友圈', 'common'), diff --git a/ios/Classes/Api/MOPAppletDelegate.m b/ios/Classes/Api/MOPAppletDelegate.m index 08c416f..cdb730b 100644 --- a/ios/Classes/Api/MOPAppletDelegate.m +++ b/ios/Classes/Api/MOPAppletDelegate.m @@ -95,6 +95,12 @@ } else { model.menuIconImage = [UIImage imageNamed:imageUrl]; } + NSString *darkImageUrl = data[@"darkImage"]; + if ([darkImageUrl hasPrefix:@"http"]) { + model.menuDarkIconUrl = darkImageUrl; + } else { + model.menuIconDarkImage = [UIImage imageNamed:darkImageUrl]; + } NSString *typeString = data[@"type"]; if (typeString) { FATAppletMenuStyle style = [typeString isEqualToString:@"onMiniProgram"] ? FATAppletMenuStyleOnMiniProgram : FATAppletMenuStyleCommon; diff --git a/ios/mop.podspec b/ios/mop.podspec index 6deaa11..8077459 100644 --- a/ios/mop.podspec +++ b/ios/mop.podspec @@ -17,7 +17,7 @@ A finclip miniprogram flutter sdk. s.dependency 'Flutter' s.ios.deployment_target = '9.0' - s.dependency 'FinApplet' , '2.40.12-dev20230608v03' - s.dependency 'FinAppletExt' , '2.40.12-dev20230608v03' + s.dependency 'FinApplet' , '2.40.12-dev20230614v02' + s.dependency 'FinAppletExt' , '2.40.12-dev20230614v02' end diff --git a/lib/api.dart b/lib/api.dart index f4c554b..5dd445d 100644 --- a/lib/api.dart +++ b/lib/api.dart @@ -1,13 +1,14 @@ class CustomMenu { String menuId; String image; + String? darkImage; String title; String type; CustomMenu(this.menuId, this.image, this.title, this.type); Map toJson() => - {'menuId': menuId, 'image': image, 'title': title, 'type': type}; + {'menuId': menuId, 'image': image, 'darkImage': darkImage, 'title': title, 'type': type}; } abstract class AppletHandler { diff --git a/lib/mop.dart b/lib/mop.dart index f8eefc0..79270df 100644 --- a/lib/mop.dart +++ b/lib/mop.dart @@ -1154,6 +1154,9 @@ class Mop { map["image"] = element.image; map["title"] = element.title; map["type"] = element.type; + if (element.darkImage != null) { + map["darkImage"] = element.darkImage; + } list.add(map); }); debugPrint("registerAppletHandler getCustomMenus list $list"); From cfb1e5dc3fd945e19089775fcfb9910a8254e6d4 Mon Sep 17 00:00:00 2001 From: wanghualei Date: Wed, 14 Jun 2023 21:37:31 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=AE=89=E5=8D=93=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=9A=97=E9=BB=91=E6=A8=A1=E5=BC=8F=E5=9B=BE?= =?UTF-8?q?=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/finogeeks/mop/api/mop/AppletHandlerModule.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/android/src/main/java/com/finogeeks/mop/api/mop/AppletHandlerModule.java b/android/src/main/java/com/finogeeks/mop/api/mop/AppletHandlerModule.java index 097b636..aa54290 100644 --- a/android/src/main/java/com/finogeeks/mop/api/mop/AppletHandlerModule.java +++ b/android/src/main/java/com/finogeeks/mop/api/mop/AppletHandlerModule.java @@ -186,12 +186,17 @@ public class AppletHandlerModule extends BaseApi { if (image == null) { image = ""; } + String darkImage = (String) map.get("darkImage"); + if (darkImage == null) { + darkImage = ""; + } moreMenuItems.add( new MoreMenuItem( menuId, title, image, -1, + darkImage, moreMenuType, true ) From e8de7ac45360cdd0572b705c69446032cbfca10e Mon Sep 17 00:00:00 2001 From: wanghualei Date: Thu, 15 Jun 2023 17:21:22 +0800 Subject: [PATCH 7/7] update --- example/lib/main.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example/lib/main.dart b/example/lib/main.dart index aeaa676..a2ab05c 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -198,7 +198,7 @@ class MyAppletHandler extends AppletHandler { @override Future> getCustomMenus(String appId) { - CustomMenu menu1 = CustomMenu('CustomMenu1', 'https://img1.baidu.com/it/u=2878938773,1765835171&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=500', '百度图标', 'common'); + CustomMenu menu1 = CustomMenu('WXTest', 'https://img1.baidu.com/it/u=2878938773,1765835171&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=500', '百度图标', 'common'); menu1.darkImage = 'https://img95.699pic.com/xsj/14/46/mh.jpg%21/fw/700/watermark/url/L3hzai93YXRlcl9kZXRhaWwyLnBuZw/align/southeast'; CustomMenu menu2 = CustomMenu('CustomMenu2', 'minipro_list_collect', '工程图标', 'common');