| .vs/Santan-OnPro-Project/xs/UserPrefs.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_Android/Properties/AndroidManifest.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_iOS/Info.plist | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/DAL/DriverLayer/Control.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/MainPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI1-Login/LoginPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/2-Classification/RoomPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
.vs/Santan-OnPro-Project/xs/UserPrefs.xml
@@ -1,40 +1,6 @@ <Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default"> <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs"> <Files> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs" Line="1" Column="1" /> <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" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideDoorLockSend.cs" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs" /> <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" /> <File FileName="HDL-ON_iOS/Scan.cs" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/Constant.cs" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockAudioSetupPage.cs" /> <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/UnlockSettingFacePage.cs" /> </Files> <Pads> <Pad Id="ProjectPad"> <State name="__root__"> <Node name="Santan-OnPro-Project" expanded="True"> <Node name="APP_Android" selected="True" /> </Node> </State> </Pad> </Pads> </MonoDevelop.Ide.Workbench> <MonoDevelop.MonoDroid LastDeploySdkVersion="13.2.2.0" /> <Xamarin.Addins.Core.Project ActiveDebugTarget="Android.SelectDevice" /> <MultiItemStartupConfigurations /> <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" /> @@ -53,9 +19,72 @@ <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.DebuggingService.PinnedWatches /> <MonoDevelop.Ide.ItemProperties.APP__IOS Xamarin.HotReload.MonoInterpreterErrorInfoBar.APP__IOS.HideInfoBar="True" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.B7AA04D1-BAF6-4C17-BB5A-55A547855CF8" /> <MonoDevelop.Ide.ItemProperties.APP__Android Xamarin.HotReload.WrongLinkerErrorInfoBar.APP__Android.HideInfoBar="True" PreferredExecutionTarget="Android.SelectDevice" /> <MonoDevelop.MonoDroid LastDeploySdkVersion="13.2.2.0" /> <MonoDevelop.Ide.Workbench> <Files> <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" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideDoorLockSend.cs" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs" /> <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/UI2/4-PersonalCenter/MyQRCodePage.cs" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs" /> <File FileName="HDL-ON_Android/Scan.cs" /> <File FileName="HDL-ON_iOS/Scan.cs" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/Constant.cs" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockAudioSetupPage.cs" /> <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/UnlockSettingFacePage.cs" /> <File FileName="HDL_ON/UI/UI2/2-Classification/RoomPage.cs" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/Electrical/IrLearnPage.cs" /> <File FileName="HDL_ON/Entity/Function/TV.cs" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPageBLL.cs" /> <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" Line="172" Column="58" /> <File FileName="HDL-ON_iOS/Info.plist" /> <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/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"> <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> </Node> </State> </Pad> </Pads> </MonoDevelop.Ide.Workbench> <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 /> </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.0" package="com.santan.smartcontrol" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202406171"> <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_iOS/Info.plist
@@ -11,7 +11,7 @@ <key>CFBundleName</key> <string>想天智控</string> <key>CFBundleShortVersionString</key> <string>4.2.0</string> <string>4.2.2</string> <key>CFBundleURLTypes</key> <array> <dict> @@ -36,7 +36,7 @@ </dict> </array> <key>CFBundleVersion</key> <string>4.2.0</string> <string>4.2.2</string> <key>LSApplicationQueriesSchemes</key> <array> <string>weixinULAPI</string> HDL_ON/DAL/DriverLayer/Control.cs
@@ -1616,7 +1616,18 @@ break; case SPK.AvMusic: case SPK.MusicStandard: //UI.Music.MusicMain.mMusicMain.RefreshView(updateTemp); foreach(var music in UI.Music.A31MusicModel.A31MusicModelList)//每次收到数据都要更新一下时间 { if(music.functionMusic.sid == localFunction.sid) { music.LastDateTime = DateTime.Now; break; } } if (UI.Music.A31MusicModel.Current != null&& UI.Music.A31MusicModel.Current.functionMusic.sid == localFunction.sid) { UI.Music.A31MusicModel.Current.LastDateTime = DateTime.Now; } Console.WriteLine("音乐播放器显示状态=======" + revString); //wjc break; HDL_ON/UI/MainPage.cs
@@ -26,7 +26,7 @@ /// <summary> /// 版本号 /// </summary> public static string VersionString = "4.1.0"; public static string VersionString = "4.2.2"; ///// <summary> ///// 客户端类型 ///// </summary> HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
@@ -168,7 +168,7 @@ break; case SPK.MusicStandard: case SPK.AvMusic: Music.A31MusicModel.Current = new Music.A31MusicModel { functionMusic = function };//当前播放器 Music.A31MusicModel.Current = new Music.A31MusicModel { functionMusic = function, LastDateTime = DateTime.Now };//当前播放器 var a31PlayMusicPage = new Music.A31PlayMusicPage(); MainPage.BasePageView.AddChidren(a31PlayMusicPage); a31PlayMusicPage.Show(); HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -208,8 +208,8 @@ if (b) { //etAccount.Text = "13580507523"; etAccount.Text = "13478265371"; etAccount.Text = "13924245850";//正式账号 etAccount.Text = "18770424153"; //etAccount.Text = "13411390230";//测试账号 } else @@ -219,9 +219,9 @@ } b = !b; etPassword.Text = "123456"; if(etAccount.Text == "wxr@hdlchina.com.cn") if(etAccount.Text == "18770424153") { etPassword.Text = "CQDWYEOV"; etPassword.Text = "h8023h"; }else if(etAccount.Text == "13411390230") { etPassword.Text = "aa123456"; HDL_ON/UI/UI2/2-Classification/RoomPage.cs
@@ -98,55 +98,6 @@ var list = room.GetRoomFunctions(false); foreach (var function in list) { if (MainPage.RoomNotSupportFunctionList.Contains(function.spk)) { continue; } #if DEBUG //throw new ArgumentNullException(); #endif functionListView.AddChidren(new Button() { Height = Application.GetRealHeight(12) }); if (function.spk == SPK.LightRGBW || function.spk == SPK.LightCCT || function.spk == SPK.LightRGB || function.spk == SPK.LightDimming) { var functionDiv = new FunctionControlZone(function, null) { Gravity = Gravity.CenterHorizontal, Width = Application.GetRealWidth(343), Height = Application.GetRealHeight(116), Radius = (uint)Application.GetMinRealAverage(12), BorderColor = 0x00FFFFFF, BorderWidth = 1, BackgroundColor = CSS_Color.MainBackgroundColor, Tag = function.spk + function.sid }; functionDiv.LoadFunctionDiv(); functionListView.AddChidren(functionDiv); } else { var functionDiv = new FunctionControlZone(function, () => { this.ReLoadPage(); //删除设备后重新刷新UI }) { Gravity = Gravity.CenterHorizontal, Width = Application.GetRealWidth(343), Height = Application.GetRealHeight(96), Radius = (uint)Application.GetMinRealAverage(12), BorderColor = 0x00FFFFFF, BorderWidth = 1, BackgroundColor = CSS_Color.MainBackgroundColor, Tag = function.spk + function.sid }; functionDiv.LoadFunctionDiv(); functionListView.AddChidren(functionDiv); } } try { foreach (var scene in room.GetRoomScenes(false)) @@ -174,6 +125,53 @@ { MainPage.Log($"RoomPage LoadPage Error:{ex.Message}"); } foreach (var function in list) { if (MainPage.RoomNotSupportFunctionList.Contains(function.spk)) { continue; } functionListView.AddChidren(new Button() { Height = Application.GetRealHeight(12) }); if (function.spk == SPK.LightRGBW || function.spk == SPK.LightCCT || function.spk == SPK.LightRGB || function.spk == SPK.LightDimming) { var functionDiv = new FunctionControlZone(function, null) { Gravity = Gravity.CenterHorizontal, Width = Application.GetRealWidth(343), Height = Application.GetRealHeight(116), Radius = (uint)Application.GetMinRealAverage(12), BorderColor = 0x00FFFFFF, BorderWidth = 1, BackgroundColor = CSS_Color.MainBackgroundColor, Tag = function.spk + function.sid }; functionDiv.LoadFunctionDiv(); functionListView.AddChidren(functionDiv); } else { var functionDiv = new FunctionControlZone(function, () => { this.ReLoadPage(); //删除设备后重新刷新UI }) { Gravity = Gravity.CenterHorizontal, Width = Application.GetRealWidth(343), Height = Application.GetRealHeight(96), Radius = (uint)Application.GetMinRealAverage(12), BorderColor = 0x00FFFFFF, BorderWidth = 1, BackgroundColor = CSS_Color.MainBackgroundColor, Tag = function.spk + function.sid }; functionDiv.LoadFunctionDiv(); functionListView.AddChidren(functionDiv); } } }
@@ -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);
