Merge branch 'develop_sky' into 'canary_release_sky'

Develop sky

See merge request StarlockTeam/app-starlock!259

lan/lan_hk.json

@@ -1162,5 +1162,9 @@
     "锁语音包设置": "鎖語音包設定",
     "（中国台湾）": "（中国台湾）",
     "男声": "男聲",
-    "女声": "女聲"
+    "女声": "女聲",
+    "您的图像和视频数据仅保留": "您的圖像和視頻數據僅保留",
+    "后图像和视频数据将会失效，开通": "后圖像和視頻數據將會失效，開通",
+    "云存会员": "雲存會員",
+    "服务，图像视频信息随心存！": "服務，圖像視頻資訊隨心存！"
 }

lan/lan_keys.json

@@ -1172,5 +1172,9 @@
   "语音包设置": "语音包设置",
   "（中国台湾）": "（中国台湾）",
   "男声": "男声",
-  "女声": "女声"
+  "女声": "女声",
+  "您的图像和视频数据仅保留": "您的图像和视频数据仅保留",
+  "后图像和视频数据将会失效，开通": "后图像和视频数据将会失效，开通",
+  "云存会员": "云存会员",
+  "服务，图像视频信息随心存！": "服务，图像视频信息随心存！"
 }

lan/lan_pt_br.json

@@ -1166,5 +1166,9 @@
     "语音包设置": "Configurações do pacote de voz",
     "（中国台湾）": "（中国台湾）",
     "男声": "Macho",
-    "女声": "Garota"
+    "女声": "Garota",
+    "您的图像和视频数据仅保留": "Seus dados de imagem e vídeo são retidos apenas",
+    "后图像和视频数据将会失效，开通": "Depois disso, os dados de imagem e vídeo serão inválidos e ativados",
+    "云存会员": "Associação de armazenamento em nuvem",
+    "服务，图像视频信息随心存！": "Informações de serviço, imagem e vídeo estão no seu coração!"
 }

lan/lan_sr_cyrl.json

@@ -1161,5 +1161,9 @@
     "锁语音包设置": "Закључајте подешавања говорног пакета",
     "（中国台湾）": "（中国台湾）",
     "男声": "мушки глас",
-    "女声": "женски глас"
+    "女声": "женски глас",
+    "您的图像和视频数据仅保留": "Ваши подаци о слици и видео записима се задржавају само",
+    "后图像和视频数据将会失效，开通": "Након тога, сликовни и видео подаци ће бити неважећи и активирани",
+    "云存会员": "Чланство у облаку за складиштење",
+    "服务，图像视频信息随心存！": "Сервис , слике и видео информације су у вашем срцу!"
 }

lan/lan_tw.json

@@ -1161,5 +1161,9 @@
     "锁语音包设置": "鎖語音包設定",
     "（中国台湾）": "（中国台湾）",
     "男声": "男聲",
-    "女声": "女聲"
+    "女声": "女聲",
+    "您的图像和视频数据仅保留": "您的圖像和視頻數據僅保留",
+    "后图像和视频数据将会失效，开通": "后圖像和視頻數據將會失效，開通",
+    "云存会员": "雲存會員",
+    "服务，图像视频信息随心存！": "服務，圖像視頻資訊隨心存！"
 }

lan/lan_zh.json

@@ -63,7 +63,6 @@
   "授权管理员拥有操作这把锁的重要权限，请确保只发给我你信任的人": "授权管理员拥有操作这把锁的重要权限，请确保只发给我你信任的人",
   "功能开启后，你将可以通过网关远程开锁。此功能的开启和关闭只能在锁附近通过手机蓝牙进行。": "功能开启后，你将可以通过网关远程开锁。此功能的开启和关闭只能在锁附近通过手机蓝牙进行。",
   "此功能的开启和关闭只能在锁附近通过手机蓝牙进行": "此功能的开启和关闭只能在锁附近通过手机蓝牙进行",
-
   "功能开启后，你将可以通过网关远程开锁。": "功能开启后，你将可以通过网关远程开锁。",
   "排列方式": "排列方式",
   "早到榜": "早到榜",
@@ -1102,7 +1101,7 @@
   "支持的国家": "支持的国家",
   "支持的国家值": "美国、加拿大、英国、澳大利亚、印度、德国、法国、意大利、西班牙、日本",
   "操作流程": "操作流程",
