wxr
2024-07-02 4ab5ecb0a4fa8ab66647427c4f90db9db302ea3b
音乐播放时间计算
3个文件已修改
51 ■■■■■ 已修改文件
.vs/Santan-OnPro-Project/xs/UserPrefs.xml 47 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Properties/AndroidManifest.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
.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>
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和外置SDCard)的文件,我的文件等-->
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);