From 4ab5ecb0a4fa8ab66647427c4f90db9db302ea3b Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期二, 02 七月 2024 16:05:25 +0800
Subject: [PATCH] 音乐播放时间计算
---
HDL-ON_Android/Properties/AndroidManifest.xml | 2 +-
.vs/Santan-OnPro-Project/xs/UserPrefs.xml | 47 +++++++++++++++++++++++++++--------------------
HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs | 2 +-
3 files changed, 29 insertions(+), 22 deletions(-)
diff --git a/.vs/Santan-OnPro-Project/xs/UserPrefs.xml b/.vs/Santan-OnPro-Project/xs/UserPrefs.xml
index 34fe599..a7432d5 100644
--- a/.vs/Santan-OnPro-Project/xs/UserPrefs.xml
+++ b/.vs/Santan-OnPro-Project/xs/UserPrefs.xml
@@ -1,5 +1,6 @@
锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
- <MonoDevelop.Ide.ItemProperties.APP__IOS Xamarin.HotReload.MonoInterpreterErrorInfoBar.APP__IOS.HideInfoBar="True" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget" />
+ <MonoDevelop.MonoDroid LastDeploySdkVersion="13.2.2.0" />
+ <Xamarin.Addins.Core.Project ActiveDebugTarget="Android.SelectDevice" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore>
<Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/UI/UI2/2-Classification/SeriesFunctionListPage.cs" relfile="HDL_ON/UI/UI2/2-Classification/SeriesFunctionListPage.cs" line="25" column="1" />
@@ -18,9 +19,8 @@
<Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/DAL/Server/HttpServerRequest.cs" relfile="HDL_ON/DAL/Server/HttpServerRequest.cs" line="3472" column="1" />
</BreakpointStore>
</MonoDevelop.Ide.DebuggingService.Breakpoints>
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs">
+ <MonoDevelop.Ide.Workbench>
<Files>
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs" Line="216" Column="7" />
<File FileName="HDL_ON/Common/HDLCommon.cs" />
<File FileName="HDL_ON/DAL/Server/NewAPI.cs" />
<File FileName="HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs" />
@@ -29,7 +29,6 @@
<File FileName="HDL-ON_Android/Other/JPush/JPushOpenClickActivity.cs" />
<File FileName="HDL-ON_Android/Other/JPush/JPushReceiver.cs" />
<File FileName="HDL_ON/Common/ApiUtlis.cs" />
- <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" />
<File FileName="HDL_ON/UI/UI2/4-PersonalCenter/MyQRCodePage.cs" />
<File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs" />
<File FileName="HDL-ON_Android/Scan.cs" />
@@ -48,24 +47,33 @@
<File FileName="HDL_ON/UI/UI2/UserPage.cs" />
<File FileName="HDL_ON/UI/MainPage.cs" />
<File FileName="HDL_ON/UI/UI2/1-HomePage/HomePage.cs" />
- <File FileName="HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs" />
+ <File FileName="HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs" Line="172" Column="58" />
<File FileName="HDL-ON_iOS/Info.plist" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs" Line="468" Column="47" />
<File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Music/SendMethod.cs" />
- <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" />
- <File FileName="HDL_ON/Entity/Function/Function.cs" />
+ <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" Line="1633" Column="39" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Music/SendMethod.cs" Line="54" Column="36" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Music/A31LoveMusicList.cs" Line="1" Column="1" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs" Line="1" Column="1" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs" Line="287" Column="55" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
- <Node name="Santan-OnPro-Project" expanded="True">
- <Node name="HDL_ON" expanded="True">
- <Node name="UI" expanded="True">
- <Node name="UI2" expanded="True">
- <Node name="4-PersonalCenter" expanded="True">
- <Node name="PersonalDataPage.cs" selected="True" />
- </Node>
+ <Node name="Santan-OnPro-Project">
+ <Node name="APP_Android" selected="True" />
+ <Node name="HDL_ON">
+ <Node name="DAL" expanded="True">
+ <Node name="DriverLayer" expanded="True" />
+ </Node>
+ <Node name="Entity" expanded="True">
+ <Node name="Function" expanded="True" />
+ </Node>
+ <Node name="UI">
+ <Node name="UI0-Public" expanded="True" />
+ <Node name="UI1-Login" expanded="True" />
+ <Node name="UI2">
+ <Node name="4-PersonalCenter" expanded="True" />
</Node>
</Node>
</Node>
@@ -74,10 +82,9 @@
</Pad>
</Pads>
</MonoDevelop.Ide.Workbench>
- <MonoDevelop.MonoDroid LastDeploySdkVersion="13.2.2.0" />
- <MonoDevelop.Ide.DebuggingService.PinnedWatches />
<MonoDevelop.Ide.Workspace ActiveConfiguration="Release" />
+ <MonoDevelop.Ide.ItemProperties.APP__IOS Xamarin.HotReload.MonoInterpreterErrorInfoBar.APP__IOS.HideInfoBar="True" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget" />
+ <MonoDevelop.Ide.DebuggingService.PinnedWatches />
+ <MonoDevelop.Ide.ItemProperties.APP__Android Xamarin.HotReload.WrongLinkerErrorInfoBar.APP__Android.HideInfoBar="True" PreferredExecutionTarget="Android.364c4b3158493098" />
<MultiItemStartupConfigurations />
- <MonoDevelop.Ide.ItemProperties.APP__Android Xamarin.HotReload.WrongLinkerErrorInfoBar.APP__Android.HideInfoBar="True" PreferredExecutionTarget="Android.192.168.1.107:5555" />
- <Xamarin.Addins.Core.Project ActiveDebugTarget="Android.SelectDevice" />
</Properties>
\ No newline at end of file
diff --git a/HDL-ON_Android/Properties/AndroidManifest.xml b/HDL-ON_Android/Properties/AndroidManifest.xml
index cd274c5..c655526 100644
--- a/HDL-ON_Android/Properties/AndroidManifest.xml
+++ b/HDL-ON_Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
锘�<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="4.2.2" package="com.santan.smartcontrol" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202407021">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="4.2.2" package="com.santan.smartcontrol" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202407022">
<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="29" />
<uses-permission android:name="android.permission.RECEIVE_SMS" />
<!--绋嬪簭鍙互璇诲彇璁惧澶栭儴瀛樺偍绌洪棿(鍐呯疆SDcard鍜屽缃甋DCard)鐨勬枃浠讹紝鎴戠殑鏂囦欢绛�-->
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);
--
Gitblit v1.8.0