sky/app-starlock
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop_sky_liyi' into 'develop_sky'

Browse Source 
Develop sky liyi

See merge request StarlockTeam/app-starlock!256
This commit is contained in:
李仪 2025-08-22 05:36:56 +00:00
commit 52f3ce64a4
3 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
lib/main/lockDetail/lockSet/catEyeSet/catEyeCustomMode/catEyeCustomMode_page.dart
View File

@ -89,27 +89,27 @@ class _CatEyeCustomModePageState extends State<CatEyeCustomModePage> {
SizedBox(
height: 30.h,
),
Container(
margin: EdgeInsets.only(left: 20.w),
child: CommonItem(
leftTitel: '实时画面'.tr,
rightTitle: state.realTimeMode.value,
isHaveLine: false,
isHaveDirection: true,
isHaveRightWidget: false,
action: () {
Navigator.pushNamed(context, Routers.liveVideoPage,
arguments: {
'lockSetInfoData': state.lockSetInfoData.value,
'catEyeConfigData': state.lockSetInfoData.value
.lockSettingInfo!.catEyeConfig!.isNotEmpty
? state.lockSetInfoData.value.lockSettingInfo!
.catEyeConfig![0]
: null
});
},
),
)
// Container(
// margin: EdgeInsets.only(left: 20.w),
// child: CommonItem(
// leftTitel: '实时画面'.tr,
// rightTitle: state.realTimeMode.value,
// isHaveLine: false,
// isHaveDirection: true,
// isHaveRightWidget: false,
// action: () {
// Navigator.pushNamed(context, Routers.liveVideoPage,
// arguments: {
// 'lockSetInfoData': state.lockSetInfoData.value,
// 'catEyeConfigData': state.lockSetInfoData.value
// .lockSettingInfo!.catEyeConfig!.isNotEmpty
// ? state.lockSetInfoData.value.lockSettingInfo!
// .catEyeConfig![0]
// : null
// });
// },
// ),
// )
],
),
),

12
lib/main/lockDetail/lockSet/catEyeSet/catEyeSet/catEyeSet_page.dart
View File

@ -80,12 +80,12 @@ class _CatEyeSetPageState extends State<CatEyeSetPage> {
isHaveRightWidget: true,
rightWidget: _otherToDoSwitch(2),
)),
Obx(() => CommonItem(
leftTitel: '异常警告'.tr,
rightTitle: '',
isHaveLine: true,
isHaveRightWidget: true,
rightWidget: _otherToDoSwitch(3))),
// Obx(() => CommonItem(
// leftTitel: '异常警告'.tr,
// rightTitle: '',
// isHaveLine: true,
// isHaveRightWidget: true,
// rightWidget: _otherToDoSwitch(3))),
//ToDo 需增加国际化
CommonItem(
leftTitel: '呼叫目标'.tr,

2
lib/talk/starChart/views/native/talk_view_native_decode_logic.dart
View File

@ -815,7 +815,7 @@ class TalkViewNativeDecodeLogic extends BaseGetXController {
return result;
}
static const int chunkSize = 320; // 每次发送320字节（10ms G.711）
static const int intervalMs = 40; // 每40ms发送一次（4个chunk）
static const int intervalMs = 35; // 每40ms发送一次（4个chunk）
void _sendAudioChunk(Timer timer) async {
if (_bufferedAudioFrames.length < chunkSize) {
// 数据不足，等待下一周期