From b822232f0743d22e5bd3847eb993894bf090b214 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期二, 02 七月 2024 15:33:48 +0800
Subject: [PATCH] 备份
---
HDL-ON_Android/Properties/AndroidManifest.xml | 2
HDL-ON_iOS/Info.plist | 4
HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs | 2
.vs/Santan-OnPro-Project/xs/UserPrefs.xml | 72 +++++++++++------
HDL_ON/UI/UI2/2-Classification/RoomPage.cs | 96 +++++++++++------------
HDL_ON/DAL/DriverLayer/Control.cs | 13 +++
HDL_ON/UI/MainPage.cs | 2
HDL_ON/UI/UI1-Login/LoginPage.cs | 6
8 files changed, 114 insertions(+), 83 deletions(-)
diff --git a/.vs/Santan-OnPro-Project/xs/UserPrefs.xml b/.vs/Santan-OnPro-Project/xs/UserPrefs.xml
index 003fb0e..34fe599 100644
--- a/.vs/Santan-OnPro-Project/xs/UserPrefs.xml
+++ b/.vs/Santan-OnPro-Project/xs/UserPrefs.xml
@@ -1,7 +1,26 @@
锘�<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.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" />
+ <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/UI/UI0-Public/Widget/WebViewDialog.cs" relfile="HDL_ON/UI/UI0-Public/Widget/WebViewDialog.cs" line="117" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/UI/UI1-Login/LoginPageBLL.cs" relfile="HDL_ON/UI/UI1-Login/LoginPageBLL.cs" line="100" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs" line="549" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs" line="565" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPage.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPage.cs" line="167" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/DAL/Server/HttpServerRequest.cs" relfile="HDL_ON/DAL/Server/HttpServerRequest.cs" line="350" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs" line="85" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/Common/HDLCommon.cs" relfile="HDL_ON/Common/HDLCommon.cs" line="610" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/DAL/Server/HttpServerRequest.cs" relfile="HDL_ON/DAL/Server/HttpServerRequest.cs" line="3558" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/Common/HDLCommon.cs" relfile="HDL_ON/Common/HDLCommon.cs" line="729" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/UnlockSettingPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/UnlockSettingPage.cs" line="607" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/DAL/Server/HttpServerRequest.cs" relfile="HDL_ON/DAL/Server/HttpServerRequest.cs" line="3442" column="1" />
+ <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">
<Files>
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs" Line="1" Column="1" />
+ <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" />
@@ -22,40 +41,43 @@
<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" />
+ <File FileName="HDL-ON_iOS/Info.plist" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs" />
+ <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" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="Santan-OnPro-Project" expanded="True">
- <Node name="APP_Android" selected="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>
+ </Node>
+ </Node>
</Node>
</State>
</Pad>
</Pads>
</MonoDevelop.Ide.Workbench>
- <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" />
- <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/UI/UI0-Public/Widget/WebViewDialog.cs" relfile="HDL_ON/UI/UI0-Public/Widget/WebViewDialog.cs" line="117" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/UI/UI1-Login/LoginPageBLL.cs" relfile="HDL_ON/UI/UI1-Login/LoginPageBLL.cs" line="100" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs" line="549" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs" line="565" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPage.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPage.cs" line="167" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/DAL/Server/HttpServerRequest.cs" relfile="HDL_ON/DAL/Server/HttpServerRequest.cs" line="350" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs" line="85" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/Common/HDLCommon.cs" relfile="HDL_ON/Common/HDLCommon.cs" line="610" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/DAL/Server/HttpServerRequest.cs" relfile="HDL_ON/DAL/Server/HttpServerRequest.cs" line="3558" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/Common/HDLCommon.cs" relfile="HDL_ON/Common/HDLCommon.cs" line="729" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/UnlockSettingPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/UnlockSettingPage.cs" line="607" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/DAL/Server/HttpServerRequest.cs" relfile="HDL_ON/DAL/Server/HttpServerRequest.cs" line="3442" column="1" />
- <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.DebuggingService.PinnedWatches />
<MonoDevelop.Ide.Workspace ActiveConfiguration="Release" />
+ <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 4f25d7a..cd274c5 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.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="202407021">
<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="29" />
<uses-permission android:name="android.permission.RECEIVE_SMS" />
<!--绋嬪簭鍙互璇诲彇璁惧澶栭儴瀛樺偍绌洪棿(鍐呯疆SDcard鍜屽缃甋DCard)鐨勬枃浠讹紝鎴戠殑鏂囦欢绛�-->
diff --git a/HDL-ON_iOS/Info.plist b/HDL-ON_iOS/Info.plist
index ef0fd37..14fcbd2 100644
--- a/HDL-ON_iOS/Info.plist
+++ b/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>
diff --git a/HDL_ON/DAL/DriverLayer/Control.cs b/HDL_ON/DAL/DriverLayer/Control.cs
index 2dc1ace..e268d18 100644
--- a/HDL_ON/DAL/DriverLayer/Control.cs
+++ b/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;
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index e11897e..70dbdca 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/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>
diff --git a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
index 5f42eee..19bf0e7 100644
--- a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
+++ b/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();
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index 4b15e9f..53af48b 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/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";
diff --git a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs b/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
index 7bbf394..c440bdd 100644
--- a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
+++ b/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(); //鍒犻櫎璁惧鍚庨噸鏂板埛鏂癠I
- })
- {
- 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(); //鍒犻櫎璁惧鍚庨噸鏂板埛鏂癠I
+ })
+ {
+ 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);
+ }
+ }
}
--
Gitblit v1.8.0