diff --git a/assets/image/2x/recharge.png b/assets/image/2x/recharge.png deleted file mode 100644 index a353e763..00000000 Binary files a/assets/image/2x/recharge.png and /dev/null differ diff --git a/assets/image/2x/recharge.webp b/assets/image/2x/recharge.webp new file mode 100644 index 00000000..22995ef6 Binary files /dev/null and b/assets/image/2x/recharge.webp differ diff --git a/assets/image/3x/recharge.png b/assets/image/3x/recharge.png deleted file mode 100644 index 0f3c3f3c..00000000 Binary files a/assets/image/3x/recharge.png and /dev/null differ diff --git a/assets/image/3x/recharge.webp b/assets/image/3x/recharge.webp new file mode 100644 index 00000000..9c0bcf31 Binary files /dev/null and b/assets/image/3x/recharge.webp differ diff --git a/assets/image/recharge.png b/assets/image/recharge.png deleted file mode 100644 index 15ead2f5..00000000 Binary files a/assets/image/recharge.png and /dev/null differ diff --git a/assets/image/recharge.webp b/assets/image/recharge.webp new file mode 100644 index 00000000..a0e0c5c1 Binary files /dev/null and b/assets/image/recharge.webp differ 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