diff --git a/circle_app/android/app/build.gradle b/circle_app/android/app/build.gradle index ef04bda..b7e1b21 100644 --- a/circle_app/android/app/build.gradle +++ b/circle_app/android/app/build.gradle @@ -71,8 +71,8 @@ android { // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. minSdkVersion 21 targetSdkVersion flutter.targetSdkVersion - versionCode 31 - versionName "1.3.9" + versionCode 32 + versionName "1.4.0" manifestPlaceholders = [ vivo_APPID: "105669716", vivo_APPKEY:"84f750207787376b310ca5b0d5969122", diff --git a/circle_app/lib/app/chat/TIMUIKitChat/TIMUIKitTextField/tim_uikit_text_field.dart b/circle_app/lib/app/chat/TIMUIKitChat/TIMUIKitTextField/tim_uikit_text_field.dart index 4b1bdfe..81f78ca 100644 --- a/circle_app/lib/app/chat/TIMUIKitChat/TIMUIKitTextField/tim_uikit_text_field.dart +++ b/circle_app/lib/app/chat/TIMUIKitChat/TIMUIKitTextField/tim_uikit_text_field.dart @@ -461,6 +461,7 @@ class _InputTextFieldState extends TIMUIKitState { bool isOK = await checkImStatus(); if (!isOK) { + isSending = false; return; } diff --git a/circle_app/lib/app/chat/TIMUIKitChat/TIMUIKitTextField/tim_uikit_text_field_layout/narrow.dart b/circle_app/lib/app/chat/TIMUIKitChat/TIMUIKitTextField/tim_uikit_text_field_layout/narrow.dart index 638e3f3..a71a257 100644 --- a/circle_app/lib/app/chat/TIMUIKitChat/TIMUIKitTextField/tim_uikit_text_field_layout/narrow.dart +++ b/circle_app/lib/app/chat/TIMUIKitChat/TIMUIKitTextField/tim_uikit_text_field_layout/narrow.dart @@ -503,62 +503,11 @@ class _TIMTextFieldLayoutNarrowState constraints: const BoxConstraints(minHeight: 30), child: Row( children: [ - // if (widget.forbiddenText != null) - // Expanded( - // child: Container( - // height: 35, - // color: theme.weakBackgroundColor, - // alignment: Alignment.center, - // child: Text( - // TIM_t(widget.forbiddenText!), - // textAlign: TextAlign.center, - // style: TextStyle( - // fontWeight: FontWeight.bold, - // fontSize: 16, - // color: theme.weakTextColor, - // ), - // ), - // )), - // if (PlatformUtils().isMobile && - // widget.showSendAudio && - // widget.forbiddenText == null) - // InkWell( - // onTap: () async { - // showKeyboard = showSendSoundText; - // if (showSendSoundText) { - // widget.focusNode.requestFocus(); - // } - // if (await Permissions.checkPermission( - // context, - // Permission.microphone.value, - // theme, - // )) { - // setState(() { - // showEmojiPanel = false; - // showMore = false; - // showSendSoundText = !showSendSoundText; - // }); - // } - // }, - // child: SvgPicture.asset( - // showSendSoundText - // ? 'images/keyboard.svg' - // : 'images/voice.svg', - // package: 'tencent_cloud_chat_uikit', - // color: const Color.fromRGBO(68, 68, 68, 1), - // height: 28, - // width: 28, - // ), - // ), - // if (widget.forbiddenText == null) - // const SizedBox( - // width: 10, - // ), GestureDetector( onTap: () async { if (isBlack) { showOKToast("您已将对方拉黑，请移除黑名单后在发送消息~"); - _showReportDialog(context); + _showIsCancelBlackDialog(context); return; } showKeyboard = showSendSoundText; @@ -786,7 +735,7 @@ class _TIMTextFieldLayoutNarrowState onTap: () { if (isBlack) { showOKToast("您已将对方拉黑，请移除黑名单后在发送消息~"); - _showReportDialog(context); + _showIsCancelBlackDialog(context); return; } getImageFile(); @@ -798,7 +747,7 @@ class _TIMTextFieldLayoutNarrowState onTap: () { if (isBlack) { showOKToast("您已将对方拉黑，请移除黑名单后在发送消息~"); - _showReportDialog(context); + _showIsCancelBlackDialog(context); return; } getTakeImageFile(); @@ -810,7 +759,7 @@ class _TIMTextFieldLayoutNarrowState onTap: () async { if (isBlack) { showOKToast("您已将对方拉黑，请移除黑名单后在发送消息~"); - _showReportDialog(context); + _showIsCancelBlackDialog(context); return; } showGiftPannel(); @@ -824,8 +773,7 @@ class _TIMTextFieldLayoutNarrowState onTap: () { if (isBlack) { showOKToast("您已将对方拉黑，请移除黑名单后在发送消息~"); - _showReportDialog(context); - _showReportDialog(context); + _showIsCancelBlackDialog(context); return; } getVideoFile(ImageSource.gallery); @@ -837,7 +785,7 @@ class _TIMTextFieldLayoutNarrowState onTap: () { if (isBlack) { showOKToast("您已将对方拉黑，请移除黑名单后在发送消息~"); - _showReportDialog(context); + _showIsCancelBlackDialog(context); return; } getVideoFile(ImageSource.camera); @@ -1357,7 +1305,7 @@ class _TIMTextFieldLayoutNarrowState // } } - void _showReportDialog(BuildContext context) { + void _showIsCancelBlackDialog(BuildContext context) { showDialog( context: context, builder: (BuildContext context) { diff --git a/circle_app/lib/app/home/logic.dart b/circle_app/lib/app/home/logic.dart index a99dec8..e9ad1ec 100644 --- a/circle_app/lib/app/home/logic.dart +++ b/circle_app/lib/app/home/logic.dart @@ -270,9 +270,6 @@ class HomeLogic extends GetxController with WidgetsBindingObserver { if (getTotalUnreadMessageCountRes.data.toString() != unreadSIze.value) { unreadSIze.value = getTotalUnreadMessageCountRes.data.toString(); } - - - } } catch (e) {} diff --git a/circle_app/lib/app/msg/TIMUIKitConversation/tim_uikit_conversation_item.dart b/circle_app/lib/app/msg/TIMUIKitConversation/tim_uikit_conversation_item.dart index 8b43e1b..40d889d 100644 --- a/circle_app/lib/app/msg/TIMUIKitConversation/tim_uikit_conversation_item.dart +++ b/circle_app/lib/app/msg/TIMUIKitConversation/tim_uikit_conversation_item.dart @@ -216,7 +216,6 @@ class TIMConversationItem extends TIMUIKitStatelessWidget { mainAxisAlignment: MainAxisAlignment.center, children: [ Row( - // mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ Text( nickName, @@ -232,12 +231,12 @@ class TIMConversationItem extends TIMUIKitStatelessWidget { ), ), if (isOfficial) Container( - margin: EdgeInsets.only(left: 5.sp,bottom: 5.sp), - height: 16.sp, + margin: EdgeInsets.only(left: 5.sp,bottom: 5.sp,top: 5.sp), + height: 18.sp, width: 32.sp, alignment: Alignment.center, decoration: BoxDecoration( - borderRadius: BorderRadius.circular(8.sp), + borderRadius: BorderRadius.circular(9.sp), gradient: LinearGradient( colors: [Color(0xFF08FAFB),Color(0xFFE243FE)] ) diff --git a/circle_app/lib/network/api.dart b/circle_app/lib/network/api.dart index 0a53898..61ee404 100644 --- a/circle_app/lib/network/api.dart +++ b/circle_app/lib/network/api.dart @@ -1,10 +1,10 @@ class Api { - // static const baseUrl = 'https://leyuan666.com/zuul-service/'; + static const baseUrl = 'https://leyuan666.com/zuul-service/'; - static const baseUrl = 'http://192.168.3.55:2000/'; + // static const baseUrl = 'http://192.168.3.55:2000/'; // 获取验证码