-  "操作流程值":"1 用智能锁APP添加锁和网关\n\n2 在APP里开启锁的远程开锁功能（这个功能默认是关闭的）。如果没有这个选项，则锁不支持Alexa \n\n3 在Alexa中添加Skill，并用智能锁APP的账号和密码进行授权。授权成功后就可以发现账号下的设备\n\n4 在Alexa app里找到锁，开启语音开锁的功能，并设置语言密码\n\n5 可以通过Alexa操作锁了",
+  "操作流程值": "1 用智能锁APP添加锁和网关\n\n2 在APP里开启锁的远程开锁功能（这个功能默认是关闭的）。如果没有这个选项，则锁不支持Alexa \n\n3 在Alexa中添加Skill，并用智能锁APP的账号和密码进行授权。授权成功后就可以发现账号下的设备\n\n4 在Alexa app里找到锁，开启语音开锁的功能，并设置语言密码\n\n5 可以通过Alexa操作锁了",
   "Google Home": "Google Home",
   "Action name": "Action name",
   "ScienerSmart": "ScienerSmart",
@@ -1174,5 +1173,9 @@
   "语音包设置": "语音包设置",
   "（中国台湾）": "（中国台湾）",
   "男声": "男声",
-  "女声": "女声"
+  "女声": "女声",
-}
+  "您的图像和视频数据仅保留": "您的图像和视频数据仅保留",
+  "后图像和视频数据将会失效，开通": "后图像和视频数据将会失效，开通",
+  "云存会员": "云存会员",
+  "服务，图像视频信息随心存！": "服务，图像视频信息随心存！"
+}

lib/main/lockDetail/doorLockLog/doorLockLog_entity.dart

@@ -125,4 +125,9 @@ class DoorLockLogDataItem {
     data['recordDetailStr'] = recordDetailStr;
     return data;
   }
+
+  @override
+  String toString() {
+    return 'DoorLockLogDataItem{recordId: $recordId, lockId: $lockId, lockAlias: $lockAlias, recordType: $recordType, recordTypeName: $recordTypeName, username: $username, operateDate: $operateDate, imagesUrl: $imagesUrl, videoUrl: $videoUrl, headUrl: $headUrl, userid: $userid, keyboardPwd: $keyboardPwd, recordStr: $recordStr, recordDetailStr: $recordDetailStr}';
+  }
 }

lib/main/lockDetail/doorLockLog/doorLockLog_logic.dart

@@ -3,12 +3,15 @@ import 'dart:async';
 import 'package:flutter_blue_plus/flutter_blue_plus.dart';
 import 'package:get/get.dart';
 import 'package:star_lock/apm/apm_helper.dart';
+import 'package:star_lock/appRouters.dart';
 import 'package:star_lock/app_settings/app_settings.dart';
+import 'package:star_lock/common/XSConstantMacro/XSConstantMacro.dart';
 import 'package:star_lock/main/lockDetail/doorLockLog/date_time_extensions.dart';
 
 import 'package:star_lock/main/lockDetail/doorLockLog/doorLockLog_entity.dart';
 import 'package:star_lock/main/lockDetail/doorLockLog/doorLockLog_state.dart';
 import 'package:star_lock/main/lockDetail/lockOperatingRecord/lockOperatingRecordGetLastRecordTime_entity.dart';
+import 'package:star_lock/mine/valueAddedServices/advancedFeaturesWeb/advancedFeaturesWeb_entity.dart';
 import 'package:star_lock/tools/commonDataManage.dart';
 import 'package:star_lock/tools/dateTool.dart';
 import 'package:star_lock/tools/eventBusEventManage.dart';
