Преглед изворни кода

Merge branch 'v1.3.0' of http://git.atmob.com:28999/Atmob-Flutter/Clean into v1.3.0

# Conflicts:
#	lib/module/home/home_view.dart
Destiny пре 9 месеци
родитељ
комит
a16222c9db

BIN
assets/images/bg_photo_analyze.webp


+ 3 - 3
lib/module/home/home_controller.dart

@@ -85,7 +85,7 @@ class HomeController extends BaseController {
   List<PieData> get pieDataList => [
         PieData("PhotoSpace", photoSpacePercentage, Colors.blue),
         PieData("OtherUsed", usedSpacePercentage - photoSpacePercentage, Colors.red),
-        PieData("Unused", freeSpacePercentage, Colors.grey.withOpacity(0.1)),
+        PieData("totalSpace", totalSpace.value, Colors.grey.withOpacity(0.1)),
       ];
 
   @override
@@ -98,10 +98,10 @@ class HomeController extends BaseController {
       // 延迟3秒
       Future.delayed(const Duration(seconds: 3), () {
         isStorageScanned.value = true;
-        totalSpace.value = 100.0;
+        totalSpace.value = 200.0;
         usedSpace.value = 50.0;
         photoSpace.value = 30.0;
-        freeSpace.value = 50.0;
+        freeSpace.value = 0.0;
       });
 
     }

+ 3 - 1
lib/module/home/home_view.dart

@@ -650,7 +650,9 @@ class HomePage extends BaseView<HomeController> {
           children: [
             _buildCard(
               'Screenshots',
-              !controller.isScreenShotScanned.value ? 'Scanning...' : 'Clean up',
+              !controller.isScreenShotScanned.value
+                  ? 'Scanning...'
+                  : 'Clean up',
               ImagePickerUtil.formatFileSize(
                   ImagePickerUtil.screenshotsSize.value),
               controller.screenshotPhoto.value == null

+ 3 - 1
lib/module/photo_info/photo_info_view.dart

@@ -78,8 +78,10 @@ class PhotoInfoPage extends BasePage<PhotoInfoController> {
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
                       Container(
+                        width:double.infinity,
                         decoration: BoxDecoration(
-                          color: Colors.black.withValues(alpha: 0.10), // 半透明黑色遮罩
+                          image: DecorationImage(image:
+                              Assets.images.bgPhotoAnalyze.provider(),fit: BoxFit.fill),
                           borderRadius: BorderRadius.circular(12.r),
                         ),
                         margin: EdgeInsets.only(left: 18.w),