Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	packages/cs_plugin_platform/pubspec.yaml

packages/cpt_community/lib/components/newfeed_card_header.dart

@@ -34,7 +34,7 @@ class NewsFeedCardHeader extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Container(
-      padding: const EdgeInsets.only(left: 16,right: 60,),
+      padding: const EdgeInsets.only(left: 0,right: 10,),
       child: Row(
         mainAxisAlignment: MainAxisAlignment.start,
         crossAxisAlignment: CrossAxisAlignment.start,
@@ -51,8 +51,7 @@ class NewsFeedCardHeader extends StatelessWidget {
           }),
           Expanded(
             child: Container(
-              padding: const EdgeInsets.only(left:15, right: 40),
-              // color: Colors.red,
+              padding: const EdgeInsets.only(left:15, right: 0),
               child: Column(
                 mainAxisAlignment: MainAxisAlignment.start,
                 crossAxisAlignment: CrossAxisAlignment.start,

packages/cpt_community/lib/modules/community/following/following_page.dart

@@ -1,10 +1,12 @@
 import 'package:cs_resources/generated/l10n.dart';
+import 'package:domain/entity/user_me_entity.dart';
 import 'package:flutter/material.dart';
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/rendering.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:plugin_basic/basic_export.dart';
+import 'package:plugin_basic/provider/user_config/user_config_service.dart';
 import 'package:router/ext/auto_router_extensions.dart';
 import 'package:shared/utils/color_utils.dart';
 import 'package:shared/utils/ext_dart.dart';
@@ -91,12 +93,16 @@ class FollowingPage extends HookConsumerWidget {
   }
 
   Widget _buildNewsItem(BuildContext context, WidgetRef ref, Map<String, dynamic> item, vm, int itemIdx){
+    UserMeEntity userInfo = UserConfigService.getState().user as UserMeEntity;
+    int? user_id = int.tryParse(userInfo?.id ?? "");
     String card_title = item.getValue("title", "");
+    int card_id = item.getValue("id", null);
     String card_created_at = item.getValue("created_at", "");
     Map<String, dynamic>? card_account = item.getValue<Map<String,dynamic>>("account", {});
     String card_avatar = card_account?['avatar']?? "";
     String card_count_name = card_account?['name']?? "";
     bool card_followed = card_account?['followed']??false;
+    int card_count_id = card_account?['id']?? null;
     String card_content = item.getValue("content", "");
     List? card_resources = item.getValue<List>("resources", [])?? [];
     bool card_liked = item.getValue("liked", false);
@@ -169,10 +175,10 @@ class FollowingPage extends HookConsumerWidget {
           ),
           // 右上角 关注/取消关注 按钮
           Visibility(
-            visible: card_followed ? false: true,
+            visible: card_count_id != null && card_count_id != user_id,
             child: Positioned(
-                right: 10,
-                top: -5,
+                right: 0,
+                top: 0,
                 child: Container(
                   width: 83.5,
                   height: 45.5,
@@ -182,16 +188,21 @@ class FollowingPage extends HookConsumerWidget {
                   //   borderRadius: BorderRadius.circular(5),
                   // ),
                   child: MyButton(
-                    text: S.current.to_follow,
-                    textColor: Colors.white,
-                    backgroundColor: context.appColors.textPrimary,
+                    text: card_followed ? S.current.followed:S.current.to_follow,
+                    textColor: card_followed ?  context.appColors.disEnableGray: context.appColors.textWhite,
+                    disabledTextColor: context.appColors.disEnableGray,
+                    backgroundColor: card_followed ? Colors.transparent : context.appColors.textPrimary,
+                    side: BorderSide(color: !card_followed ? Colors.transparent : context.appColors.disEnableGray, width: 0.5),
                     radius: 8,
                     minHeight: 27.5,
                     padding: const EdgeInsets.only(left: 5, right: 5,top:9,bottom:9),
                     fontWeight: FontWeight.w400,
                     fontSize: 14,
-                    onPressed: (){
-                      vm.handlerFollow(context, card_followed);
+                    onPressed: () async{
+                      bool asyncResult = await vm.handlerFollow(context,card_count_id, card_id,  card_followed );
+                      // if(asyncResult){
+                      //   // 成功  关注->取消关注  取消关注->关注
+                      // }
                     },
                   ),
                 )

packages/cpt_community/lib/modules/community/following/following_vm.dart

@@ -262,14 +262,36 @@ class FollowingVm extends _$FollowingVm {
         "to_user_id": to_user_id,
       });
       if(result.isSuccess){
-        // 修改cardId 对应的 card item 的 account 里面的 followed
         if(cardId!=null){
+          final idsToRemove = <int>[];
           final listCopyDta = List<Map<String, dynamic>>.from(state.list!);
           listCopyDta!.forEach((carditem) {
-            if(carditem['id'] == cardId){
+            int curCarid_int = carditem['id'] as int;
+            if(curCarid_int == cardId){
+              // 修改cardId 对应的 card item 的 account 里面的 followed
               carditem['account']['followed'] = !carditem['account']['followed'];
+              if(isFollow){
+                Log.d("isFollow---1");
+                // followed -> unfollowed
+                idsToRemove.add(curCarid_int);
+              }
+            }else {
+              int cardItemAccountId_int = carditem['account']['id'] as int;
+              // 判断 该卡片的 accountid  和 to_user_id 是否相等
+              if(cardItemAccountId_int == to_user_id){
+                carditem['account']['followed'] = !carditem['account']['followed'];
+                if(isFollow){
+                  Log.d("isFollow---2");
+                  // followed -> unfollowed
+                  idsToRemove.add(curCarid_int);
+                }
+              }
             }
           });
+          if(idsToRemove.isNotEmpty){
+            // 移除已经关注的用户
+            listCopyDta!.removeWhere((carditem) => idsToRemove.contains(carditem['id']));
+          }
           state = state.copyWith(list: listCopyDta);
         }
         // 同步用户信息

packages/cpt_community/lib/modules/community/foryou/foryou_page.dart

@@ -1,9 +1,11 @@
 import 'package:cs_resources/generated/l10n.dart';
+import 'package:domain/entity/user_me_entity.dart';
 import 'package:flutter/material.dart';
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/rendering.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:plugin_basic/provider/user_config/user_config_service.dart';
 import 'package:router/ext/auto_router_extensions.dart';
 import 'package:shared/utils/color_utils.dart';
 import 'package:shared/utils/ext_dart.dart';
@@ -98,17 +100,22 @@ class ForyouPage extends HookConsumerWidget {
   }
 
   Widget _buildNewsItem(BuildContext context, WidgetRef ref, Map<String, dynamic> item, vm, int itemIdx){
+    UserMeEntity userInfo = UserConfigService.getState().user as UserMeEntity;
+    int? user_id = int.tryParse(userInfo?.id ?? "");
     String card_title = item.getValue("title", "");
+    int card_id = item.getValue("id", null);
     String card_created_at = item.getValue("created_at", "");
-    Map<String, dynamic>? card_account = item.getValue<Map<String,dynamic>>("account", {});
+    Map<String, dynamic>? card_account = item.getValue<Map<String,dynamic>>("account", null);
     String card_avatar = card_account?['avatar']?? "";
     String card_count_name = card_account?['name']?? "";
     bool card_followed = card_account?['followed']??false;
+    int card_count_id = card_account?['id']?? null;
     String card_content = item.getValue("content", "");
     List? card_resources = item.getValue<List>("resources", [])?? [];
     bool card_liked = item.getValue("liked", false);
     int card_likes_count = item.getValue("likes_count", 0);
     int card_comments_count = item.getValue("comments_count", 0);
+
     return Container(
       margin: const EdgeInsets.only(left: 15, right: 15,top: 14,bottom: 0),
       padding: const EdgeInsets.only(left: 15, right: 15,top: 17,bottom: 0),
@@ -176,10 +183,10 @@ class ForyouPage extends HookConsumerWidget {
           ),
           // 右上角 关注/取消关注 按钮
           Visibility(
-            visible: card_followed ? false: true,
+            visible: card_count_id != null && card_count_id != user_id,
             child: Positioned(
-                right: 10,
-                top: -5,
+                right: 0,
+                top: 0,
                 child: Container(
                   width: 83.5,
                   height: 45.5,
@@ -189,16 +196,21 @@ class ForyouPage extends HookConsumerWidget {
                   //   borderRadius: BorderRadius.circular(5),
                   // ),
                   child: MyButton(
-                    text: S.current.to_follow,
-                    textColor: Colors.white,
-                    backgroundColor: context.appColors.textPrimary,
+                    text: card_followed ? S.current.followed:S.current.to_follow,
+                    textColor: card_followed ?  context.appColors.disEnableGray: context.appColors.textWhite,
+                    disabledTextColor: context.appColors.disEnableGray,
+                    backgroundColor: card_followed ? Colors.transparent : context.appColors.textPrimary,
+                    side: BorderSide(color: !card_followed ? Colors.transparent : context.appColors.disEnableGray, width: 0.5),
                     radius: 8,
                     minHeight: 27.5,
                     padding: const EdgeInsets.only(left: 5, right: 5,top:9,bottom:9),
                     fontWeight: FontWeight.w400,
                     fontSize: 14,
-                    onPressed: (){
-                      vm.handlerFollow(context, card_followed);
+                    onPressed: () async{
+                      bool asyncResult = await vm.handlerFollow(context,card_count_id, card_id,  card_followed );
+                      // if(asyncResult){
+                      //   // 成功  关注->取消关注  取消关注->关注
+                      // }
                     },
                   ),
                 )

packages/cpt_community/lib/modules/community/foryou/foryou_vm.dart

@@ -269,8 +269,16 @@ class ForyouVm extends _$ForyouVm {
         if(cardId!=null){
           final listCopyDta = List<Map<String, dynamic>>.from(state.list!);
           listCopyDta!.forEach((carditem) {
-            if(carditem['id'] == cardId){
+            int cardItemId_int = carditem['id'] as int;
+            if(cardItemId_int == cardId){
+              // 修改cardId 对应的 card item 的 account 里面的 followed
               carditem['account']['followed'] = !carditem['account']['followed'];
+            }else {
+              int cardItemAccountId_int = carditem['account']['id'] as int;
+              // 判断 该卡片的 accountid  和 to_user_id 是否相等
+              if(cardItemAccountId_int == to_user_id){
+                carditem['account']['followed'] = !carditem['account']['followed'];
+              }
             }
           });
           state = state.copyWith(list: listCopyDta);

packages/cpt_community/lib/modules/community/news/news_page.dart

@@ -1,11 +1,13 @@
 import 'package:cs_resources/generated/assets.dart';
 import 'package:cs_resources/generated/l10n.dart';
+import 'package:domain/entity/user_me_entity.dart';
 import 'package:extended_nested_scroll_view/extended_nested_scroll_view.dart';
 import 'package:flutter/material.dart';
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/rendering.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:plugin_basic/provider/user_config/user_config_service.dart';
 import 'package:router/ext/auto_router_extensions.dart';
 import 'package:shared/utils/color_utils.dart';
 import 'package:shared/utils/ext_dart.dart';
@@ -103,6 +105,8 @@ class NewsPage extends HookConsumerWidget {
   }
 
   Widget _buildNewsItem(BuildContext context, WidgetRef ref, Map<String, dynamic> item, vm, int itemIdx){
+    UserMeEntity userInfo = UserConfigService.getState().user as UserMeEntity;
+    int? user_id = int.tryParse(userInfo?.id ?? "");
     String card_title = item.getValue("title", "");
     int card_id = item.getValue("id", null);
     String card_created_at = item.getValue("created_at", "");
@@ -141,6 +145,7 @@ class NewsPage extends HookConsumerWidget {
                 children: [
                   // 卡片头部(头像 标题 时间)
                   Container(
+                    width: double.infinity,
                     child: NewsFeedCardHeader(
                       key: UniqueKey(),
                       title: card_count_name,
@@ -184,42 +189,39 @@ class NewsPage extends HookConsumerWidget {
                 ]
             ),
             // 右上角 关注/取消关注 按钮
-            Positioned(
-                right: 10,
-                top: -5,
-                child: Container(
-                  width: 83.5,
-                  height: 50.5,
-                  alignment: Alignment.center,
-                  // decoration: BoxDecoration(
-                  //   color:  context.appColors.textPrimary,
-                  //   borderRadius: BorderRadius.circular(5),
-                  // ),
-                  child: HookBuilder(
-                    builder: (context) {
-                      final isFollowedState = useState<bool>(card_followed);
-                      return MyButton(
-                        text: isFollowedState.value ? S.current.followed:S.current.to_follow,
-                        textColor: isFollowedState.value ?  context.appColors.disEnableGray: context.appColors.textWhite,
-                        disabledTextColor: context.appColors.disEnableGray,
-                        backgroundColor: isFollowedState.value ? Colors.transparent : context.appColors.textPrimary,
-                        side: BorderSide(color: !isFollowedState.value ? Colors.transparent : context.appColors.disEnableGray, width: 0.5),
-                        radius: 8,
-                        minHeight: 27.5,
-                        padding: const EdgeInsets.only(left: 5, right: 5,top:9,bottom:9),
-                        fontWeight: FontWeight.w400,
-                        fontSize: 14,
-                        onPressed: () async{
-                          bool asyncResult = await vm.handlerFollow(context,card_count_id, card_id,  isFollowedState.value );
-                          if(asyncResult){
-                            // 成功  关注->取消关注  取消关注->关注
-                            isFollowedState.value = !isFollowedState.value;
-                          }
-                        },
-                      );
-                    }
-                  ),
-                )
+            Visibility(
+              visible: card_count_id != null  && card_count_id != user_id,
+              child: Positioned(
+                  right: 0,
+                  top: 0,
+                  child: Container(
+                    width: 83.5,
+                    height: 50.5,
+                    alignment: Alignment.center,
+                    // decoration: BoxDecoration(
+                    //   color:  context.appColors.textPrimary,
+                    //   borderRadius: BorderRadius.circular(5),
+                    // ),
+                    child: MyButton(
+                      text: card_followed ? S.current.followed:S.current.to_follow,
+                      textColor: card_followed ?  context.appColors.disEnableGray: context.appColors.textWhite,
+                      disabledTextColor: context.appColors.disEnableGray,
+                      backgroundColor: card_followed ? Colors.transparent : context.appColors.textPrimary,
+                      side: BorderSide(color: !card_followed ? Colors.transparent : context.appColors.disEnableGray, width: 0.5),
+                      radius: 8,
+                      minHeight: 27.5,
+                      padding: const EdgeInsets.only(left: 5, right: 5,top:9,bottom:9),
+                      fontWeight: FontWeight.w400,
+                      fontSize: 14,
+                      onPressed: () async{
+                        bool asyncResult = await vm.handlerFollow(context,card_count_id, card_id,  card_followed );
+                        // if(asyncResult){
+                        //   // 成功  关注->取消关注  取消关注->关注
+                        // }
+                      },
+                    ),
+                  )
+              ),
             )
           ],
         ),

packages/cpt_community/lib/modules/community/news/news_vm.dart

@@ -275,8 +275,16 @@ class NewsVm extends _$NewsVm {
         if(cardId!=null){
           final listCopyDta = List<Map<String, dynamic>>.from(state.list!);
           listCopyDta!.forEach((carditem) {
-            if(carditem['id'] == cardId){
+            int cardItemId_int = carditem['id'] as int;
+            if(cardItemId_int == cardId){
+              // 修改cardId 对应的 card item 的 account 里面的 followed
               carditem['account']['followed'] = !carditem['account']['followed'];
+            }else {
+              int cardItemAccountId_int = carditem['account']['id'] as int;
+              // 判断 该卡片的 accountid  和 to_user_id 是否相等
+              if(cardItemAccountId_int == to_user_id){
+                carditem['account']['followed'] = !carditem['account']['followed'];
+              }
             }
           });
           state = state.copyWith(list: listCopyDta);

packages/cpt_community/lib/modules/community/newsfeed_detail/newsfeed_detail_page.dart

@@ -3,11 +3,13 @@ import 'package:cs_resources/generated/assets.dart';
 import 'package:cs_resources/generated/l10n.dart';
 import 'package:cs_resources/theme/app_colors_theme.dart';
 import 'package:domain/entity/newsfeed_detail_entity.dart';
+import 'package:domain/entity/user_me_entity.dart';
 import 'package:flutter/material.dart';
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:plugin_basic/provider/app_config/app_config.dart';
+import 'package:plugin_basic/provider/user_config/user_config_service.dart';
 import 'package:router/ext/auto_router_extensions.dart';
 import 'package:shared/utils/color_utils.dart';
 import 'package:shared/utils/ext_dart.dart';
@@ -119,6 +121,8 @@ class NewsfeedDetailPage extends HookConsumerWidget {
 
   Widget _buildTopCard(BuildContext context, WidgetRef ref,NewsfeedDetailEntity detailInfo ){
     final vm = ref.read(newsfeedDetailVmProvider.notifier);
+    UserMeEntity userInfo = UserConfigService.getState().user as UserMeEntity;
+    int? user_id = int.tryParse(userInfo?.id ?? "");
     String card_title = "";
     int card_id = detailInfo!.id??0;
     String card_created_at = detailInfo!.createdAt ?? "";
@@ -175,44 +179,45 @@ class NewsfeedDetailPage extends HookConsumerWidget {
           ),
         ),
         // 右上角 关注/取消关注 按钮
-        Positioned(
-            right: 40,
-            top: 35,
-            child: Container(
-              width: 83.5,
-              height: 45.5,
-              alignment: Alignment.center,
-              // decoration: BoxDecoration(
-              //   color:  context.appColors.textPrimary,
-              //   borderRadius: BorderRadius.circular(5),
-              // ),
-              child: HookBuilder(
-                  builder: (context) {
-                    final isFollowedState = useState<bool>(card_followed);
-                    return MyButton(
-                      text: isFollowedState.value ?  S.current.followed:S.current.to_follow,
-                      textColor: isFollowedState.value ?  context.appColors.disEnableGray: context.appColors.textWhite,
-                      disabledTextColor: context.appColors.disEnableGray,
-                      backgroundColor: isFollowedState.value ? Colors.transparent : context.appColors.textPrimary,
-                      side: BorderSide(color: !isFollowedState.value ? Colors.transparent : context.appColors.disEnableGray, width: 0.5),
-                      radius: 8,
-                      minHeight: 27.5,
-                      padding: const EdgeInsets.only(left: 5, right: 5,top:9,bottom:9),
-                      fontWeight: FontWeight.w400,
-                      fontSize: 14,
-                      onPressed: () async{
-                        bool asyncResult = await vm.handlerFollow(context,card_count_id, card_id,  isFollowedState.value );
-                        if(asyncResult){
-                          // 成功  关注->取消关注  取消关注->关注
-                          isFollowedState.value = !isFollowedState.value;
-                          // 修改该item
-
-                        }
-                      },
-                    );
-                  }
-              ),
-            )
+        Visibility(
+          visible: card_count_id != null && card_count_id != user_id,
+          child: Positioned(
+              right: 30,
+              top: 35,
+              child: Container(
+                width: 83.5,
+                height: 45.5,
+                alignment: Alignment.center,
+                // decoration: BoxDecoration(
+                //   color:  context.appColors.textPrimary,
+                //   borderRadius: BorderRadius.circular(5),
+                // ),
+                child: HookBuilder(
+                    builder: (context) {
+                      final isFollowedState = useState<bool>(card_followed);
+                      return MyButton(
+                        text: isFollowedState.value ?  S.current.followed:S.current.to_follow,
+                        textColor: isFollowedState.value ?  context.appColors.disEnableGray: context.appColors.textWhite,
+                        disabledTextColor: context.appColors.disEnableGray,
+                        backgroundColor: isFollowedState.value ? Colors.transparent : context.appColors.textPrimary,
+                        side: BorderSide(color: !isFollowedState.value ? Colors.transparent : context.appColors.disEnableGray, width: 0.5),
+                        radius: 8,
+                        minHeight: 27.5,
+                        padding: const EdgeInsets.only(left: 5, right: 5,top:9,bottom:9),
+                        fontWeight: FontWeight.w400,
+                        fontSize: 14,
+                        onPressed: () async{
+                          bool asyncResult = await vm.handlerFollow(context,card_count_id, card_id,  isFollowedState.value );
+                          if(asyncResult){
+                            // 成功  关注->取消关注  取消关注->关注
+                            isFollowedState.value = !isFollowedState.value;
+                          }
+                        },
+                      );
+                    }
+                ),
+              )
+          ),
         )
       ],
     );

packages/cpt_services/lib/components/chooseVisitTimeTitle_state.dart

@@ -7,13 +7,13 @@ class ChooseVisitTimeTitleState {
     this.currentSelectIndex = 0,
     dayInfoList,
   }): dayInfoList = dayInfoList ?? [
-    DayInfoItem(day: 'Tody', date: '2022-01-01', isSelected: true, isIntrady: true, holiday:false, enable: true),
-    DayInfoItem(day: 'Tomorrow', date: '2022-01-02', isSelected: false, isIntrady: false,holiday:false, enable: true),
-    DayInfoItem(day: 'Wendnesday', date: '2022-01-03', isSelected: false, isIntrady: false,holiday:false, enable: true),
-    DayInfoItem(day: 'Thursdy', date: '2022-01-04', isSelected: false, isIntrady: false,holiday:false, enable: true),
-    DayInfoItem(day: 'Friday', date: '2022-01-05', isSelected: false, isIntrady: false,holiday:false, enable: true),
-    DayInfoItem(day: 'Saturday', date: '2022-01-06', isSelected: false, isIntrady: false,holiday:false, enable: true),
-    DayInfoItem(day: 'Sunday', date: '2022-01-07', isSelected: false, isIntrady: false,holiday:false, enable: true),
+    // DayInfoItem(day: 'Tody', date: '2022-01-01', isSelected: true, isIntrady: true, holiday:false, enable: true),
+    // DayInfoItem(day: 'Tomorrow', date: '2022-01-02', isSelected: false, isIntrady: false,holiday:false, enable: true),
+    // DayInfoItem(day: 'Wendnesday', date: '2022-01-03', isSelected: false, isIntrady: false,holiday:false, enable: true),
+    // DayInfoItem(day: 'Thursdy', date: '2022-01-04', isSelected: false, isIntrady: false,holiday:false, enable: true),
+    // DayInfoItem(day: 'Friday', date: '2022-01-05', isSelected: false, isIntrady: false,holiday:false, enable: true),
+    // DayInfoItem(day: 'Saturday', date: '2022-01-06', isSelected: false, isIntrady: false,holiday:false, enable: true),
+    // DayInfoItem(day: 'Sunday', date: '2022-01-07', isSelected: false, isIntrady: false,holiday:false, enable: true),
   ];
 
   ChooseVisitTimeTitleState copyWith({

packages/cpt_services/lib/components/chooseVisitTimeTitle_vm.dart

@@ -93,6 +93,7 @@ class ChooseVisitTimeTitleVm extends _$ChooseVisitTimeTitleVm {
     List<DayInfoItem> dayInfoListNew = [];
     // 从当前天开始 生成一份最近一个星期的 DayInfoItem
     DateTime now = DateTime.now();
+    // Log.d("当天  $now");
     for(int i = 0; i < _rencentDays; i++){
       DateTime date = now.add(Duration(days: i));
       String day = DateTimeUtils.getWeekday(date, languageCode: 'en');
@@ -106,8 +107,10 @@ class ChooseVisitTimeTitleVm extends _$ChooseVisitTimeTitleVm {
         ..holiday = false
         ..enable = true;
       dayInfoListNew.add(newItem);
+      // Log.d("i=$i, date=$date, weekday=$day");
     }
 
+
     return ChooseVisitTimeTitleState(
       dayInfoList: dayInfoListNew,
     );