1.4.2代码提交

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 33
+        versionCode 34
-        versionName "1.4.1"
+        versionName "1.4.2"
         manifestPlaceholders = [
                 vivo_APPID: "105669716",
                 vivo_APPKEY:"84f750207787376b310ca5b0d5969122",

circle_app/ios/Runner.xcodeproj/project.pbxproj

@@ -381,7 +381,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.4.1;
+				MARKETING_VERSION = 1.4.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.example.circleapp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -530,7 +530,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.4.1;
+				MARKETING_VERSION = 1.4.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.example.circleapp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -573,7 +573,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.4.1;
+				MARKETING_VERSION = 1.4.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.example.circleapp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";

circle_app/lib/app/chat/TIMUIKitChat/TIMUIKitTextField/tim_uikit_text_field_layout/narrow.dart

@@ -43,6 +43,7 @@ import 'package:video_thumbnail/video_thumbnail.dart';
 import '../../../../../common/Widgets/unlock_wx_tip.dart';
 import '../../../../../util/eventBus.dart';
 import '../../../../call_out/logic.dart';
+import '../../../../home/logic.dart';
 import '../../../../userinfo/logic.dart';
 import '../../../view.dart';
 import '../../../widget/chat_circle_share_dialog.dart';
@@ -166,6 +167,7 @@ class TIMTextFieldLayoutNarrow extends StatefulWidget {
 
 class _TIMTextFieldLayoutNarrowState
     extends TIMUIKitState<TIMTextFieldLayoutNarrow> {
+  HomeLogic logic = Get.find<HomeLogic>();
   final TUISettingModel settingModel = serviceLocator<TUISettingModel>();
   final ImagePicker _picker = ImagePicker();
 
@@ -870,7 +872,7 @@ class _TIMTextFieldLayoutNarrowState
                             isScrollControlled: true,
                             enableDrag: false);
                       }),
-                      if (userInfoBean != null)
+                      if (userInfoBean != null && logic.isProd)
                         userInfoBean!.wx_num.isNotEmpty ? chatWxActionWidget() : chatWantWxActionWidget()
                     ],
                   ),

circle_app/lib/app/circle/widgets/discover.dart

@@ -22,6 +22,7 @@ import 'package:intl/intl.dart';
 import 'package:pull_to_refresh/pull_to_refresh.dart';
 import '../../../../util/eventBus.dart';
 import '../../chat/widget/chat_gift_pannel.dart';
+import '../../home/logic.dart';
 
 const String todayAddWxStatus = 'todayAddWxStatus';
 
@@ -40,6 +41,7 @@ class _DiscoverState extends State<Discover>
   // TODO: add state variables and methods
   ScrollController _scrollController = ScrollController();
   RefreshController refreshController = RefreshController();
+  HomeLogic logic = Get.find<HomeLogic>();
   var refreshSignSub;
   var sub;
   var sub1;
@@ -433,7 +435,7 @@ class _DiscoverState extends State<Discover>
                                               ],
                                             ),
                                           ),
-                                        if (user.both_interests!.isNotEmpty)
+                                        if (user.both_cities!.isNotEmpty)
                                           SizedBox(
                                             height: 8.sp,
                                           ),
@@ -554,6 +556,7 @@ class _DiscoverState extends State<Discover>
                                       ),
                                     ),
                                   )),
+
                               Positioned(
                                   left: 6.sp,
                                   bottom: 6.sp,
@@ -564,7 +567,7 @@ class _DiscoverState extends State<Discover>
                                       crossAxisAlignment:
                                           CrossAxisAlignment.start,
                                       children: [
-                                        if (user.wxNum != null)
+                                        if (user.wxNum != null && logic.isProd)
                                           wxStatusWidget(
                                               user.unLockWxNum == 1,
                                               user.wxNum!,

circle_app/lib/app/home/logic.dart

@@ -62,6 +62,8 @@ class HomeLogic extends GetxController with WidgetsBindingObserver {
   bool isUpdateVersion  = false;
 
 
+  bool isProd = true;
+
   String accountId = '';
   @override
   void onClose() {
@@ -78,6 +80,7 @@ class HomeLogic extends GetxController with WidgetsBindingObserver {
   void onInit() async {
     super.onInit();
     unreadSIze.value = '0';
+    loadEnvTypeData();
     // 设置网络变化监听
     connectListener();
     getIMData();
@@ -456,6 +459,14 @@ class HomeLogic extends GetxController with WidgetsBindingObserver {
     }});
   }
 
+  void loadEnvTypeData() async {
+    var data = await DioManager.instance.get(url: Api.getAppEnv);
+    if (data['code'] == 200) {
+      isProd = data['data'] == 0;
+      update();
+    }
+  }
+
 
 
 }

circle_app/lib/app/userinfo/view.dart

@@ -16,6 +16,7 @@ import '../../components/my_app_bar.dart';
 import '../../router/app_routers.dart';
 import '../../util/eventBus.dart';
 import '../../util/util.dart';
+import '../home/logic.dart';
 import '../select_circle/logic.dart';
 import 'logic.dart';
 
@@ -114,6 +115,8 @@ class MyTabbedScreenState extends State<UserinfoPage>
   final logic = Get.find<UserinfoLogic>();
   final state = Get.find<UserinfoLogic>().state;
 
+  HomeLogic homeLogic = Get.find<HomeLogic>();
+
   @override
   Widget build(BuildContext context) {
     return GetBuilder<UserinfoLogic>(
@@ -133,7 +136,7 @@ class MyTabbedScreenState extends State<UserinfoPage>
       ),
       child: Scaffold(
         backgroundColor: Colors.transparent,
-        appBar: MyAppBar(
+        appBar: homeLogic.isProd ? MyAppBar(
             centerTitle: logic.userInfoBean != null
                 ? "${logic.userInfoBean!.nickname}"
                 : "个人主页",
@@ -248,7 +251,11 @@ class MyTabbedScreenState extends State<UserinfoPage>
                   )
               ],
             ),
-                ) : Container() : Container()),
+                ) : Container() : Container()) :  MyAppBar(
+            centerTitle: logic.userInfoBean != null
+                ? "${logic.userInfoBean!.nickname}"
+                : "个人主页",
+           ),
         body: Stack(
           // fit: StackFit.expand,
           children: [

circle_app/lib/network/api.dart

@@ -327,5 +327,9 @@ class Api {
   //获取系列活动详细信息
   static const getActivityDetail = '/msg-service/activity/series/detail/';
 
+  //查询当前版本环境
+  static const getAppEnv = '/user-service/app/env';
+
+
 
 }

circle_app/lib/network/dio_manager.dart

@@ -42,9 +42,9 @@ class DioManager {
       // baseUrl2
       baseUrl:
 
-      Api.baseUrl,
+      // Api.baseUrl,
 
-      // type == 1 ?  Api.baseUrl2 : Api.baseUrl1,
+      type == 1 ?  Api.baseUrl2 : Api.baseUrl1,
       // 连接服务器超时时间，单位是毫秒
       connectTimeout: const Duration(seconds: 30),
       // 接收数据的最长时限