@@ -402,7 +405,20 @@ class DoorLockLogLogic extends BaseGetXController {
   void refreshWeek() {
     _setWeekRange();
   }
-
+  getWebPlayUrl() async {
+    final AdvancedFeaturesWebEntity entity =
+    await ApiRepository.to.getServicePackageBuyUrl();
+    if (entity.errorCode!.codeIsSuccessful) {
+      state.cloudStorageWebViewUrl.value = entity.data!.cloudStorage!;
+      final uploadReportBuyRequest = await ApiRepository.to
+          .uploadReportBuyRequest(lockId: state.keyInfos.value.lockId!);
+      if (uploadReportBuyRequest.errorCode!.codeIsSuccessful) {
+        Get.toNamed(Routers.advancedFeaturesWebPage, arguments: <String, int>{
+          'webBuyType': XSConstantMacro.webBuyTypeCloudStorage,
+        });
+      }
+    }
+  }
   @override
   Future<void> onClose() async {
     super.onClose();

lib/main/lockDetail/doorLockLog/doorLockLog_page.dart

@@ -1,4 +1,5 @@
 import 'package:flustars/flustars.dart';
+import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
@@ -284,6 +285,17 @@ class _DoorLockLogPageState extends State<DoorLockLogPage> with RouteAware {
     return formatter.format(dateTime);
   }
 
+  bool _checkIsVideoOrImagesType(DoorLockLogDataItem item) {
+    final recordType = item.recordType;
+    switch (recordType) {
+      case 130:
+      case 220:
+        return true;
+      default:
+        return false;
+    }
+  }
+
   String _buildIDByType(DoorLockLogDataItem item) {
     final recordType = item.recordType;
     switch (recordType) {
@@ -407,6 +419,14 @@ class _DoorLockLogPageState extends State<DoorLockLogPage> with RouteAware {
       itemCount: state.lockLogItemList.length,
       contentsBuilder: (BuildContext context, int index) {
         final DoorLockLogDataItem timelineData = state.lockLogItemList[index];
+        // 👇 提前计算第一个有 videoUrl 的索引（可以在 build 外层计算一次，避免重复）
+        int? firstVideoIndex = state.lockLogItemList
+            .indexWhere((item) => _checkIsVideoOrImagesType(item));
+        bool isInvalid = _checkIsVideoOrImagesType(timelineData) &&
+            ((timelineData.imagesUrl == null &&
+                    timelineData.videoUrl == null) ||
+                (timelineData.videoUrl == '' && timelineData.imagesUrl == ''));
+        AppLog.log('isInvalid:${isInvalid}');
         return GestureDetector(
           onTap: () {
             Get.toNamed(
@@ -428,17 +448,33 @@ class _DoorLockLogPageState extends State<DoorLockLogPage> with RouteAware {
                 // 使用 SingleChildScrollView 实现横向滚动
                 SingleChildScrollView(
                   scrollDirection: Axis.horizontal, // 横向滚动
-                  child: Text(
+                  child: RichText(
-                    _buildIDByType(timelineData),
                     textAlign: TextAlign.left,
-                    style: TextStyle(
+                    text: TextSpan(
-                      color: _buildTextColorByType(timelineData),
+                      style: TextStyle(
-                      fontSize: 24.sp,
+                        color: _buildTextColorByType(timelineData),
-                      fontWeight: FontWeight.w600,
+                        fontSize: 24.sp,
+                        fontWeight: FontWeight.w600,
+                      ),
+                      children: [
+                        TextSpan(
+                          text: _buildIDByType(timelineData) +
+                              (isInvalid ? '（' + '已失效'.tr + '）' : ''),
+                        ),
+                        WidgetSpan(
+                          alignment: PlaceholderAlignment.middle,
+                          child: Visibility(
+                            visible: isInvalid,
+                            child: Icon(
+                              Icons.error,
+                              size: 24.sp,
+                              color: Colors.red,
+                            ),
+                          ),
+                        ),
+                      ],
                     ),
-                    // 关键：禁用换行，强制单行显示
                     maxLines: 1,
-                    // 可选：添加省略号（如果文本过长）
                     overflow: TextOverflow.ellipsis,
                   ),
                 ),
@@ -455,8 +491,71 @@ class _DoorLockLogPageState extends State<DoorLockLogPage> with RouteAware {
                   ),
                 ),
                 SizedBox(
-                  height: 20.h,
+                  height: 12.h,
                 ),
+                Visibility(
+                  visible: _checkIsVideoOrImagesType(timelineData) &&
+                      index == firstVideoIndex,
+                  child: GestureDetector(
+                    onTap: () async {
+                      await logic.getWebPlayUrl();
+                    },
+                    child: Container(
+                      padding: EdgeInsets.all(8.w),
+                      decoration: BoxDecoration(
+                        borderRadius: BorderRadius.all(Radius.circular(8.r)),
+                      ),
+                      child: RichText(
+                        textAlign: TextAlign.center,
+                        text: TextSpan(
+                          children: [
+                            // 普通文字部分
+                            TextSpan(
+                              text:
+                                  '${'您的图像和视频数据仅保留'.tr} ${state.rollingStorageDays.value} ${'天'.tr} ,${state.rollingStorageDays.value} ${'天'.tr} ${'后图像和视频数据将会失效，开通'.tr}',
+                              style: TextStyle(
+                                color: Colors.grey,
+                                fontSize: 16.sp,
+                                fontWeight: FontWeight.w600,
+                                height: 1.8,
+                              ),
+                            ),
+                            // 🔥 高亮且可点击的“云存会员”文本
+                            TextSpan(
+                              text: '云存会员'.tr,
+                              style: TextStyle(
+                                color: AppColors.mainColor,
+                                fontSize: 22.sp,
+                                fontWeight: FontWeight.w800,
+                                // 更粗
+                                decoration: TextDecoration.underline,
+                                decorationThickness: 1.5,
+                                height: 1.8,
+                              ),
+                              recognizer: TapGestureRecognizer()
+                                ..onTap = () async {
+                                  // 👉 点击回调：跳转或弹窗
+                                  print('点击了“云存会员”');
+                                  await logic.getWebPlayUrl();
+                                  // 例如：Navigator.push(context, MaterialPageRoute(builder: ...));
+                                },
+                            ),
+                            // 后续文字
+                            TextSpan(
+                              text: '服务，图像视频信息随心存！'.tr,
+                              style: TextStyle(
+                                color: Colors.grey,
+                                fontSize: 16.sp,
+                                fontWeight: FontWeight.w600,
+                                height: 1.8,
+                              ),
+                            ),
+                          ],
+                        ),
+                      ),
+                    ),
+                  ),
+                )
               ],
             ),
           ),

lib/main/lockDetail/doorLockLog/doorLockLog_state.dart

@@ -1,4 +1,5 @@
 import 'package:get/get.dart';
+import 'package:get/get_rx/get_rx.dart';
 import 'package:star_lock/common/XSConstantMacro/XSConstantMacro.dart';
 import 'package:star_lock/main/lockDetail/doorLockLog/doorLockLog_entity.dart';
 import 'package:star_lock/tools/advancedCalendar/src/controller.dart';
@@ -73,4 +74,6 @@ class DoorLockLogState {
   int logCountPage = 10; // 蓝牙记录一页多少个
   Rx<DateTime> currentSelectDate = DateTime.now().obs;
   bool isLockReceiveResponse = false; // 是否收到回复
+  RxString cloudStorageWebViewUrl = ''.obs;
+  RxInt rollingStorageDays = 3.obs; //滚动存储日期
 }

lib/main/lockDetail/lockSet/catEyeSet/catEyeSet/catEyeSet_logic.dart

@@ -2,6 +2,7 @@ import 'dart:async';
 
 import 'package:flutter_blue_plus/flutter_blue_plus.dart';
 import 'package:get/get.dart';
+import 'package:star_lock/app_settings/app_settings.dart';
 import 'package:star_lock/blue/blue_manage.dart';
 import 'package:star_lock/blue/io_protocol/io_setSupportFunctionsWithParameters.dart';
 import 'package:star_lock/blue/io_reply.dart';
@@ -82,30 +83,31 @@ class CatEyeSetLogic extends BaseGetXController {
         //成功
         cancelBlueConnetctToastTimer();
         dismissEasyLoading();
+        AppLog.log('state.settingOptions.value:${state.settingOptions.value}');
         switch (state.settingOptions.value) {
           case 1: //自动亮屏
             {
-              updateAutoLightScreenConfig();
+              await updateAutoLightScreenConfig();
             }
             break;
           case 2: //逗留警告
             {
-              updateStayWarnConfig();
+              await updateStayWarnConfig();
             }
             break;
           case 3: //异常警告
             {
-              updateAbnormalWarnConfig();
+              await updateAbnormalWarnConfig();
             }
             break;
           case 4: //设置亮屏持续时间
             {
-              updateLightScreenTimeConfig();
+              await updateLightScreenTimeConfig();
             }
             break;
           case 5: //修改猫眼工作模式
             {
-              updateCatEyeModeConfig();
+              await updateCatEyeModeConfig();
             }
             break;
           default:
@@ -288,6 +290,7 @@ class CatEyeSetLogic extends BaseGetXController {
           .catEyeConfig![0]
           .catEyeModeConfig
           ?.realTimeMode = state.catEyeConfig.value.realTimeMode;
+
       eventBus
           .fire(PassCurrentLockInformationEvent(state.lockSetInfoData.value));
     }
@@ -456,6 +459,10 @@ class CatEyeSetLogic extends BaseGetXController {
   }
 
   void sendBlueMessage() {
+    showEasyLoading();
+    showBlueConnetctToastTimer(action: () {
+      dismissEasyLoading();
+    });
     final message = _buildCatEyeSetBlueMessage();
     BlueManage().blueSendData(BlueManage().connectDeviceName,
         (BluetoothConnectionState connectionState) async {

lib/talk/starChart/views/native/talk_view_native_decode_logic.dart

@@ -104,10 +104,10 @@ class TalkViewNativeDecodeLogic extends BaseGetXController {
         codecType: 'h264',
       );
       // 初始化解码器并获取textureId
-      AppLog.log('StartChartManage().videoWidth:${StartChartManage()
+      AppLog.log(
-          .videoWidth}');
+          'StartChartManage().videoWidth:${StartChartManage().videoWidth}');
-      AppLog.log('StartChartManage().videoHeight:${StartChartManage()
+      AppLog.log(
-          .videoHeight}');
+          'StartChartManage().videoHeight:${StartChartManage().videoHeight}');
       final textureId = await VideoDecodePlugin.initDecoder(config);
       if (textureId != null) {
         Future.microtask(() => state.textureId.value = textureId);
@@ -746,7 +746,6 @@ class TalkViewNativeDecodeLogic extends BaseGetXController {
 
   //开始录音
   Future<void> startProcessingAudio() async {
-
     try {
       if (await state.voiceProcessor?.hasRecordAudioPermission() ?? false) {
         await state.voiceProcessor?.start(state.frameLength, state.sampleRate);
@@ -793,27 +792,13 @@ class TalkViewNativeDecodeLogic extends BaseGetXController {
 
 // 添加音频增益处理方法
   List<int> _applyGain(List<int> pcmData, double gainFactor) {
-    List<int> result = List<int>.filled(pcmData.length, 0);
+    return pcmData.map((sample) {
-
+      // 增益并裁剪
-    for (int i = 0; i < pcmData.length; i++) {
+      int amplified = (sample * gainFactor).round();
-      // PCM数据通常是有符号的16位整数
+      return amplified.clamp(-32768, 32767);
-      int sample = pcmData[i];
+    }).toList();
-
-      // 应用增益
-      double amplified = sample * gainFactor;
-
-      // 限制在有效范围内，防止溢出
-      if (amplified > 32767) {
-        amplified = 32767;
-      } else if (amplified < -32768) {
-        amplified = -32768;
-      }
-
-      result[i] = amplified.toInt();
-    }
-
-    return result;
   }
+
   static const int chunkSize = 320; // 每次发送320字节（10ms G.711）
   static const int intervalMs = 35; // 每40ms发送一次（4个chunk）
   void _sendAudioChunk(Timer timer) async {
@@ -849,10 +834,11 @@ class TalkViewNativeDecodeLogic extends BaseGetXController {
     List<int> encodedData = G711Tool.encode(applyGain, 0); // 0表示A-law
     _bufferedAudioFrames.addAll(encodedData);
 
-
     // 启动定时发送器（仅启动一次）
-    if (_startProcessingAudioTimer == null && _bufferedAudioFrames.length > chunkSize) {
+    if (_startProcessingAudioTimer == null &&
-      _startProcessingAudioTimer = Timer.periodic(Duration(milliseconds: intervalMs), _sendAudioChunk);
+        _bufferedAudioFrames.length > chunkSize) {
+      _startProcessingAudioTimer =
+          Timer.periodic(Duration(milliseconds: intervalMs), _sendAudioChunk);
     }
   }