From 89e5ee13906a80f5357e078301169fabbf9103c6 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期四, 01 四月 2021 10:28:23 +0800
Subject: [PATCH] 2021-4-1-5
---
HDL-ON_Android/Resources/Resource.designer.cs | 3 +
HDL_ON/UI/UI2/FuntionControlView/Video/MainView.cs | 2
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 9 +---
.vs/HDL_APP_Project/xs/UserPrefs.xml | 48 +++++++++++++++++++++---
4 files changed, 48 insertions(+), 14 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 3f126bf..7073b85 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,14 +1,50 @@
锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/Server/HttpServerRequest.cs">
<Files>
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/MainView.cs" Line="158" Column="54" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/MainView.cs" Line="19" Column="106" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs" Line="33" Column="1" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs" Line="22" Column="77" />
<File FileName="HDL_ON/DAL/Server/HttpUtil.cs" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs" Line="99" Column="47" />
<File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/BrandList.cs" />
+ <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs" Line="512" Column="1" />
+ <File FileName="HDL_ON/Entity/Enumerative/MyEnum.cs" Line="1" Column="1" />
+ <File FileName="HDL_ON/DAL/Server/NewAPI.cs" Line="541" Column="46" />
+ <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="2249" Column="2" />
+ <File FileName="HDL_ON/Common/ApiUtlis.cs" Line="281" Column="60" />
+ <File FileName="HDL_ON/Entity/FunctionList.cs" Line="1" Column="1" />
+ <File FileName="HDL_ON/DAL/FileUtils.cs" Line="1" Column="1" />
</Files>
+ <Pads>
+ <Pad Id="ProjectPad">
+ <State name="__root__">
+ <Node name="HDL_APP_Project" expanded="True">
+ <Node name="HDL_ON" expanded="True">
+ <Node name="Common" expanded="True" />
+ <Node name="DAL" expanded="True">
+ <Node name="Server" expanded="True">
+ <Node name="HttpServerRequest.cs" selected="True" />
+ </Node>
+ <Node name="ThirdPartySdk" expanded="True" />
+ </Node>
+ <Node name="Entity" expanded="True">
+ <Node name="Enumerative" expanded="True" />
+ </Node>
+ <Node name="UI" expanded="True">
+ <Node name="UI2" expanded="True">
+ <Node name="2-Classification" expanded="True" />
+ <Node name="4-PersonalCenter" expanded="True">
+ <Node name="PirDevice" expanded="True" />
+ </Node>
+ <Node name="FuntionControlView" expanded="True">
+ <Node name="Video" expanded="True" />
+ </Node>
+ </Node>
+ </Node>
+ </Node>
+ </Node>
+ </State>
+ </Pad>
+ </Pads>
</MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.DebuggingService.PinnedWatches />
<DisabledProjects>
diff --git a/HDL-ON_Android/Resources/Resource.designer.cs b/HDL-ON_Android/Resources/Resource.designer.cs
index b3c46e6..e88a201 100644
--- a/HDL-ON_Android/Resources/Resource.designer.cs
+++ b/HDL-ON_Android/Resources/Resource.designer.cs
@@ -2,6 +2,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
+// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -14,7 +15,7 @@
{
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")]
public partial class Resource
{
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index d23f3b4..c0aff4b 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -627,7 +627,7 @@
LoadEvent_SwitchFunction(btnLightPower, item, functionView);
};
functionPageTitleId = StringId.Lights;
-
+
#endregion
break;
case ShowFunction.AC:
@@ -805,13 +805,10 @@
break;
case ShowFunction.VideoIntercom:
btnName.TextID = StringId.VideoIntercom;
-
btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
{
- var mainView = new HDL_ON.UI.UI2.FuntionControlView.Video.MainView();
- MainPage.BasePageView.AddChidren(mainView);
- mainView.Show();
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ var videoMethod = new UI2.FuntionControlView.Video.VideoMethod();
+ videoMethod.MianView(this,FunctionList.List.videoIntercom);
};
break;
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/MainView.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/MainView.cs
index 4326191..1fd2899 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Video/MainView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Video/MainView.cs
@@ -255,7 +255,7 @@
//闂ㄥ彛鏈虹殑鐐瑰嚮浜嬩欢
clickBtn.MouseUpEventHandler += (sender, e) =>
{
- var flVideo = clickBtn.Tag as VideoMethod.FlVideo;
+ var flVideo = clickBtn.Tag as FlVideo;
if (flVideo.devType == "100")
{
//闂ㄧ浜岀淮鐮佸浐瀹氭湁鐨�
--
Gitblit v1.8.0