Merge branch 'newHost' of https://git.oa00.com/1281228557/aku_new_community into newHost

ios/Podfile.lock

@@ -188,4 +188,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: fe0e1ee7f3d1f7d00b11b474b62dd62134535aea
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.11.2

lib/model/user/blacklist_model.dart

@@ -9,14 +9,16 @@ class BlacklistModel extends Equatable {
   final int id;
   final List<ImgModel> imgList;
   final String? name;
+  final String nickName;
 
   factory BlacklistModel.fromJson(Map<String, dynamic> json) =>
       _$BlacklistModelFromJson(json);
 
-  BlacklistModel({
+  const BlacklistModel({
     required this.id,
     required this.imgList,
-    required this.name,
+    this.name,
+    required this.nickName,
   });
 
   @override
@@ -24,5 +26,6 @@ class BlacklistModel extends Equatable {
         id,
         imgList,
         name,
+        nickName,
       ];
 }

lib/model/user/blacklist_model.g.dart

@@ -13,4 +13,5 @@ BlacklistModel _$BlacklistModelFromJson(Map<String, dynamic> json) =>
           .map((e) => ImgModel.fromJson(e as Map<String, dynamic>))
           .toList(),
       name: json['name'] as String?,
+      nickName: json['nickName'] as String,
     );

lib/pages/setting_page/blacklist_page/blacklist_page.dart

@@ -102,6 +102,7 @@ class _blackListPageState extends State<blackListPage> {
                         TextStyle(fontSize: 24.sp, color: Color(0xA6000000))),
               ])),
             ),
+            20.hb,
             Expanded(
                 child:
                     //     ListView.builder(
@@ -192,7 +193,7 @@ class _blackListPageState extends State<blackListPage> {
           // )
           ,
           title: Text(
-            model.name == null ? '' : _getText(model.name!),
+            model.nickName ?? '',
             style: TextStyle(fontSize: 28.sp, color: ktextSubColor),
           ),
           trailing: GestureDetector(
@@ -240,13 +241,13 @@ class _blackListPageState extends State<blackListPage> {
     );
   }
 
-  _getText(String name) {
+// _getText(String name) {
-    String name2 = name.substring(0, 1);
+//   String name2 = name.substring(0, 1);
-    for (var i = 0; i < name.length - 1; i++) {
+//   for (var i = 0; i < name.length - 1; i++) {
-      name2 += '*';
+//     name2 += '*';
-    }
+//   }
-    return name2;
+//   return name2;
-  }
+// }
 // _blackList(BlacklistModel model) {
 //   return ListTile(
 //     leading: Container(

lib/ui/community/community_views/widgets/chat_card.dart

@@ -272,11 +272,10 @@ class _ChatCardState extends State<ChatCard> {
                                   .make(),
                               onPressed: () //=> Get.back(result: true),
                                   async {
-                                var isShielding =
+                                //var isShielding =
-                                    await BlackListFunc.Block(widget.model.id);
+                                await BlackListFunc.Block(
-                                if (isShielding) {
+                                    widget.model.createId);
-                                  Get.back();
+                                Get.back();
-                                }
                               },
                             ),
                           ],

pubspec.yaml

@@ -2,7 +2,7 @@ name: aku_new_community
 description: A new Flutter project.
 publish_to: "none"
 
-version: 1.8.17-dev+58
+version: 1.8.18-dev+59
 
 environment:
   sdk: ">=2.17.0 <3.0.0"