11

lib/app/common/constants.dart

@@ -8,4 +8,4 @@ const KLogout = "/api/client/v2/logout";
 const KAuthUser = "/api/client/v2/authUser";
 const kNode = '';
 
-const kVersion = '2.0.0';
+const kVersion = '1.1.0';

lib/app/controller/dialog.dart

@@ -28,7 +28,7 @@ class DialogController extends GetxController {
             child: Text(cancelText),
           ),
           TextButton(
-            onPressed: () => validator?.call() == false ? null : Get.back(result: true),
+            onPressed: () => Get.back(result: true),
             child: Text(enterText),
           ),
         ],

lib/app/modules/welcome/controllers/welcome_controller.dart

@@ -32,6 +32,7 @@ class WelcomeController extends GetxController {
 
 
     } catch (e) {
+      isLoading.value = false;
       msgStatus.value = "获取系统配置错误";
       controllers.global.handleApiError(e);
       error.value = controllers.global.errorMsg.value;
@@ -56,16 +57,20 @@ class WelcomeController extends GetxController {
           msgStatus.value = "有更新...";
           isUPdateVerion.value = true;
         } else {
+          isUPdateVerion.value = false;
           await fetchSysConfig();
         }
+      }else{
+        isUPdateVerion.value = false;
+        await fetchSysConfig();
       }
-
-
     } catch (e) {
+      isUPdateVerion.value = false;
       msgStatus.value = "获取版本数据失败";
-      controllers.global.handleApiError(e);
-      error.value = controllers.global.errorMsg.value;
-      controllers.global.errorMsg.value = ''; // Clear the error message immediately
+      await fetchSysConfig();
+      // controllers.global.handleApiError(e);
+      // error.value = controllers.global.errorMsg.value;
+      // controllers.global.errorMsg.value = ''; // Clear the error message immediately
 
     } finally {
       isLoading.value = false;

lib/app/modules/welcome/views/welcome_view.dart

@@ -3,6 +3,7 @@ import 'dart:ffi';
 import 'package:flutter/material.dart';
 
 import 'package:get/get.dart';
+import 'package:naiyouwl/app/component/sys_app_bar.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 import '../../../controller/controllers.dart';
@@ -13,66 +14,76 @@ class WelcomeView extends GetView<WelcomeController> {
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
-      backgroundColor: Colors.white,
-      body: Obx(() {
-        if(controller.error.value.isNotEmpty) {
-          String mess = controller.error.value;
-          controller.error.value = '';
-          Future.delayed(Duration.zero, () async {
-            bool? result = await controllers.dialog.showNormalDialog(
-              title: "提示",
-              content: mess,
-              cancelText: "取消",
-              enterText: "确认",
-            );
-            if (result != null && result) {
-              // User pressed "确认"
-              await controller.fetchSysConfig();
-            } else {
+    return Container(
+      decoration: const BoxDecoration(
+        image: DecorationImage(
+          image: AssetImage("assets/images/main/qidong.png"),
+          fit: BoxFit.fill,
+        ),
+      ),
+      child: Scaffold(
+        backgroundColor: Colors.transparent,
+        appBar: const SysAppBar(title: Text("启动"),),
+        body: Obx(() {
+          if(controller.error.value.isNotEmpty) {
+            String mess = controller.error.value;
+            controller.error.value = '';
+            Future.delayed(Duration.zero, () async {
+              bool? result = await controllers.dialog.showNormalDialog(
+                title: "提示",
+                content: mess,
+                cancelText: "取消",
+                enterText: "确认",
+              );
+              if (result != null && result) {
+                // User pressed "确认"
+                await controller.fetchSysConfig();
+              } else {
+
+              }
+            });
+          }
+          if(controller.isUPdateVerion.value == true){
+            controller.isUPdateVerion.value = false;
+            Future.delayed(Duration.zero, () async {
+              bool? result = await controllers.dialog.showNormalDialog(
+                title: "提示",
+                content: controller.verModes.value.appmsg ?? "有更新",
+                cancelText: "取消",
+                enterText: "确认",
+              );
+              if (result != null && result) {
+                // User pressed "确认"
+                if(controller.verModes.value.appdownload != null){
+                  await launchUrl(Uri.parse(controller.verModes.value.appdownload ?? ""));
+                }
 
-            }
-          });
-        }
-        if(controller.isUPdateVerion.value){
-          controller.isUPdateVerion.value = false;
-          Future.delayed(Duration.zero, () async {
-            bool? result = await controllers.dialog.showNormalDialog(
-              title: "提示",
-              content: controller.verModes.value.appmsg ?? "有更新",
-              cancelText: "取消",
-              enterText: "确认",
-            );
-            if (result != null && result) {
-              // User pressed "确认"
-              if(controller.verModes.value.appdownload != null){
-                await launchUrl(Uri.parse(controller.verModes.value.appdownload ?? ""));
+              } else {
                 await controller.fetchSysConfig();
               }
+            });
+          }
+          return Center(
+            child: Column(
 
-            } else {
-              await controller.fetchSysConfig();
-            }
-          });
-        }
-        return Center(
-          child: Column(
-            mainAxisAlignment: MainAxisAlignment.center,
-            children: <Widget>[
-             controller.isLoading.value == true ? const CircularProgressIndicator() : Container(), // 菊花加载指示器
-              const SizedBox(height: 20), // 用于给加载指示器和文字之间增加一些空间
-              Text(
-                controller.msgStatus.value,
-                style: const TextStyle(
-                  fontSize: 16,
-                  fontWeight: FontWeight.w600,
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: <Widget>[
+                const SizedBox(height: 500),
+               controller.isLoading.value == true ? const CircularProgressIndicator() : Container(), // 菊花加载指示器
+                const SizedBox(height: 10),// 用于给加载指示器和文字之间增加一些空间
+                Text(
+                  controller.msgStatus.value,
+                  style: const TextStyle(
+                    fontSize: 16,
+                    fontWeight: FontWeight.w600,
+                  ),
                 ),
-              ),
-            ],
-          ), // 当不在加载时，你可能想要显示其他的 Widget
-        );
+              ],
+            ), // 当不在加载时，你可能想要显示其他的 Widget
+          );
 
-      }),
+        }),
+      ),
     );
   }
 }