替换logo，增加登录失效跳转

circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,122 +1,122 @@
 {
-  "images" : [
+    "images": [
         {
-      "size" : "20x20",
+            "size": "20x20",
-      "idiom" : "iphone",
+            "idiom": "iphone",
-      "filename" : "Icon-App-20x20@2x.png",
+            "filename": "icon-20@2x.png",
-      "scale" : "2x"
+            "scale": "2x"
         },
         {
-      "size" : "20x20",
+            "size": "20x20",
-      "idiom" : "iphone",
+            "idiom": "iphone",
-      "filename" : "Icon-App-20x20@3x.png",
+            "filename": "icon-20@3x.png",
-      "scale" : "3x"
+            "scale": "3x"
         },
         {
-      "size" : "29x29",
+            "size": "29x29",
-      "idiom" : "iphone",
+            "idiom": "iphone",
-      "filename" : "Icon-App-29x29@1x.png",
+            "filename": "icon-29.png",
-      "scale" : "1x"
+            "scale": "1x"
         },
         {
-      "size" : "29x29",
+            "size": "29x29",
-      "idiom" : "iphone",
+            "idiom": "iphone",
-      "filename" : "Icon-App-29x29@2x.png",
+            "filename": "icon-29@2x.png",
-      "scale" : "2x"
+            "scale": "2x"
         },
         {
-      "size" : "29x29",
+            "size": "29x29",
-      "idiom" : "iphone",
+            "idiom": "iphone",
-      "filename" : "Icon-App-29x29@3x.png",
+            "filename": "icon-29@3x.png",
-      "scale" : "3x"
+            "scale": "3x"
         },
         {
-      "size" : "40x40",
+            "size": "40x40",
-      "idiom" : "iphone",
+            "idiom": "iphone",
-      "filename" : "Icon-App-40x40@2x.png",
+            "filename": "icon-40@2x.png",
-      "scale" : "2x"
+            "scale": "2x"
         },
         {
-      "size" : "40x40",
+            "size": "40x40",
-      "idiom" : "iphone",
+            "idiom": "iphone",
-      "filename" : "Icon-App-40x40@3x.png",
+            "filename": "icon-40@3x.png",
-      "scale" : "3x"
+            "scale": "3x"
         },
         {
-      "size" : "60x60",
+            "size": "60x60",
-      "idiom" : "iphone",
+            "idiom": "iphone",
-      "filename" : "Icon-App-60x60@2x.png",
+            "filename": "icon-60@2x.png",
-      "scale" : "2x"
+            "scale": "2x"
         },
         {
-      "size" : "60x60",
+            "size": "60x60",
-      "idiom" : "iphone",
+            "idiom": "iphone",
-      "filename" : "Icon-App-60x60@3x.png",
+            "filename": "icon-60@3x.png",
-      "scale" : "3x"
+            "scale": "3x"
         },
         {
-      "size" : "20x20",
+            "size": "20x20",
-      "idiom" : "ipad",
+            "idiom": "ipad",
-      "filename" : "Icon-App-20x20@1x.png",
+            "filename": "icon-20-ipad.png",
-      "scale" : "1x"
+            "scale": "1x"
         },
         {
-      "size" : "20x20",
+            "size": "20x20",
-      "idiom" : "ipad",
+            "idiom": "ipad",
-      "filename" : "Icon-App-20x20@2x.png",
+            "filename": "icon-20@2x-ipad.png",
-      "scale" : "2x"
+            "scale": "2x"
         },
         {
-      "size" : "29x29",
+            "size": "29x29",
-      "idiom" : "ipad",
+            "idiom": "ipad",
-      "filename" : "Icon-App-29x29@1x.png",
+            "filename": "icon-29-ipad.png",
-      "scale" : "1x"
+            "scale": "1x"
         },
         {
-      "size" : "29x29",
+            "size": "29x29",
-      "idiom" : "ipad",
+            "idiom": "ipad",
-      "filename" : "Icon-App-29x29@2x.png",
+            "filename": "icon-29@2x-ipad.png",
-      "scale" : "2x"
+            "scale": "2x"
         },
         {
-      "size" : "40x40",
+            "size": "40x40",
-      "idiom" : "ipad",
+            "idiom": "ipad",
-      "filename" : "Icon-App-40x40@1x.png",
+            "filename": "icon-40.png",
-      "scale" : "1x"
+            "scale": "1x"
         },
         {
-      "size" : "40x40",
+            "size": "40x40",
-      "idiom" : "ipad",
+            "idiom": "ipad",
-      "filename" : "Icon-App-40x40@2x.png",
+            "filename": "icon-40@2x.png",
-      "scale" : "2x"
+            "scale": "2x"
         },
         {
-      "size" : "76x76",
+            "size": "76x76",
-      "idiom" : "ipad",
+            "idiom": "ipad",
-      "filename" : "Icon-App-76x76@1x.png",
+            "filename": "icon-76.png",
-      "scale" : "1x"
+            "scale": "1x"
         },
         {
-      "size" : "76x76",
+            "size": "76x76",
-      "idiom" : "ipad",
+            "idiom": "ipad",
-      "filename" : "Icon-App-76x76@2x.png",
+            "filename": "icon-76@2x.png",
-      "scale" : "2x"
+            "scale": "2x"
         },
         {
-      "size" : "83.5x83.5",
+            "size": "83.5x83.5",
-      "idiom" : "ipad",
+            "idiom": "ipad",
-      "filename" : "Icon-App-83.5x83.5@2x.png",
+            "filename": "icon-83.5@2x.png",
-      "scale" : "2x"
+            "scale": "2x"
         },
         {
-      "size" : "1024x1024",
+            "size": "1024x1024",
-      "idiom" : "ios-marketing",
+            "idiom": "ios-marketing",
-      "filename" : "Icon-App-1024x1024@1x.png",
+            "filename": "icon-1024.png",
-      "scale" : "1x"
+            "scale": "1x"
         }
     ],
-  "info" : {
+    "info": {
-    "version" : 1,
+        "version": 1,
-    "author" : "xcode"
+        "author": "icon.wuruihong.com"
     }
 }

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

@@ -619,7 +619,6 @@ class _TIMTextFieldLayoutNarrowState
                   Container(
                     height: 40.sp,
                     width: Get.width,
-                    // color: Colors.red,
                     child: Row(
                       mainAxisAlignment: MainAxisAlignment.spaceAround,
                       children: [

circle_app/lib/app/circle/view.dart

@@ -379,17 +379,7 @@ class CirclePage extends StatelessWidget {
                       getCircleImage('circle_line'),
                       width: Get.width,
                     )),
-                Positioned(
+
-                    bottom: 56.sp,
-                    right: 0.sp,
-                    child: GestureDetector(
-                        onTap: () {
-                          Get.toNamed(AppRoutes.Call_out);
-                        },
-                        child: Image.asset(
-                          getCircleImage('send_msg'),
-                          width: 60.sp,
-                        )))
               ],
             )));
   }

