From e3e956525b00d046d344807b1207207429f27027 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期五, 12 七月 2024 14:19:21 +0800
Subject: [PATCH] 音乐计时，
---
HDL_ON/DAL/Server/HttpUtil.cs | 4 ++--
HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs | 2 +-
HDL_ON/Common/AliyunLog/AliyunLogClient.cs | 1 +
SiriIntents/Server/HttpUtil.cs | 4 ++--
4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/Common/AliyunLog/AliyunLogClient.cs b/HDL_ON/Common/AliyunLog/AliyunLogClient.cs
index 3d5bda7..02c0336 100644
--- a/HDL_ON/Common/AliyunLog/AliyunLogClient.cs
+++ b/HDL_ON/Common/AliyunLog/AliyunLogClient.cs
@@ -131,6 +131,7 @@
{"homeid", Entity.DB_ResidenceData.Instance.CurrentRegion.id},
{"userid", UserInfo.Current.ID},
{"userName", UserInfo.Current.userName},
+ {"server", DAL.Server.HttpUtil.GlobalRequestHttpsHost},
{"message", msg},
}
}
diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index 262fad1..8cadb5d 100644
--- a/HDL_ON/DAL/Server/HttpUtil.cs
+++ b/HDL_ON/DAL/Server/HttpUtil.cs
@@ -24,8 +24,8 @@
//public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
- //const string APP_KEY = "HDL-HOME-APP-TEST";
- //const string SECRET_KEY = "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss";
+ //public const string APP_KEY = "HDL-HOME-APP-TEST";
+ //public const string SECRET_KEY = "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss";
//public const string GlobalRequestHttpsHost = "http://59.41.255.150:7777";//mmmm
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs
index f932a84..7a30610 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs
@@ -465,7 +465,7 @@
if (A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.on_off) == ValueProperty.on)
{
//闊充箰鍦ㄦ挱鏀炬椂锛屽啀璁＄畻鎾斁鏃堕棿(鐜板湪鏃堕棿=鍘熸潵鏃堕棿+1绉�)
- playSecond += (int)(DateTime.Now - A31MusicModel.Current.LastDateTime).TotalSeconds;
+ //playSecond += (int)(DateTime.Now - A31MusicModel.Current.LastDateTime).TotalSeconds;
playSecond += 1;//琛ㄧず鍔犱笂绛夊緟鐨勬椂闂�1s
///姝屾洸璁板綍鏆傛椂鏃堕棿鍐欏叆缂撳瓨锛�
A31MusicModel.Current.functionMusic.SetAttrState(KeyProperty.playing_time, playSecond);
diff --git a/SiriIntents/Server/HttpUtil.cs b/SiriIntents/Server/HttpUtil.cs
index 0dd2620..6abba29 100644
--- a/SiriIntents/Server/HttpUtil.cs
+++ b/SiriIntents/Server/HttpUtil.cs
@@ -22,8 +22,8 @@
//public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
- //const string APP_KEY = "HDL-HOME-APP-TEST";
- //const string SECRET_KEY = "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss";
+ //public const string APP_KEY = "HDL-HOME-APP-TEST";
+ //public const string SECRET_KEY = "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss";
//public const string GlobalRequestHttpsHost = "http://59.41.255.150:7777";//mmmm
--
Gitblit v1.8.0