From c8181d684c1e242c94b449e00dcd2c138c6587d3 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期四, 18 三月 2021 17:20:32 +0800
Subject: [PATCH] 2021-3-18-1
---
HDL-ON_iOS/Resources/Phone/VideoIcon/danyuanji.png | 0
HDL-ON_Android/Assets/Phone/.DS_Store | 0
HDL-ON_Android/Assets/Phone/VideoIcon/hangup.png | 0
HDL-ON_iOS/Resources/Phone/VideoIcon/phone.png | 0
HDL-ON_iOS/Resources/Phone/VideoIcon/keshiduijiang.png | 0
HDL-ON_iOS/HDL-ON_iOS.csproj | 8
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/PirView.cs | 3
HDL-ON_Android/Assets/Phone/VideoIcon/phone.png | 0
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs | 8
HDL_ON/HDL_ON.projitems | 6
HDL_ON/UI/UI2/FuntionControlView/Video/View/ShowDialog.cs | 91 +++++++
HDL-ON_Android/HDL-ON_Android.csproj | 8
HDL-ON_Android/Assets/Phone/VideoIcon/menjin.png | 0
HDL-ON_iOS/Resources/Phone/VideoIcon/menjin.png | 0
HDL-ON_iOS/Resources/Phone/VideoIcon/hangup.png | 0
HDL-ON_Android/Assets/Phone/VideoIcon/keshiduijiang.png | 0
.vs/HDL_APP_Project/xs/UserPrefs.xml | 46 ++-
HDL-ON_iOS/Resources/Phone/VideoIcon/answer.png | 0
HDL-ON_Android/Assets/Phone/VideoIcon/answer.png | 0
HDL-ON_iOS/Resources/Phone/VideoIcon/weiqiangji.png | 0
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/ReplicationView.cs | 24 +
HDL_ON/UI/UI2/FuntionControlView/Video/MainView.cs | 340 ++++++++++++++++++++++++++++
HDL_ON/UI/UI2/FuntionControlView/Video/View/FrameLayout50.cs | 46 +++
HDL-ON_Android/Assets/Phone/VideoIcon/danyuanji.png | 0
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs | 5
HDL-ON_Android/Assets/Phone/VideoIcon/weiqiangji.png | 0
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/DeviceSet.cs | 10
HDL_ON/UI/UI2/FuntionControlView/Video/View/FrameLayout60.cs | 102 ++++++++
28 files changed, 660 insertions(+), 37 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index a04b4c1..fb7cc5f 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,39 +1,53 @@
锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/ReplicationView.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs">
<Files>
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs" Line="17" Column="66" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs" Line="12" Column="22" />
- <File FileName="HDL_ON/DAL/Mqtt/MqttClient.cs" Line="161" Column="1" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs" Line="124" Column="68" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs" Line="27" Column="40" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/ReplicationView.cs" Line="15" Column="10" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs" Line="213" Column="22" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs" Line="80" Column="20" />
+ <File FileName="HDL_ON/DAL/Mqtt/MqttClient.cs" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs" Line="114" Column="15" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/ReplicationView.cs" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/AddMiniRemoteControlDirection4Page.cs" Line="244" Column="103" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControl.cs" />
+ <File FileName="../HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/EverymonthPage.cs" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/DeviceSet.cs" Line="31" Column="50" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/FailView.cs" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="HDL_APP_Project" expanded="True">
<Node name="HDL_ON" expanded="True">
- <Node name="DAL" expanded="True">
- <Node name="Mqtt" expanded="True" />
- </Node>
+ <Node name="DAL" expanded="True" />
<Node name="Entity" expanded="True" />
<Node name="UI" expanded="True">
<Node name="UI2" expanded="True">
+ <Node name="3-Intelligence" expanded="True">
+ <Node name="Automation" expanded="True" />
+ <Node name="Scene" expanded="True" />
+ </Node>
<Node name="4-PersonalCenter" expanded="True">
+ <Node name="AddDevice" expanded="True" />
<Node name="PirDevice" expanded="True">
- <Node name="View" expanded="True">
- <Node name="ReplicationView.cs" selected="True" />
- </Node>
+ <Node name="View" expanded="True" />
+ <Node name="PirMain.cs" selected="True" />
</Node>
</Node>
<Node name="FuntionControlView" expanded="True">
- <Node name="Music" expanded="True" />
+ <Node name="Music" expanded="True">
+ <Node name="View" expanded="True" />
+ </Node>
+ <Node name="Video" expanded="True">
+ <Node name="View" expanded="True" />
+ </Node>
</Node>
</Node>
</Node>
</Node>
- <Node name="HDL-ON_Android" expanded="True">
- <Node name="Other" expanded="True" />
+ <Node name="HDL-ON_iOS" expanded="True">
+ <Node name="Resources" expanded="True">
+ <Node name="Phone" expanded="True" />
+ </Node>
</Node>
</Node>
</State>
diff --git a/HDL-ON_Android/Assets/Phone/.DS_Store b/HDL-ON_Android/Assets/Phone/.DS_Store
index b0674c8..3d41515 100644
--- a/HDL-ON_Android/Assets/Phone/.DS_Store
+++ b/HDL-ON_Android/Assets/Phone/.DS_Store
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/VideoIcon/answer.png b/HDL-ON_Android/Assets/Phone/VideoIcon/answer.png
new file mode 100755
index 0000000..a2e724a
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/VideoIcon/answer.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/VideoIcon/danyuanji.png b/HDL-ON_Android/Assets/Phone/VideoIcon/danyuanji.png
new file mode 100755
index 0000000..4e7a8b4
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/VideoIcon/danyuanji.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/VideoIcon/hangup.png b/HDL-ON_Android/Assets/Phone/VideoIcon/hangup.png
new file mode 100755
index 0000000..8a4e86e
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/VideoIcon/hangup.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/VideoIcon/keshiduijiang.png b/HDL-ON_Android/Assets/Phone/VideoIcon/keshiduijiang.png
new file mode 100755
index 0000000..64c0564
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/VideoIcon/keshiduijiang.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/VideoIcon/menjin.png b/HDL-ON_Android/Assets/Phone/VideoIcon/menjin.png
new file mode 100755
index 0000000..0773a7e
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/VideoIcon/menjin.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/VideoIcon/phone.png b/HDL-ON_Android/Assets/Phone/VideoIcon/phone.png
new file mode 100755
index 0000000..852596c
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/VideoIcon/phone.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/VideoIcon/weiqiangji.png b/HDL-ON_Android/Assets/Phone/VideoIcon/weiqiangji.png
new file mode 100755
index 0000000..08c8c43
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/VideoIcon/weiqiangji.png
Binary files differ
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index c8c0871..536dd6d 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -232,6 +232,7 @@
<Folder Include="Assets\Phone\FunctionIcon\Electrical\WaterValve\" />
<Folder Include="Assets\Phone\FunctionIcon\Electrical\ClothesHanger\" />
<Folder Include="Assets\Phone\PirIcon\" />
+ <Folder Include="Assets\Phone\VideoIcon\" />
</ItemGroup>
<ItemGroup />
<ItemGroup>
@@ -925,6 +926,13 @@
<AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\irlearn_white.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\curtainswitch_white.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\electricalracks_white.png" />
+ <AndroidAsset Include="Assets\Phone\VideoIcon\answer.png" />
+ <AndroidAsset Include="Assets\Phone\VideoIcon\danyuanji.png" />
+ <AndroidAsset Include="Assets\Phone\VideoIcon\hangup.png" />
+ <AndroidAsset Include="Assets\Phone\VideoIcon\keshiduijiang.png" />
+ <AndroidAsset Include="Assets\Phone\VideoIcon\menjin.png" />
+ <AndroidAsset Include="Assets\Phone\VideoIcon\phone.png" />
+ <AndroidAsset Include="Assets\Phone\VideoIcon\weiqiangji.png" />
</ItemGroup>
<ItemGroup>
<AndroidNativeLibrary Include="libs\armeabi-v7a\libelianjni.so" />
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index 91c010e..038c310 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -1159,6 +1159,14 @@
<BundleResource Include="Resources\Phone\PirIcon\left.png" />
<BundleResource Include="Resources\Phone\PirIcon\right.png" />
<BundleResource Include="Resources\Phone\PirIcon\succeed.png" />
+ <BundleResource Include="Resources\Phone\VideoIcon\hangup.png" />
+ <BundleResource Include="Resources\Phone\VideoIcon\danyuanji.png" />
+ <BundleResource Include="Resources\Phone\VideoIcon\.DS_Store" />
+ <BundleResource Include="Resources\Phone\VideoIcon\weiqiangji.png" />
+ <BundleResource Include="Resources\Phone\VideoIcon\keshiduijiang.png" />
+ <BundleResource Include="Resources\Phone\VideoIcon\phone.png" />
+ <BundleResource Include="Resources\Phone\VideoIcon\menjin.png" />
+ <BundleResource Include="Resources\Phone\VideoIcon\answer.png" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
diff --git a/HDL-ON_iOS/Resources/Phone/VideoIcon/answer.png b/HDL-ON_iOS/Resources/Phone/VideoIcon/answer.png
new file mode 100755
index 0000000..a2e724a
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/VideoIcon/answer.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/VideoIcon/danyuanji.png b/HDL-ON_iOS/Resources/Phone/VideoIcon/danyuanji.png
new file mode 100755
index 0000000..4e7a8b4
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/VideoIcon/danyuanji.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/VideoIcon/hangup.png b/HDL-ON_iOS/Resources/Phone/VideoIcon/hangup.png
new file mode 100755
index 0000000..8a4e86e
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/VideoIcon/hangup.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/VideoIcon/keshiduijiang.png b/HDL-ON_iOS/Resources/Phone/VideoIcon/keshiduijiang.png
new file mode 100755
index 0000000..64c0564
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/VideoIcon/keshiduijiang.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/VideoIcon/menjin.png b/HDL-ON_iOS/Resources/Phone/VideoIcon/menjin.png
new file mode 100755
index 0000000..0773a7e
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/VideoIcon/menjin.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/VideoIcon/phone.png b/HDL-ON_iOS/Resources/Phone/VideoIcon/phone.png
new file mode 100755
index 0000000..852596c
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/VideoIcon/phone.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/VideoIcon/weiqiangji.png b/HDL-ON_iOS/Resources/Phone/VideoIcon/weiqiangji.png
new file mode 100755
index 0000000..08c8c43
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/VideoIcon/weiqiangji.png
Binary files differ
diff --git a/HDL_ON/HDL_ON.projitems b/HDL_ON/HDL_ON.projitems
index b64ad47..759eae5 100644
--- a/HDL_ON/HDL_ON.projitems
+++ b/HDL_ON/HDL_ON.projitems
@@ -379,6 +379,10 @@
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AddFunction\DeviceListPage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\PirDevice\View\MainView.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\PirDevice\View\HeigthChangeView.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Video\MainView.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Video\View\FrameLayout50.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Video\View\FrameLayout60.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Video\View\ShowDialog.cs" />
</ItemGroup>
<ItemGroup>
<Folder Include="$(MSBuildThisFileDirectory)DAL\" />
@@ -417,5 +421,7 @@
<Folder Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\ArmSensor\" />
<Folder Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\PirDevice\" />
<Folder Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\PirDevice\View\" />
+ <Folder Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Video\" />
+ <Folder Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Video\View\" />
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs
index d22a2ca..1e4c027 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs
@@ -122,7 +122,10 @@
}
//new寮曞鐣岄潰
View.ReplicationView replication = new View.ReplicationView();
- replication.Show();
+ // MainPage.BasePageView.AddChidren(replication);
+ replication.Show(this);
+ // MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+
//娣诲姞鏁版嵁瀵硅薄
Entity.AttributesStatus buttonObj = new Entity.AttributesStatus();
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/DeviceSet.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/DeviceSet.cs
index f0c7bae..a4d2912 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/DeviceSet.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/DeviceSet.cs
@@ -89,13 +89,15 @@
//绾㈠瀹濇槸鍚﹀湪绾�-绂荤嚎
if (pirDevice.online)
{
- pirView.stateIconBtn.IsSelected = true;
- pirView.stateTextBtn.IsSelected = true;
+ pirView.stateIconBtn.IsSelected = false;
+ pirView.stateTextBtn.IsSelected = false;
+ pirView.stateTextBtn.TextID = StringId.zaixian;
}
else
{
- pirView.stateIconBtn.IsSelected = false;
- pirView.stateTextBtn.IsSelected = false;
+ pirView.stateIconBtn.IsSelected = true;
+ pirView.stateTextBtn.IsSelected = true;
+ pirView.stateTextBtn.TextID = StringId.lixian;
}
//鏍囪绾㈠瀹�
pirView.clickBtn.Tag = pirDevice;
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs
index 908d600..154bdff 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs
@@ -105,8 +105,8 @@
Button sumBtn = new Button
{
Y = Application.GetRealHeight(267),
- X = Application.GetRealWidth(170),
- Width = Application.GetRealWidth(36),
+ X = Application.GetRealWidth(136),
+ Width = Application.GetRealWidth(104),
Height = Application.GetRealHeight(17),
Text = "(1/20)",
TextSize = TextSize.text12,
@@ -125,7 +125,7 @@
TextSize = TextSize.text16,
TextColor = CSS.CSS_Color.textConfirmColor,
TextAlignment = TextAlignment.Center,
- Radius = (uint)Application.GetRealHeight(44),
+ Radius = (uint)Application.GetRealHeight(22),
BorderWidth = 1,
BorderColor = CSS.CSS_Color.textConfirmColor,
};
@@ -141,7 +141,7 @@
TextSize = TextSize.text16,
TextColor = CSS.CSS_Color.textWhiteColor,
TextAlignment = TextAlignment.Center,
- Radius = (uint)Application.GetRealHeight(44),
+ Radius = (uint)Application.GetRealHeight(22),
//BorderWidth = 1,
//BorderColor = CSS.CSS_Color.textConfirmColor,
BackgroundColor = CSS.CSS_Color.textConfirmColor,
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/PirView.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/PirView.cs
index 37368a5..3e333ec 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/PirView.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/PirView.cs
@@ -84,8 +84,7 @@
public Button sumBtn = new Button
{
Y = Application.GetRealHeight(59),
-
- Width = Application.GetRealWidth(20),
+ Width = Application.GetRealWidth(50),
Height = Application.GetRealHeight(17),
Text = "/10",
TextAlignment = TextAlignment.CenterLeft,
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/ReplicationView.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/ReplicationView.cs
index fbebc91..32e80e8 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/ReplicationView.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/ReplicationView.cs
@@ -7,23 +7,27 @@
{
public class ReplicationView
{
- Dialog dialog = new Dialog();
+ FrameLayout fLayout = new FrameLayout
+ {
+ Height = Application.GetRealHeight(667),
+ BackgroundColor = CSS.CSS_Color.viewMiddle,
+ };
/// <summary>
///
/// </summary>
- public void Show()
+ public void Show(FrameLayout frame)
{
#region 鐣岄潰甯冨眬
- dialog.BackgroundColor = CSS.CSS_Color.viewMiddle;
+ frame.AddChidren(fLayout);
PirDevice.View.TopView topView = new View.TopView();
topView.topNameBtn.TextID = StringId.fuzhiyaokonggongnneg;
- dialog.AddChidren(topView.FLayoutView());
- topView.clickBackBtn.MouseUpEventHandler += (sender, e) => { dialog.Close();};
+ fLayout.AddChidren(topView.FLayoutView());
+ topView.clickBackBtn.MouseUpEventHandler += (sender, e) => { RemView(); };
FrameLayout frameLayout = new FrameLayout();
frameLayout.Height = Application.GetRealHeight(667 - 64);
frameLayout.Y = Application.GetRealHeight(64);
- // frameLayout.BackgroundColor = CSS.CSS_Color.textWhiteColor;
- dialog.AddChidren(frameLayout);
+ // frameLayout.BackgroundColor = CSS.CSS_Color.textWhiteColor;
+ fLayout.AddChidren(frameLayout);
var textBtn = new Button
{
Y = Application.GetRealHeight(24),
@@ -55,15 +59,15 @@
UnSelectedImagePath = "PirIcon/icon2.png",
};
frameLayout.AddChidren(icon2Btn);
- dialog.Show();
#endregion
}
/// <summary>
/// 绉婚櫎褰撳墠鐣岄潰
/// </summary>
- public void RemView() {
- dialog.Close();
+ public void RemView()
+ {
+ fLayout.RemoveFromParent();
}
}
}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/MainView.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/MainView.cs
new file mode 100644
index 0000000..f49dd0e
--- /dev/null
+++ b/HDL_ON/UI/UI2/FuntionControlView/Video/MainView.cs
@@ -0,0 +1,340 @@
+锘縰sing System;
+using HDL_ON.UI.Music;
+using Shared;
+namespace HDL_ON.UI.UI2.FuntionControlView.Video
+{
+ public class MainView : FrameLayout
+ {
+ public void Show()
+ {
+
+ this.BackgroundColor = MusicColor.ViewColor;
+ var topView = new TopView();
+ this.AddChidren(topView.TopFLayoutView());
+ topView.topNameBtn.Text = "鍙瀵硅";
+ topView.clickBackBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ RemoveFromParent();
+ };
+
+ var pageView = new PageLayout()
+ {
+ Y = Application.GetRealHeight(64),
+ Height = Application.GetRealHeight(667 - 64),
+ IsShowPoint = false,
+ };
+ this.AddChidren(pageView);
+ var view1 = new FrameLayout();
+ pageView.AddChidren(view1);
+ var view2 = new FrameLayout();
+ pageView.AddChidren(view2);
+ View1(view1);
+ View2(view2);
+ Button btn11 = new Button
+ {
+ X = Application.GetRealWidth(170),
+ Y = Application.GetRealHeight(578),
+ Width = Application.GetRealWidth(14),
+ Height = Application.GetRealHeight(6),
+ BackgroundColor = MusicColor.SelectedColor,
+ Radius = (uint)Application.GetRealHeight(4),
+ };
+ view1.AddChidren(btn11);
+
+ Button btn12 = new Button
+ {
+ X = Application.GetRealWidth(192),
+ Y = Application.GetRealHeight(578),
+ Width = Application.GetRealWidth(14),
+ Height = Application.GetRealHeight(6),
+ BackgroundColor = 0x404484F4,
+ Radius = (uint)Application.GetRealHeight(4),
+ };
+ view1.AddChidren(btn12);
+ Button btn21 = new Button
+ {
+ X = Application.GetRealWidth(170),
+ Y = Application.GetRealHeight(578),
+ Width = Application.GetRealWidth(14),
+ Height = Application.GetRealHeight(6),
+ BackgroundColor = 0x404484F4,
+ Radius = (uint)Application.GetRealHeight(4),
+ };
+ view2.AddChidren(btn21);
+
+ Button btn22 = new Button
+ {
+ X = Application.GetRealWidth(192),
+ Y = Application.GetRealHeight(578),
+ Width = Application.GetRealWidth(14),
+ Height = Application.GetRealHeight(6),
+ BackgroundColor = MusicColor.SelectedColor,
+ Radius = (uint)Application.GetRealHeight(4),
+ };
+ view2.AddChidren(btn22);
+
+ pageView.PageChange = (sender, e) =>
+ {
+
+ if (pageView.PageIndex == 0)
+ {
+ topView.topNameBtn.Text = "鍙瀵硅";
+ }
+ else
+ {
+ topView.topNameBtn.Text = "閫氳瘽璁板綍";
+
+ }
+ };
+ }
+ /// <summary>
+ /// 绗竴涓晫闈�
+ /// </summary>
+ /// <param name="view1">鐖舵帶浠�</param>
+ void View1(FrameLayout view1)
+ {
+
+ var bjFl = new FrameLayout
+ {
+ Y = Application.GetRealHeight(24),
+ X = Application.GetRealWidth(24),
+ Height = Application.GetRealHeight(526),
+ Width = Application.GetRealWidth(327),
+ BackgroundImagePath = "MusicIcon/playBj.png",
+ };
+ view1.AddChidren(bjFl);
+ /// <summary>
+ /// 姹夊瓧
+ /// </summary>
+ Button nameBtn = new Button
+ {
+ X = Application.GetRealWidth(16),
+ Y = Application.GetRealHeight(16),
+ Width = Application.GetRealWidth(100),
+ Height = Application.GetRealHeight(33),
+ TextColor = MusicColor.MusicTxet14Color,
+ TextSize = TextSize.Text24,
+ TextAlignment = TextAlignment.CenterLeft,
+ Text = "鍙瀵硅",
+ };
+ bjFl.AddChidren(nameBtn);
+ /// <summary>
+ /// 鍖哄煙鍚嶇О
+ /// </summary>
+ Button regionBtn = new Button
+ {
+ X = Application.GetRealWidth(16),
+ Y = Application.GetRealHeight(53),
+ Width = Application.GetRealWidth(270),
+ Height = Application.GetRealHeight(17),
+ TextColor = MusicColor.MusicNoTxetColor,
+ TextSize = TextSize.Text12,
+ TextAlignment = TextAlignment.CenterLeft,
+ Text = "123456"
+ };
+ bjFl.AddChidren(regionBtn);
+ /// <summary>
+ ///鏀惰棌鍥炬爣
+ /// </summary>
+ Button collectIconBtn = new Button
+ {
+ X = Application.GetRealWidth(273),
+ Y = Application.GetRealHeight(14),
+ Width = Application.GetRealWidth(40),
+ Height = Application.GetRealWidth(40),
+ UnSelectedImagePath = "MusicIcon/collect.png",
+ SelectedImagePath = "MusicIcon/collectSelected.png",
+ };
+ bjFl.AddChidren(collectIconBtn);
+
+ Button intercomBtnIcon = new Button
+ {
+ X = Application.GetRealWidth(84),
+ Y = Application.GetRealHeight(118),
+ Width = Application.GetRealWidth(160),
+ Height = Application.GetRealWidth(160),
+ UnSelectedImagePath = "VideoIcon/keshiduijiang.png",
+
+ };
+ bjFl.AddChidren(intercomBtnIcon);
+
+ var vv = new VerticalScrolViewLayout {
+ Y = Application.GetRealHeight(306),
+ Height = Application.GetRealHeight(220),
+ Width = Application.GetRealWidth(327),
+ };
+ bjFl.AddChidren(vv);
+ //鏁扮粍涓暟
+ int value = 15;
+ //鍏堣绠楁暟鎹墍闇�瑕佺殑寰堥珮搴︼紱
+ int l = 0;
+ if (value % 3 == 0)
+ {
+ l = value / 3;
+ }
+ else
+ {
+
+ l = (value / 3) + 1;
+ }
+ var fL = new FrameLayout
+ {
+ Height = Application.GetRealHeight((48 + 24) * l),
+
+ };
+ vv.AddChidren(fL);
+ int line = 0;
+ for (int i = 1, j = 0; i <= value; i++, j++)
+ {
+ var fLayout = new FrameLayout
+ {
+ Width = Application.GetRealWidth(50),
+ Height = Application.GetRealWidth(48),
+ X = Application.GetRealWidth(31 + (58 + 50) * j),
+ Y = Application.GetRealHeight(20 + (48 + 24) * line),
+
+ };
+ fL.AddChidren(fLayout);
+
+ var iconBtn = new Button
+ {
+ X = Application.GetRealWidth(11),
+ Width = Application.GetRealWidth(28),
+ Height = Application.GetRealWidth(28),
+ UnSelectedImagePath = "VideoIcon/weiqiangji.png",
+ };
+ fLayout.AddChidren(iconBtn);
+
+ var iconNameBtn = new Button
+ {
+ Y = iconBtn.Bottom + Application.GetRealHeight(6),
+ Width = Application.GetRealWidth(50),
+ Height = Application.GetRealHeight(14),
+ TextSize = TextSize.Text10,
+ TextColor = CSS.CSS_Color.TextualColor,
+ TextAlignment = TextAlignment.Center,
+ Text="鏌ョ湅鍗曞厓鏈�"
+ };
+ fLayout.AddChidren(iconNameBtn);
+
+ var clickBtn = new Button { Tag = i };
+ fLayout.AddChidren(clickBtn);
+ if (i % 3 == 0)
+ {
+ //婊′竴琛岄噸缃甹=0鍊�;
+ j = -1;
+ line += 1;
+ }
+ // GetIconAndText(i, deviceIconBtn, iconNameBtn);
+ clickBtn.MouseUpEventHandler += (sender, e) =>
+ {
+
+ ////1=绌鸿皟;2=鐢佃;3=椋庢墖;4=鏈洪《鐩�;5=DVD/EVD/VCD;6=鎶曞奖浠�;7=鑷畾涔�;
+ //int if_value = int.Parse(clickBtn.Tag.ToString());
+ //if (if_value == 7)
+ //{
+ // Method method = new Method();
+ // method.AddControl(this, (control) =>
+ // {
+ // AddButton addButton = new AddButton();
+ // MainPage.BasePageView.AddChidren(addButton);
+ // addButton.Show(control);
+ // MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ // });
+ //}
+ //else
+ //{
+ // if (DeviceTypeList.Count == 0)
+ // {
+ // GetDeviceTypeList(true, () =>
+ // {
+ // DeviceTypeViewClick(if_value);
+
+ // });
+ // }
+ // else
+ // {
+ // DeviceTypeViewClick(if_value);
+ // }
+ //}
+ };
+ }
+
+
+ }
+ /// <summary>
+ /// 绗簩涓晫闈�
+ /// </summary>
+ /// <param name="view2">鐖舵帶浠�</param>
+ void View2(FrameLayout view2)
+ {
+
+ var bjFl = new FrameLayout
+ {
+ Y = Application.GetRealHeight(24),
+ X = Application.GetRealWidth(24),
+ Height = Application.GetRealHeight(526),
+ Width = Application.GetRealWidth(327),
+ BackgroundImagePath = "MusicIcon/playBj.png",
+ };
+ view2.AddChidren(bjFl);
+ /// <summary>
+ /// 姹夊瓧
+ /// </summary>
+ Button nameBtn = new Button
+ {
+ X = Application.GetRealWidth(16),
+ Y = Application.GetRealHeight(16),
+ Width = Application.GetRealWidth(100),
+ Height = Application.GetRealHeight(33),
+ TextColor = MusicColor.MusicTxet14Color,
+ TextSize = TextSize.Text24,
+ TextAlignment = TextAlignment.CenterLeft,
+ Text = "閫氳瘽璁板綍",
+ };
+ bjFl.AddChidren(nameBtn);
+ /// <summary>
+ /// 浜戠鐓х墖鍙繚鐣�30澶�
+ /// </summary>
+ Button regionBtn = new Button
+ {
+ X = Application.GetRealWidth(16),
+ Y = Application.GetRealHeight(53),
+ Width = Application.GetRealWidth(270),
+ Height = Application.GetRealHeight(17),
+ TextColor = MusicColor.SelectedColor,
+ TextSize = TextSize.Text12,
+ TextAlignment = TextAlignment.CenterLeft,
+ Text = "*浜戠鐓х墖鍙繚鐣�30澶�"
+ };
+ bjFl.AddChidren(regionBtn);
+
+ var vv = new VerticalScrolViewLayout
+ {
+ X = Application.GetRealWidth(16),
+ Y = Application.GetRealHeight(58),
+ Height = Application.GetRealHeight(458),
+ Width = Application.GetRealWidth(295),
+ };
+ bjFl.AddChidren(vv);
+ for (int i = 0; i < 6; i++)
+ {
+
+ if (i == 0|| i == 2)
+ {
+ View.FrameLayout50 frameLayout50 = new View.FrameLayout50();
+ vv.AddChidren(frameLayout50.FLayoutView());
+ }
+ else
+ {
+ View.FrameLayout60 frameLayout60 = new View.FrameLayout60();
+ vv.AddChidren(frameLayout60.FLayoutView());
+ }
+ }
+
+ }
+
+
+ }
+
+}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/View/FrameLayout50.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/View/FrameLayout50.cs
new file mode 100644
index 0000000..eea1f20
--- /dev/null
+++ b/HDL_ON/UI/UI2/FuntionControlView/Video/View/FrameLayout50.cs
@@ -0,0 +1,46 @@
+锘縰sing System;
+using HDL_ON.UI.UI2.Intelligence.Automation.LogicView;
+using Shared;
+namespace HDL_ON.UI.UI2.FuntionControlView.Video.View
+{
+ public class FrameLayout50
+ {
+ /// <summary>
+ /// 涓绘帶浠禫iew
+ /// </summary>
+ public FrameLayout frameLayout = new FrameLayout
+ {
+ Height = Application.GetRealHeight(50),
+ // BackgroundColor = CSS.CSS_Color.view,
+ };
+ /// <summary>
+ /// 鏂囨湰鎻忚堪
+ /// </summary>
+ public Button btnText = new Button
+ {
+ Y = Application.GetRealHeight(24),
+ Width = Application.GetRealWidth(200),
+ Height = Application.GetRealHeight(22),
+ TextColor = CSS.CSS_Color.textColor,
+ TextSize = TextSize.text16,
+ TextAlignment = TextAlignment.CenterLeft,
+ IsBold = true,
+ Text= "2020骞�",
+ };
+
+ public Button btnClick = new Button
+ {
+ Height = Application.GetRealHeight(50),
+ };
+ /// <summary>
+ /// View鐨勬柟娉�
+ /// </summary>
+ /// <returns></returns>
+ public FrameLayout FLayoutView()
+ {
+ frameLayout.AddChidren(btnText);
+ frameLayout.AddChidren(btnClick);
+ return frameLayout;
+ }
+ }
+}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/View/FrameLayout60.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/View/FrameLayout60.cs
new file mode 100644
index 0000000..bedc8ec
--- /dev/null
+++ b/HDL_ON/UI/UI2/FuntionControlView/Video/View/FrameLayout60.cs
@@ -0,0 +1,102 @@
+锘縰sing System;
+using HDL_ON.UI.UI2.Intelligence.Automation.LogicView;
+using Shared;
+namespace HDL_ON.UI.UI2.FuntionControlView.Video.View
+{
+ public class FrameLayout60
+ {
+ /// <summary>
+ /// 涓绘帶浠禫iew
+ /// </summary>
+ public FrameLayout frameLayout = new FrameLayout
+ {
+ Height = Application.GetRealHeight(60),
+ //BackgroundColor = CSS.CSS_Color.view,
+ };
+
+ /// <summary>
+ /// 鏂囨湰鎻忚堪
+ /// </summary>
+ public Button btnText = new Button
+ {
+ Y=Application.GetRealHeight(10),
+ Width = Application.GetRealWidth(200),
+ Height = Application.GetRealHeight(20),
+ TextColor = CSS.CSS_Color.textColor,
+ TextSize = TextSize.text14,
+ Text= "闂ㄥ彛鏈哄懠鍙�",
+ TextAlignment = TextAlignment.CenterLeft,
+ };
+ /// <summary>
+ /// 鏃堕棿鏂囨湰鎻忚堪
+ /// </summary>
+ public Button btnTime = new Button
+ {
+ X=Application.GetRealWidth(82),
+ Y = Application.GetRealHeight(10),
+ Width = Application.GetRealWidth(120),
+ Height = Application.GetRealHeight(20),
+ TextColor = CSS.CSS_Color.textColor,
+ TextSize = TextSize.text14,
+ TextAlignment=TextAlignment.CenterLeft,
+ Text = "15:01",
+ };
+ /// <summary>
+ /// 缂栬緫鏂囨湰
+ /// </summary>
+ public Button btnEditText = new Button
+ {
+ Y = Application.GetRealHeight(32),
+ Width = Application.GetRealWidth(260),
+ Height = Application.GetRealHeight(17),
+ TextSize = TextSize.text12,
+ TextColor = CSS.CSS_Color.textCancelColor,
+ TextAlignment = TextAlignment.CenterLeft,
+ Text = "宸叉帴鍚�, 宸插紑閿�",
+ };
+
+
+ /// <summary>
+ /// 鍥炬爣
+ /// </summary>
+ public Button btnNextIcon = new Button
+ {
+ Width = Application.GetRealWidth(102),
+ Height = Application.GetRealWidth(56),
+ UnSelectedImagePath = "LogicIcon/next.png",
+ X = Application.GetRealWidth(191),
+ Visible=false,
+ };
+
+ /// <summary>
+ /// 绾�
+ /// </summary>
+ public Button btnLine = new Button
+ {
+ Width = Application.GetRealWidth(295),
+ Height = 1,
+ BackgroundColor = CSS.CSS_Color.viewLine,
+
+ };
+
+ public Button btnClick = new Button
+ {
+ Height = Application.GetRealHeight(50),
+ };
+ /// <summary>
+ /// View鐨勬柟娉�
+ /// </summary>
+ /// <returns></returns>
+ public FrameLayout FLayoutView()
+ {
+ frameLayout.AddChidren(btnText);
+ frameLayout.AddChidren(btnTime);
+ frameLayout.AddChidren(btnEditText);
+ frameLayout.AddChidren(btnNextIcon);
+ btnLine.Y = frameLayout.Height - 1;
+ frameLayout.AddChidren(btnLine);
+ frameLayout.AddChidren(btnClick);
+ return frameLayout;
+ }
+ }
+}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/View/ShowDialog.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/View/ShowDialog.cs
new file mode 100644
index 0000000..ff1806d
--- /dev/null
+++ b/HDL_ON/UI/UI2/FuntionControlView/Video/View/ShowDialog.cs
@@ -0,0 +1,91 @@
+锘縰sing System;
+using HDL_ON.UI.Music;
+using Shared;
+namespace HDL_ON.UI.UI2.FuntionControlView.Video.View
+{
+ public class ShowDialog
+ {
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="title">鏍囬</param>
+ /// <param name="action1">鍥炶皟鍑芥暟</param>
+ /// <param name="action2">鍥炶皟鍑芥暟</param>
+ public void ClickBox(string title, Action<Dialog> action1, Action<Dialog> action2)
+ {
+ Dialog dialog = new Dialog()
+ {
+ BackgroundColor = MusicColor.PopupBackgroundColor,
+ };
+
+ FrameLayout whiteView = new FrameLayout()
+ {
+ X = Application.GetRealWidth(56),
+ Y = Application.GetRealHeight(261),
+ Width = Application.GetRealWidth(263),
+ Height = Application.GetRealHeight(145),
+ BackgroundColor = MusicColor.WhiteColor,
+ BorderColor = 0x00000000,
+ BorderWidth = 0,
+ Radius = (uint)Application.GetRealHeight(16),
+ };
+ dialog.AddChidren(whiteView);
+
+ Button dianhuaIconBtn = new Button
+ {
+ X = Application.GetRealWidth(46),
+ Y = Application.GetRealHeight(20),
+ Width = Application.GetRealWidth(32),
+ Height = Application.GetRealWidth(32),
+ UnSelectedImagePath = "VideoIcon/phone.png",
+ };
+ whiteView.AddChidren(dianhuaIconBtn);
+
+ Button btnTitle = new Button()
+ {
+ Y = Application.GetRealHeight(25),
+ X = Application.GetRealWidth(86),
+ Height = Application.GetRealHeight(22),
+ Width = Application.GetRealWidth(150),
+ TextColor = MusicColor.TextColor,
+ TextSize = TextSize.Text16,
+ TextAlignment = TextAlignment.CenterLeft,
+ Text = "鏉ヨ嚜鈥滃洿澧欐満鈥濆懠鍙�",
+
+ };
+ whiteView.AddChidren(btnTitle);
+
+ Button guaduanIconBtn = new Button
+ {
+ X = Application.GetRealWidth(75),
+ Y = Application.GetRealHeight(68),
+ Width = Application.GetRealWidth(32),
+ Height = Application.GetRealWidth(32),
+ UnSelectedImagePath = "VideoIcon/hangup.png",
+ };
+ whiteView.AddChidren(guaduanIconBtn);
+ Button jietingIconBtn = new Button
+ {
+ X = Application.GetRealWidth(157),
+ Y = Application.GetRealHeight(68),
+ Width = Application.GetRealWidth(32),
+ Height = Application.GetRealWidth(32),
+ UnSelectedImagePath = "VideoIcon/answer.png",
+ };
+ whiteView.AddChidren(jietingIconBtn);
+ dialog.Show();
+
+ guaduanIconBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ action1(dialog);
+ };
+ jietingIconBtn.MouseUpEventHandler += (sender, e) =>
+ {
+
+ action2(dialog);
+ };
+
+ }
+
+ }
+}
--
Gitblit v1.8.0