From d372be171daa84ceaf5c286de7d8ee71188dcbfc Mon Sep 17 00:00:00 2001
From: CYH <13923927013@163.com>
Date: Tue, 19 Dec 2023 11:38:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=89=E5=8D=93=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BDapK=E8=B6=85=E6=97=B6=E9=97=AE=E9=A2=98=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BDUI=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/chat/widget/chat_msg_invent_wish_item.dart    |  2 +-
 circle_app/lib/app/dialog/UpdateDialog.dart           |  8 +++++---
 circle_app/lib/network/dio_manager.dart               | 11 +++++++++++
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/circle_app/lib/app/chat/widget/chat_msg_invent_wish_item.dart b/circle_app/lib/app/chat/widget/chat_msg_invent_wish_item.dart
index 808f006..12e9270 100644
--- a/circle_app/lib/app/chat/widget/chat_msg_invent_wish_item.dart
+++ b/circle_app/lib/app/chat/widget/chat_msg_invent_wish_item.dart
@@ -21,7 +21,7 @@ class ChatMsgInventWishItem extends StatelessWidget {
     return GestureDetector(
       onTap: () {
         if (!(message.isSelf ?? false)) {
-          showGiftPannel(giftData['id'].toString());
+          // showGiftPannel(giftData['id'].toString());
         }
       },
       child: Container(
diff --git a/circle_app/lib/app/dialog/UpdateDialog.dart b/circle_app/lib/app/dialog/UpdateDialog.dart
index ecd9b01..4cada6a 100644
--- a/circle_app/lib/app/dialog/UpdateDialog.dart
+++ b/circle_app/lib/app/dialog/UpdateDialog.dart
@@ -42,7 +42,7 @@ class _CustomDialogState extends State<UpdateDialog> {
       child: Dialog(
         backgroundColor: Colors.transparent,
         child: Container(
-          height: 317.sp,
+          height: 317.sp + (isShowWeb ? 40.sp : 0),
           padding: const EdgeInsets.all(1.0),
           child: Stack(
             children: [
@@ -115,7 +115,7 @@ class _CustomDialogState extends State<UpdateDialog> {
                             child: Column(
                               children: [
                                 Container(
-                                  margin: EdgeInsets.only(top: 4.sp),
+                                  margin: EdgeInsets.only(top: 10.sp),
                                   child: CircularProgressIndicator(
                                     value: myProgress,
                                     backgroundColor: Colors.grey,
@@ -138,7 +138,7 @@ class _CustomDialogState extends State<UpdateDialog> {
                                     }
                                   },
                                   child:isShowWeb? Container(
-                                    margin: EdgeInsets.only(top: 4.sp),
+                                    margin: EdgeInsets.only(top: 10.sp),
                                     child: Text(
                                       "下载太慢？试试游览器下载吧。",
                                       style: TextStyle(
@@ -247,6 +247,7 @@ class _CustomDialogState extends State<UpdateDialog> {
     //SmartDialog.showLoading();
     var filePath = await getApplicationSupportDirectoryPath();
     filePath = filePath + "leyuan.apk";
+    DioManager.instance.setReceiveTimeout(300);
     var data = await DioManager.instance
         .download(downloadUrl, filePath, (received, total) {
           double progress = received / total * 100;
@@ -260,6 +261,7 @@ class _CustomDialogState extends State<UpdateDialog> {
           //  SmartDialog.dismiss();
           print(error);
         });
+    DioManager.instance.setReceiveTimeout(30);
      await AppInstaller.installApk(filePath, actionRequired: false);
   }
 }
diff --git a/circle_app/lib/network/dio_manager.dart b/circle_app/lib/network/dio_manager.dart
index 2ee7edc..368971c 100644
--- a/circle_app/lib/network/dio_manager.dart
+++ b/circle_app/lib/network/dio_manager.dart
@@ -52,6 +52,17 @@ class DioManager {
     // _dio!.interceptors.add(ConnectivityInterceptor());
   }
 
+  setReceiveTimeout (int time) {
+    _dio!.options = BaseOptions(
+      // 请求基地址
+      baseUrl: baseUrl,
+      // 连接服务器超时时间，单位是毫秒
+      connectTimeout: const Duration(seconds: 30),
+      // 接收数据的最长时限
+      receiveTimeout: Duration(seconds: time),
+    );
+  }
+
   Future download(String urlPath, String savePath,
       ProgressCallback progressCallback) async {
     return await _dio!