circle_app/lib/app/home/view.dart

@@ -53,8 +53,8 @@ class HomePage extends StatelessWidget {
             body: controller.tabs[controller.currentIndex],
           ),
           Positioned(
-              bottom: 56.sp,
+              bottom: Get.bottomBarHeight + 36.sp,
-              right: 0.sp,
+              right: 10.sp,
               child: GestureDetector(
                   onTap: () {
                     Get.toNamed(AppRoutes.Call_out);

circle_app/lib/network/dio_manager.dart

@@ -1,6 +1,7 @@
 import 'dart:convert';
 import 'dart:io';
 
+import 'package:circle_app/util/util.dart';
 import 'package:dio/dio.dart';
 
 import '../util/device.dart';
@@ -171,6 +172,9 @@ class DioManager {
       // json转model
       String jsonStr = json.encode(response.data);
       Map<String, dynamic> responseMap = json.decode(jsonStr);
+      if (responseMap["code"] == 5003) {
+        pushLoginPage();
+      }
       return responseMap;
     } on DioException catch (e) {
       // // DioError是指返回值不为200的情况

circle_app/lib/util/util.dart

@@ -1,9 +1,12 @@
 import 'dart:ui';
 
 import 'package:circle_app/common/values/values.dart';
+import 'package:circle_app/router/app_routers.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
+import 'package:get/get.dart';
+import 'package:get/get_state_manager/get_state_manager.dart';
 
 class Util {
 
@@ -97,3 +100,6 @@ String convertToTenThousand(int number) {
     return number.toString();
   }
 }
+pushLoginPage() {
+  Get.offAllNamed(AppRoutes.Login);
+}