From 6cf03e7a5f763ff4525fe2755b7529334f79f5e6 Mon Sep 17 00:00:00 2001 From: w-R <953969641@qq.com> Date: Mon, 28 Mar 2022 21:50:48 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A4=BE=E7=BE=A4=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/image/2x/recharge.png | Bin 646 -> 0 bytes assets/image/2x/recharge.webp | Bin 0 -> 344 bytes assets/image/3x/recharge.png | Bin 1127 -> 0 bytes assets/image/3x/recharge.webp | Bin 0 -> 594 bytes assets/image/recharge.png | Bin 316 -> 0 bytes assets/image/recharge.webp | Bin 0 -> 198 bytes lib/generated/intl/messages_en.dart | 2 +- lib/generated/intl/messages_zh_CN.dart | 2 +- lib/generated/intl/messages_zh_Hans_CN.dart | 2 +- lib/generated/intl/messages_zh_Hant_CN.dart | 2 +- lib/generated/intl/messages_zh_TW.dart | 2 +- lib/generated/l10n.dart | 4 ++-- lib/l10n/intl_en.arb | 2 +- lib/l10n/intl_zh_CN.arb | 2 +- lib/l10n/intl_zh_Hans_CN.arb | 2 +- lib/l10n/intl_zh_Hant_CN.arb | 2 +- lib/l10n/intl_zh_TW.arb | 2 +- lib/mine/recharge_page.dart | 2 +- pubspec.lock | 14 ++++++-------- pubspec.yaml | 8 ++++---- 20 files changed, 23 insertions(+), 25 deletions(-) delete mode 100644 assets/image/2x/recharge.png create mode 100644 assets/image/2x/recharge.webp delete mode 100644 assets/image/3x/recharge.png create mode 100644 assets/image/3x/recharge.webp delete mode 100644 assets/image/recharge.png create mode 100644 assets/image/recharge.webp diff --git a/assets/image/2x/recharge.png b/assets/image/2x/recharge.png deleted file mode 100644 index a353e7631a378789eb08e6a41c26a7314dd5069c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 646 zcmV;10(t$3P)Px%KuJVFR9HvN*k4G~Q53-O@5*wnH8tH*VF-pVkwp>IOF~o&!iON}Rq-K$@Szf` zCq<%%D5CBd&hj_>Cr(Tf4vg?r*#I{oeE8 zo_h}5<3i)LE!xuQ($#0;5Oiq?OySJS(+;>4rycNLoL0beIBkHLa9RNWhbuTR8?K;0 z8C=1Dvbcf(t>E$ww2I3sFc)0jfVtxG0n}@4ieg3%a9vBNukJ;aTP8=Ga4eM;~OJyhsCOaAve)TMyB?xrx5`6MA0VSp@8< z-OkxvM<`lRM9)Z!*!zL3IO!^u#hC}z`l`6G{}g^t*`E~N=3spzXLdFxQ`!CO7LR70 zOW~w|R&c4P!L3F9ZHhr$ef9F@jp1?GZFMXz2{K{(Vw&==ra zVxALEFZ24-q$M2iHRBt!gG(v=C1spzJj%t97!z|Jtm4ekTRbgL15cT(Zq*fHPaktbhRn g5gBWV#+TO1Z%FI;4-+3-w*UYD07*qoM6N<$f(yznGXMYp diff --git a/assets/image/2x/recharge.webp b/assets/image/2x/recharge.webp new file mode 100644 index 0000000000000000000000000000000000000000..22995ef6a7e7b7a28c37d97b8f1c8b446e65d0bc GIT binary patch literal 344 zcmWIYbaM+}WMBw)bqWXzu<&sPvh~#ua0(oMxT06Zv+E~c{hH@_ZWj`6m`z%=^PhEX z+MJsPJTtcO{``NV#NWY7*|Tew`hSlTY@N<~rQ8KQn&cTc8CG#kSrw2ppK;A6{+9H6 zFL&&EdE0N2z}^y>RdZ`(z$j@!guQ(Cpp@6yS9*+s7|Yv}%4;VAOY=Gh(oORPszT|QP? zG3Qmk)qW+QdjDAF$NIZ3?*+7L{I&CSU;9tCw4-bOW|Nu)U$p!~{#n&6`(x#9vj1$y fv+2J(1lo23@oeXojJloHE*;ClU%$0eVqyRQl9Z(0 literal 0 HcmV?d00001 diff --git a/assets/image/3x/recharge.png b/assets/image/3x/recharge.png deleted file mode 100644 index 0f3c3f3c508e4690d6f14c57771816a4b8fc16b0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1127 zcmV-t1ep7YP)Px(AxT6*RA@ux*?njecO1v@&-c!xF|o1MXKRgPPB-xZN6JdojaB?-;0FFNb+8Nt z#rcQKhazrLt79?|MNtq0H=PgYlsXuU&c8aatFDbYR$K8QmfC8yRcu;qn>P0w_rr{I zCiaqh$lW!674CZcUirTJ>n|-~h`i?f^ts2$93?aqyfSuJR4f5u^N;}hkFP3|n6w#y z$JXFj#uAgZ$4a&>I6h-}vbG1uXB@vz*>1v#GPW%^S;n>nC(GD&;K4Gs66GBzbx&x}n6);nXY&ba6 z85;^VL&k=J&5*GnU?VbiJ6xDKdMf&*C~mahL!ZKF8?kyBI9xHQCKtg6MX#E zLcHkf!MclkQ2(ScGhn?l9+~CA*M(o;!zu4V6hu7h?ZTRh?{W88i?LuMG9EpABua}` zVZr1%9QU+4j03@+@mr`G5|fMr>zy%yFg-UP8w*yzKjCc-d(hR6{k3ON*>n|A1z7oe zH2WFWJL4(d@!0kLTFl7xK_Eh7$3yI>I*NbVLSSHnPBwOfYH+$4%MX;+@p?=eF^1oFuj2u}{qq?9etcUoR1>h8jOAVSEB`XML?=!)Ttu+-<|~UA zNkCEFY-}p{4Ef%1e3I85-NL?_GiXq-BPV({R83e-#sw4K!QsUve8SD0kMUjgas2hL ze!v>%=gr2pqLmoy9tD7*x}^@gube=0XIsjXRW;#sGmc+nuFH#^3s&R3Ni!j5+Z29; z(o08B*A{|99EK0_=ke=K(E*7u)U-BWXVnjAef}hEY+9R^nvDOyQlEDMHWVz!!pU>_ zC3(^ZgXb~Uox=|m-YgG4JynD*uPeWz2u^QkOu&y4q0wDU_8-1Hd-Rm}4Q(rZ=-X zkDmMVT=c(#hYd59|Mbx$2x93QuJGv?mV<4UF$3W~5&Z(-bTH(rku#3p(a7o<6CunP tnn5IgpuRxNQJu{qEtM;e^(5N5{{<-~8byvY+Mxgd002ovPDHLkV1g-?9t;2g diff --git a/assets/image/3x/recharge.webp b/assets/image/3x/recharge.webp new file mode 100644 index 0000000000000000000000000000000000000000..9c0bcf31f95457c5d9e0e54f4418918a90ed4681 GIT binary patch literal 594 zcmV-Y0p39%wf|(4R78$=Kfm7hkEA_wL?Y(2Pm+l5_YZ7N(mwb7%lG~DyuKCB)ld(O3O+qQl0xwbcs z?f-vTN4t0bKt%r?xosm!@{zsIyh0-`9npA8r!0-Ph^1?+r6amdODQp>tO}KtQesMJ z6)7jB#FWx1Qcg;VDWz4UoRkt%N~=gYDJ7Ohb>5Tba9IuN7|geV@OZ@c^7V2HZsYFduL0DYXSleTjxMDIpL+E;&(0R1~16zSaf z(UAbX?5~pE!#^FVoc_JO6g|Q3S*J+ffnIv3x~IqY3LfBRvs)?#PV_QEb*ECgw(}3L z)#0ibxzdsB+~|I|T6&KDKi3+iYUo-=vUj74F_EtIZONxi{PJeeuHA(=-jW&i*H literal 0 HcmV?d00001 diff --git a/assets/image/recharge.png b/assets/image/recharge.png deleted file mode 100644 index 15ead2f5971cca2209f12eac00fb519477fe8a29..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 316 zcmV-C0mJ@@P)Px#_DMuRR5(v#WS}B2T9{DJNG^?0a~I!Aw#cY}mUWpD+q56axu)(_B&;?6Qi3(-^+|{*I;O`~L}U zAR)tuDL4QBXIKX|kSc~T{D1$C@xKKl<%a$L^#4EOo_|dLDlf(_x&;8ni*@7gR*~G05Ijx|K7RISccD(vUiR$(W%4C)mz71 z2lz?{ZyoyP2ba;%cWQ_11~EJw#_E=4q6 AOaK4? literal 0 HcmV?d00001 diff --git a/lib/generated/intl/messages_en.dart b/lib/generated/intl/messages_en.dart index 1a4a0838..bea5e68f 100644 --- a/lib/generated/intl/messages_en.dart +++ b/lib/generated/intl/messages_en.dart @@ -337,7 +337,7 @@ class MessageLookup extends MessageLookupByLibrary { "login_splash" : MessageLookupByLibrary.simpleMessage("欢迎来到一心回乡"), "main_menu1" : MessageLookupByLibrary.simpleMessage("净弼"), "main_menu2" : MessageLookupByLibrary.simpleMessage("联盟"), - "main_menu3" : MessageLookupByLibrary.simpleMessage("社群"), + "main_menu3" : MessageLookupByLibrary.simpleMessage("发现"), "main_menu4" : MessageLookupByLibrary.simpleMessage("我的"), "manlijiandaijinquan" : m17, "manyuankeyong" : m18, diff --git a/lib/generated/intl/messages_zh_CN.dart b/lib/generated/intl/messages_zh_CN.dart index 2d94046a..79496754 100644 --- a/lib/generated/intl/messages_zh_CN.dart +++ b/lib/generated/intl/messages_zh_CN.dart @@ -335,7 +335,7 @@ class MessageLookup extends MessageLookupByLibrary { "login_splash" : MessageLookupByLibrary.simpleMessage("欢迎来到一心回乡"), "main_menu1" : MessageLookupByLibrary.simpleMessage("净弼"), "main_menu2" : MessageLookupByLibrary.simpleMessage("联盟"), - "main_menu3" : MessageLookupByLibrary.simpleMessage("社群"), + "main_menu3" : MessageLookupByLibrary.simpleMessage("发现"), "main_menu4" : MessageLookupByLibrary.simpleMessage("我的"), "manlijiandaijinquan" : m17, "manyuankeyong" : m18, diff --git a/lib/generated/intl/messages_zh_Hans_CN.dart b/lib/generated/intl/messages_zh_Hans_CN.dart index c441640b..00a9d7b9 100644 --- a/lib/generated/intl/messages_zh_Hans_CN.dart +++ b/lib/generated/intl/messages_zh_Hans_CN.dart @@ -335,7 +335,7 @@ class MessageLookup extends MessageLookupByLibrary { "login_splash" : MessageLookupByLibrary.simpleMessage("欢迎来到一心回乡"), "main_menu1" : MessageLookupByLibrary.simpleMessage("净弼"), "main_menu2" : MessageLookupByLibrary.simpleMessage("联盟"), - "main_menu3" : MessageLookupByLibrary.simpleMessage("社群"), + "main_menu3" : MessageLookupByLibrary.simpleMessage("发现"), "main_menu4" : MessageLookupByLibrary.simpleMessage("我的"), "manlijiandaijinquan" : m17, "manyuankeyong" : m18, diff --git a/lib/generated/intl/messages_zh_Hant_CN.dart b/lib/generated/intl/messages_zh_Hant_CN.dart index 9306dfd3..8d008daa 100644 --- a/lib/generated/intl/messages_zh_Hant_CN.dart +++ b/lib/generated/intl/messages_zh_Hant_CN.dart @@ -335,7 +335,7 @@ class MessageLookup extends MessageLookupByLibrary { "login_splash" : MessageLookupByLibrary.simpleMessage("歡迎來到一心回鄉"), "main_menu1" : MessageLookupByLibrary.simpleMessage("淨弼"), "main_menu2" : MessageLookupByLibrary.simpleMessage("聯盟"), - "main_menu3" : MessageLookupByLibrary.simpleMessage("社群"), + "main_menu3" : MessageLookupByLibrary.simpleMessage("發現"), "main_menu4" : MessageLookupByLibrary.simpleMessage("我的"), "manlijiandaijinquan" : m17, "manyuankeyong" : m18, diff --git a/lib/generated/intl/messages_zh_TW.dart b/lib/generated/intl/messages_zh_TW.dart index 026f8527..9a6a6178 100644 --- a/lib/generated/intl/messages_zh_TW.dart +++ b/lib/generated/intl/messages_zh_TW.dart @@ -335,7 +335,7 @@ class MessageLookup extends MessageLookupByLibrary { "login_splash" : MessageLookupByLibrary.simpleMessage("歡迎來到一心回鄉"), "main_menu1" : MessageLookupByLibrary.simpleMessage("淨弼"), "main_menu2" : MessageLookupByLibrary.simpleMessage("聯盟"), - "main_menu3" : MessageLookupByLibrary.simpleMessage("社群"), + "main_menu3" : MessageLookupByLibrary.simpleMessage("發現"), "main_menu4" : MessageLookupByLibrary.simpleMessage("我的"), "manlijiandaijinquan" : m17, "manyuankeyong" : m18, diff --git a/lib/generated/l10n.dart b/lib/generated/l10n.dart index c869c31d..b1cebb45 100644 --- a/lib/generated/l10n.dart +++ b/lib/generated/l10n.dart @@ -185,10 +185,10 @@ class S { ); } - /// `社群` + /// `发现` String get main_menu3 { return Intl.message( - '社群', + '发现', name: 'main_menu3', desc: '', args: [], diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb index 96ed8aa6..c30c507e 100644 --- a/lib/l10n/intl_en.arb +++ b/lib/l10n/intl_en.arb @@ -14,7 +14,7 @@ "privacy_policy3": "《隐私服务》", "main_menu1": "净弼", "main_menu2": "联盟", - "main_menu3": "社群", + "main_menu3": "发现", "main_menu4": "我的", "shouye": "首页", "huodongliebiao": "活动列表", diff --git a/lib/l10n/intl_zh_CN.arb b/lib/l10n/intl_zh_CN.arb index 71f61742..3c3be7a3 100644 --- a/lib/l10n/intl_zh_CN.arb +++ b/lib/l10n/intl_zh_CN.arb @@ -14,7 +14,7 @@ "privacy_policy3": "《隐私服务》", "main_menu1": "净弼", "main_menu2": "联盟", - "main_menu3": "社群", + "main_menu3": "发现", "main_menu4": "我的", "shouye": "首页", "huodongliebiao": "活动列表", diff --git a/lib/l10n/intl_zh_Hans_CN.arb b/lib/l10n/intl_zh_Hans_CN.arb index 918ed547..4d487b71 100644 --- a/lib/l10n/intl_zh_Hans_CN.arb +++ b/lib/l10n/intl_zh_Hans_CN.arb @@ -14,7 +14,7 @@ "privacy_policy3": "《隐私服务》", "main_menu1": "净弼", "main_menu2": "联盟", - "main_menu3": "社群", + "main_menu3": "发现", "main_menu4": "我的", "shouye": "首页", "huodongliebiao": "活动列表", diff --git a/lib/l10n/intl_zh_Hant_CN.arb b/lib/l10n/intl_zh_Hant_CN.arb index b1b3bfab..c617d74b 100644 --- a/lib/l10n/intl_zh_Hant_CN.arb +++ b/lib/l10n/intl_zh_Hant_CN.arb @@ -14,7 +14,7 @@ "privacy_policy3": "《隱私服務》", "main_menu1": "淨弼", "main_menu2": "聯盟", - "main_menu3": "社群", + "main_menu3": "發現", "main_menu4": "我的", "shouye": "首頁", "huodongliebiao": "活動列表", diff --git a/lib/l10n/intl_zh_TW.arb b/lib/l10n/intl_zh_TW.arb index 30c97cdb..bd0f38a7 100644 --- a/lib/l10n/intl_zh_TW.arb +++ b/lib/l10n/intl_zh_TW.arb @@ -14,7 +14,7 @@ "privacy_policy3": "《隱私服務》", "main_menu1": "淨弼", "main_menu2": "聯盟", - "main_menu3": "社群", + "main_menu3": "發現", "main_menu4": "我的", "shouye": "首頁", "huodongliebiao": "活動列表", diff --git a/lib/mine/recharge_page.dart b/lib/mine/recharge_page.dart index 4122bc48..158b0141 100644 --- a/lib/mine/recharge_page.dart +++ b/lib/mine/recharge_page.dart @@ -509,7 +509,7 @@ class _RechargePage extends State { ), if(selectIndex == index) Image.asset( - "assets/image/recharge.png", + "assets/image/recharge.webp", width: 20, height:20, ), diff --git a/pubspec.lock b/pubspec.lock index 074910e2..aa938ef1 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -307,7 +307,7 @@ packages: name: fluwx url: "https://pub.flutter-io.cn" source: hosted - version: "3.8.1" + version: "3.8.1+1" font_awesome_flutter: dependency: "direct main" description: @@ -377,7 +377,7 @@ packages: name: keframe url: "https://pub.flutter-io.cn" source: hosted - version: "2.0.3" + version: "2.0.4" like_button: dependency: "direct main" description: @@ -701,12 +701,10 @@ packages: tpns_flutter_plugin: dependency: "direct main" description: - path: "." - ref: "V1.1.4" - resolved-ref: "9494908d3d974899dd6d8494a332b89998b5ac8b" - url: "git://github.com/TencentCloud/TPNS-Flutter-Plugin" - source: git - version: "1.1.4" + name: tpns_flutter_plugin + url: "https://pub.flutter-io.cn" + source: hosted + version: "1.1.0" transformer_page_view: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index a1caf0a9..ee0e8467 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -19,10 +19,10 @@ dependencies: keframe: ^2.0.2 #滑动组件卡顿优化 - tpns_flutter_plugin: - git: - url: git://github.com/TencentCloud/TPNS-Flutter-Plugin - ref: V1.1.4 + tpns_flutter_plugin: ^1.0.8 +# git: +# url: git://github.com/TencentCloud/TPNS-Flutter-Plugin +# ref: V1.1.4 like_button: ^2.0.2 cupertino_icons: ^1.0.2