From 26792c6c7f52d6a52cae999b63aae11b39939ea0 Mon Sep 17 00:00:00 2001
From: anfe <448468458@qq.com>
Date: Thu, 30 May 2024 15:02:15 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=B6=88=E6=81=AF=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=A8=E9=83=A8=E6=B8=85=E9=99=A4=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .DS_Store                                     | Bin 10244 -> 10244 bytes
 ios/Runner.xcodeproj/project.pbxproj          |   2 +-
 .../xcshareddata/xcschemes/Runner.xcscheme    |   2 +-
 .../messageList/messageList_xhj_page.dart     |  50 ++++++++----------
 4 files changed, 25 insertions(+), 29 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index db65cd73b909a39e65bd567382b0c9d0fe9a5215..f7e55907e64996cff1c8d6490166ef5cbccae3b2 100755
GIT binary patch
delta 1181
zcmeIxPe{{Y9LMqR`)TT?ziQLXYB*ha5Y1#YnMNIUu*?!2H8m+xmpiO<{+Sq5WSW-<
zsr*qyWDp%HEQqY=A9V;TgSu3d5k(Op{XccdLqD8BMg$Rb>bZQM@8|S9-`Df>26_W$
zb4}jkq1L8Iti$7ZikfChNK7(Yl2f$lS*0sV%T{W2*3`~OcuQq#N2Dbhs}8rvjH-`k
zwCQOMo6Rm$7y1iRL?3hvbbZgW{dw_iFxt=@&h~raokh&zl0{M?<x(&0vQ7HrkQ|fq
zGAy@bR9?xLe3o%w25HPD2M<1$vYZM6tRYAh8>lD5MjC0Rg*MuWv7H_4q?_6v_Rz;(
z_OYMC9ASW?oZu9LoaPJ{xx{6zaFbzfbB7V`@_=W&<Zb+XipdL<Pu9u8yP<o|B8E)n
zP4=Xs;=+7);bJ|S<kv4`q<iyzJxOP<Dp+0f$CK=KIrK4`S08cBF=?4jw;o7M*T-G6
zDzzMEuEpA54#px|!w+X#ZK+zmR$#HlEWyo@XyZiUT&Q`?)<#QJQ$r}+6pwsbvDv!H
zQqvhnjE8nj4`ufM9oHjyE^p+$d@;Bb2_%w&9T!=+nM)q?SwI0xC}EiaxSDmWH}L8v
z;G(n|bX}cv8E!r7VmJNh9N^#t*hz!z99Ox<b#8E<$2?(_*L>h3pA;%t*_A`3t1RVK
q^HjF-sUqc9WvW8e`~+D$6;iGJu^&?IuO@!?uK#No-{&7`D3NdZmGP(m

delta 1087
zcmd_oNoZ416b9h)-@FXZYst&-5}P(@7Lrhm60Hrbi&CmmZHo;yZB?+E*a)E^jY+9g
z(K=KYPGGM%pdz>^4n>6;r-d64Er<(=qQRjnK@_BdE>zS<(xr$Ccizp<{qN$!cg{$7
zBz&z}5+in1=4DmQD^|9&wh4=>j=KBp*1<%4YkPVi(Vxn8#WPtgW${r;fQxZ;zQU^%
zz0xb2@^i{v6+S-~?^I8KD>@}=l8aq!po%M)xzsP=T#=NlTzYG8b1tUzs;;rmE26ea
z!40z5X>$w*sfk*shtf1e2kAJSqwAET8#GBz=s8W%2b!iI(7^;Jyzn7_5E{^krC5gL
zScNcFqXQAF#|A_Z!zLt=LK<6;!FKGxFm_=#4&V?D;|NaR6i(v|&SDG~a1od6m_QCU
zaSOL`2lwy@Pf-vS=iG^c;h1U+h3W#{MKvO2Y!talho?4{PA0Mg!C(PQC+Q7FlRS&_
zGFPOtt9#AbKSCaLt2%Dy;=Ls(UbxF8?s0iV*y<3oJ<fLScU8+8WF(u|7SEd%i<JlX
z0$JmW^d(Zg#m2Re*O;^cbS9&*c(PQ5c%4aUmAeN^<0_TfCmGM^UrXPo$MlR|(pydX
z6Md#H^bHcqV1@z<T&RE>9?ZjH)N1xkXhoam-d;5C!A4DeGx|0046+!)9_+<F>@QlM
z)U?mzGRAQQSHrlA2Y84{<naox@dnfQ$|R;|24-dovoag=F+U5kde+36S(u84p_H_4
bCTD_0C*b`qiJz6}-!Ja}?%naPy*2n>yo3L{

diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index 82c40d25..238f4a2e 100755
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -608,7 +608,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1430;
+				LastUpgradeCheck = 1510;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
index 2820dca7..7596d007 100755
--- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/lib/mine/message/messageList/messageList_xhj_page.dart b/lib/mine/message/messageList/messageList_xhj_page.dart
index 170e2c6d..662403bb 100755
--- a/lib/mine/message/messageList/messageList_xhj_page.dart
+++ b/lib/mine/message/messageList/messageList_xhj_page.dart
@@ -24,7 +24,8 @@ class MessageListXHJPage extends StatefulWidget {
   State<MessageListXHJPage> createState() => _MessageListXHJPageState();
 }
 
-class _MessageListXHJPageState extends State<MessageListXHJPage> with TickerProviderStateMixin {
+class _MessageListXHJPageState extends State<MessageListXHJPage>
+    with TickerProviderStateMixin {
   final MessageListLogic logic = Get.put(MessageListLogic());
   final MessageListState state = Get.find<MessageListLogic>().state;
 
@@ -45,31 +46,7 @@ class _MessageListXHJPageState extends State<MessageListXHJPage> with TickerProv
   Widget build(BuildContext context) {
     return Scaffold(
       backgroundColor: Colors.white,
-      appBar: widget.showAppBar
-          ? TitleAppBar(
-              barTitle: TranslationLoader.lanKeys!.message!.tr,
-              haveBack: true,
-              actionsList: <Widget>[
-                TextButton(
-                  child: Text(
-                    '清空'.tr,
-                    style: TextStyle(color: Colors.white, fontSize: 24.sp),
-                  ),
-                  onPressed: () async {
-                    final bool? isDemoMode = await Storage.getBool(ifIsDemoModeOrNot);
-                    if (isDemoMode == false) {
-                      ShowTipView().showIosTipWithContentDialog('是否清空?'.tr,
-                          () async {
-                        logic.deletAllMessageDataRequest();
-                      });
-                    } else {
-                      logic.showToast('演示模式'.tr);
-                    }
-                  },
-                ),
-              ],
-              backgroundColor: AppColors.mainColor)
-          : null,
+      appBar: null,
       body: Column(
         children: <Widget>[
           SizedBox(
@@ -135,7 +112,7 @@ class _MessageListXHJPageState extends State<MessageListXHJPage> with TickerProv
                             final MessageItemEntity messageItemEntity =
                                 state.itemDataList[index];
                             return Slidable(
-                              key: ValueKey(messageItemEntity.id),
+                              key: ValueKey<String?>(messageItemEntity.id),
                               endActionPane: ActionPane(
                                 extentRatio: 0.2,
                                 motion: const ScrollMotion(),
@@ -169,6 +146,25 @@ class _MessageListXHJPageState extends State<MessageListXHJPage> with TickerProv
           ),
         ],
       ),
+      floatingActionButton: FloatingActionButton(
+        backgroundColor: AppColors.mainColor,
+        child: Icon(
+          Icons.delete_sweep,
+          color: AppColors.blackColor,
+        ),
+        onPressed: () async {
+          final bool? isDemoMode = await Storage.getBool(ifIsDemoModeOrNot);
+          if (isDemoMode == false) {
+            ShowTipView().showIosTipWithContentDialog('是否清空?'.tr, () async {
+              logic.deletAllMessageDataRequest();
+            });
+          } else {
+            logic.showToast('演示模式'.tr);
+          }
+        },
+        shape: RoundedRectangleBorder(
+            borderRadius: BorderRadius.all(Radius.circular(100.r))),
+      ),
     );
   }