From 5c7f19ecc92299063658e636fa7fe22f0bee4c47 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 26 七月 2023 18:10:51 +0800
Subject: [PATCH] 2023年07月26日18:10:48
---
HDL-ON_Android/Assets/Phone/AksIcon/pingdao2.png | 0
HDL-ON_Android/Assets/Phone/AksIcon/zdyxia2.png | 0
HDL-ON_Android/Assets/Language.ini | 112 ++++++++
HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs | 1
HDL-ON_Android/Assets/Phone/AksIcon/bofang.png | 0
HDL-ON_Android/Assets/Phone/AksIcon/xuanze.png | 0
HDL_ON/HDL_ON.projitems | 4
HDL-ON_Android/Assets/Phone/AksIcon/xinhaoyuan.png | 0
HDL-ON_Android/Assets/Phone/AksIcon/guan.png | 0
HDL-ON_Android/HDL-ON_Android.csproj | 54 +++
HDL-ON_Android/Assets/Phone/AksIcon/zuo.png | 0
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs | 2
HDL_ON/Entity/Enumerative/MyEnum.cs | 4
HDL-ON_Android/Assets/Phone/AksIcon/zdyyou2.png | 0
HDL-ON_Android/Assets/Phone/AksIcon/zdyzuo2.png | 0
HDL-ON_Android/Assets/Phone/AksIcon/shang.png | 0
HDL_ON/UI/UI2/FuntionControlView/Aks/AksPage.cs | 186 +++++++++++++
HDL-ON_Android/Assets/Phone/AksIcon/you.png | 0
HDL-ON_Android/Assets/Phone/AksIcon/yingyinzhongkong2.png | 0
HDL-ON_Android/Assets/Phone/AksIcon/jingyin.png | 0
HDL-ON_Android/Assets/Phone/AksIcon/zanting.png | 0
HDL_ON/Entity/DB_ResidenceData.cs | 1
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 23 +
HDL-ON_Android/Assets/Phone/AksIcon/xia.png | 0
HDL-ON_Android/Assets/Phone/AksIcon/jia.png | 0
HDL-ON_Android/Assets/Phone/AksIcon/yingyinzhongkong1.png | 0
HDL_ON/Entity/Function/Function.cs | 16 +
HDL_ON/DAL/Server/HttpUtil.cs | 4
HDL-ON_Android/Assets/Phone/AksIcon/xiangshang.png | 0
HDL-ON_Android/Assets/Phone/AksIcon/fanhui.png | 0
HDL-ON_Android/Assets/Phone/AksIcon/shixuqi.png | 0
HDL-ON_Android/Assets/Phone/AksIcon/tingzhi.png | 0
HDL-ON_Android/Assets/Phone/AksIcon/yinliangjian.png | 0
HDL-ON_Android/Assets/Phone/AksIcon/mubusheng.png | 0
HDL-ON_Android/Assets/Phone/AksIcon/xiangxia.png | 0
HDL_ON/UI/UI2/FuntionControlView/Aks/AksCommonMethod.cs | 47 +++
HDL-ON_Android/Assets/Phone/AksIcon/yule.png | 0
HDL-ON_Android/Assets/Phone/AksIcon/dianshi.png | 0
HDL_ON/UI/UI2/FuntionControlView/Aks/AksListPage.cs | 250 +++++++++++++++++
HDL-ON_Android/Assets/Phone/AksIcon/yingkunext.png | 0
HDL-ON_Android/Assets/Phone/AksIcon/xiayibu.png | 0
HDL-ON_Android/Assets/Phone/AksIcon/kai.png | 0
HDL-ON_Android/Assets/Phone/AksIcon/touping.png | 0
HDL-ON_Android/Assets/Phone/AksIcon/caidan.png | 0
HDL-ON_Android/Assets/Phone/AksIcon/xinxi.png | 0
HDL-ON_Android/Assets/Phone/AksIcon/dianying.png | 0
HDL-ON_Android/Assets/Phone/AksIcon/kauitui.png | 0
HDL-ON_Android/Assets/Phone/AksIcon/quxiao.png | 0
HDL-ON_Android/Assets/Phone/AksIcon/jinchucang.png | 0
HDL-ON_Android/Assets/Phone/AksIcon/dankongdeng.png | 0
HDL-ON_Android/Assets/Phone/AksIcon/zdyanjian.png | 0
HDL-ON_Android/Assets/Phone/AksIcon/yingku.png | 0
HDL-ON_Android/Assets/Phone/AksIcon/gongfang1.png | 0
HDL-ON_Android/Assets/Phone/AksIcon/jian.png | 0
HDL-ON_Android/Assets/Phone/AksIcon/pindao1.png | 0
HDL-ON_Android/Assets/Phone/AksIcon/mubujiang.png | 0
HDL-ON_Android/Assets/Phone/AksIcon/zimu.png | 0
HDL_ON/Entity/FunctionList.cs | 10
HDL-ON_Android/Assets/Phone/AksIcon/dengguan.png | 0
HDL-ON_Android/Assets/Phone/AksIcon/huikan.png | 0
HDL-ON_Android/Assets/Phone/AksIcon/zdyshang1.png | 0
HDL-ON_Android/Assets/Phone/AksIcon/yinliangjia.png | 0
HDL-ON_Android/Assets/Phone/AksIcon/kuaijin.png | 0
HDL-ON_Android/Assets/Phone/AksIcon/shengdao.png | 0
HDL-ON_Android/Assets/Phone/AksIcon/gongfang2.png | 0
HDL_ON/Common/R.cs | 86 ++++++
HDL-ON_Android/Assets/Phone/AksIcon/yingui.png | 0
HDL-ON_Android/Assets/Phone/AksIcon/shangyibu.png | 0
68 files changed, 795 insertions(+), 5 deletions(-)
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index 75c5e2b..cbe0410 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -1227,6 +1227,28 @@
8512=Serial number
8513=Model
+8701=Home theatre
+8702=Player
+8703=Amplifier
+8704=Virtual remote control
+8705=Allmov
+8706=TIMING
+8707=Open
+8708=Off
+8709=Vocal tract
+8710=All around
+8711=Storehouse
+8712=Subtitle
+8713=Have already collected
+8714=A Collection for the Future
+8715=Synthesize
+8716=Video Introduction
+8717=Score
+8718=Play now
+8719=Conform action
+8720=Channel
+8721=Control
+
@@ -2578,6 +2600,28 @@
8512=搴忓垪鍙�
8513=鍨嬪彿
+8701=瀹跺涵褰遍櫌
+8702=鎾斁鍣�
+8703=鍔熸斁
+8704=铏氭嫙閬ユ帶鍣�
+8705=褰卞簱
+8706=鏃跺簭鍣�
+8707=寮�
+8708=鍏�
+8709=澹伴亾
+8710=涓婁竴閮�
+8711=杩涘嚭浠�
+8712=瀛楀箷
+8713=宸叉敹钘�
+8714=鏈敹钘�
+8715=缁煎悎
+8716=褰辩墖浠嬬粛
+8717=璇勫垎
+8718=绔嬪嵆鎾斁
+8719=涓嬩竴閮�
+8720=棰戦亾
+8721=鎺у埗
+
@@ -3919,6 +3963,28 @@
8512=Serial number
8513=Model
+8701=Home theatre
+8702=Player
+8703=Amplifier
+8704=Virtual remote control
+8705=Allmov
+8706=TIMING
+8707=Open
+8708=Off
+8709=Vocal tract
+8710=All around
+8711=Storehouse
+8712=Subtitle
+8713=Have already collected
+8714=A Collection for the Future
+8715=Synthesize
+8716=Video Introduction
+8717=Score
+8718=Play now
+8719=Conform action
+8720=Channel
+8721=Control
+
@@ -5252,6 +5318,28 @@
8511=Door opener
8512=Serial number
8513=Model
+
+8701=Home theatre
+8702=Player
+8703=Amplifier
+8704=Virtual remote control
+8705=Allmov
+8706=TIMING
+8707=Open
+8708=Off
+8709=Vocal tract
+8710=All around
+8711=Storehouse
+8712=Subtitle
+8713=Have already collected
+8714=A Collection for the Future
+8715=Synthesize
+8716=Video Introduction
+8717=Score
+8718=Play now
+8719=Conform action
+8720=Channel
+8721=Control
9000=Inicio sesi贸n con un nuevo n煤mero de tel茅fono celular
9001=Inicie sesi贸n con una nueva direcci贸n de correo el茅ctr贸nico
@@ -6591,6 +6679,30 @@
8512=Serial number
8513=Model
+8701=Home theatre
+8702=Player
+8703=Amplifier
+8704=Virtual remote control
+8705=Allmov
+8706=TIMING
+8707=Open
+8708=Off
+8709=Vocal tract
+8710=All around
+8711=Storehouse
+8712=Subtitle
+8713=Have already collected
+8714=A Collection for the Future
+8715=Synthesize
+8716=Video Introduction
+8717=Score
+8718=Play now
+8719=Conform action
+8720=Channel
+8721=Control
+
+
+
diff --git a/HDL-ON_Android/Assets/Phone/AksIcon/bofang.png b/HDL-ON_Android/Assets/Phone/AksIcon/bofang.png
new file mode 100644
index 0000000..9cf5460
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/AksIcon/bofang.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/AksIcon/caidan.png b/HDL-ON_Android/Assets/Phone/AksIcon/caidan.png
new file mode 100644
index 0000000..6c8e145
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/AksIcon/caidan.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/AksIcon/dankongdeng.png b/HDL-ON_Android/Assets/Phone/AksIcon/dankongdeng.png
new file mode 100644
index 0000000..2ff1edd
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/AksIcon/dankongdeng.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/AksIcon/dengguan.png b/HDL-ON_Android/Assets/Phone/AksIcon/dengguan.png
new file mode 100644
index 0000000..1facdc8
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/AksIcon/dengguan.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/AksIcon/dianshi.png b/HDL-ON_Android/Assets/Phone/AksIcon/dianshi.png
new file mode 100644
index 0000000..4114696
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/AksIcon/dianshi.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/AksIcon/dianying.png b/HDL-ON_Android/Assets/Phone/AksIcon/dianying.png
new file mode 100644
index 0000000..d886b48
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/AksIcon/dianying.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/AksIcon/fanhui.png b/HDL-ON_Android/Assets/Phone/AksIcon/fanhui.png
new file mode 100644
index 0000000..a1a9ff7
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/AksIcon/fanhui.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/AksIcon/gongfang1.png b/HDL-ON_Android/Assets/Phone/AksIcon/gongfang1.png
new file mode 100644
index 0000000..6da6836
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/AksIcon/gongfang1.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/AksIcon/gongfang2.png b/HDL-ON_Android/Assets/Phone/AksIcon/gongfang2.png
new file mode 100644
index 0000000..2754176
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/AksIcon/gongfang2.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/AksIcon/guan.png b/HDL-ON_Android/Assets/Phone/AksIcon/guan.png
new file mode 100644
index 0000000..84c4229
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/AksIcon/guan.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/AksIcon/huikan.png b/HDL-ON_Android/Assets/Phone/AksIcon/huikan.png
new file mode 100644
index 0000000..fe95dfa
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/AksIcon/huikan.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/AksIcon/jia.png b/HDL-ON_Android/Assets/Phone/AksIcon/jia.png
new file mode 100644
index 0000000..d1019ab
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/AksIcon/jia.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/AksIcon/jian.png b/HDL-ON_Android/Assets/Phone/AksIcon/jian.png
new file mode 100644
index 0000000..ba54146
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/AksIcon/jian.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/AksIcon/jinchucang.png b/HDL-ON_Android/Assets/Phone/AksIcon/jinchucang.png
new file mode 100644
index 0000000..c779b0b
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/AksIcon/jinchucang.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/AksIcon/jingyin.png b/HDL-ON_Android/Assets/Phone/AksIcon/jingyin.png
new file mode 100644
index 0000000..131f2e1
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/AksIcon/jingyin.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/AksIcon/kai.png b/HDL-ON_Android/Assets/Phone/AksIcon/kai.png
new file mode 100644
index 0000000..1670e5e
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/AksIcon/kai.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/AksIcon/kauitui.png b/HDL-ON_Android/Assets/Phone/AksIcon/kauitui.png
new file mode 100644
index 0000000..94bf35d
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/AksIcon/kauitui.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/AksIcon/kuaijin.png b/HDL-ON_Android/Assets/Phone/AksIcon/kuaijin.png
new file mode 100644
index 0000000..3adb7a0
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/AksIcon/kuaijin.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/AksIcon/mubujiang.png b/HDL-ON_Android/Assets/Phone/AksIcon/mubujiang.png
new file mode 100644
index 0000000..0085574
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/AksIcon/mubujiang.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/AksIcon/mubusheng.png b/HDL-ON_Android/Assets/Phone/AksIcon/mubusheng.png
new file mode 100644
index 0000000..56e645e
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/AksIcon/mubusheng.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/AksIcon/pindao1.png b/HDL-ON_Android/Assets/Phone/AksIcon/pindao1.png
new file mode 100644
index 0000000..432ce49
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/AksIcon/pindao1.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/AksIcon/pingdao2.png b/HDL-ON_Android/Assets/Phone/AksIcon/pingdao2.png
new file mode 100644
index 0000000..80fbb65
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/AksIcon/pingdao2.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/AksIcon/quxiao.png b/HDL-ON_Android/Assets/Phone/AksIcon/quxiao.png
new file mode 100644
index 0000000..f2a32ee
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/AksIcon/quxiao.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/AksIcon/shang.png b/HDL-ON_Android/Assets/Phone/AksIcon/shang.png
new file mode 100644
index 0000000..9b209e7
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/AksIcon/shang.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/AksIcon/shangyibu.png b/HDL-ON_Android/Assets/Phone/AksIcon/shangyibu.png
new file mode 100644
index 0000000..a83ee74
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/AksIcon/shangyibu.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/AksIcon/shengdao.png b/HDL-ON_Android/Assets/Phone/AksIcon/shengdao.png
new file mode 100644
index 0000000..7b87a46
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/AksIcon/shengdao.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/AksIcon/shixuqi.png b/HDL-ON_Android/Assets/Phone/AksIcon/shixuqi.png
new file mode 100644
index 0000000..2ea2656
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/AksIcon/shixuqi.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/AksIcon/tingzhi.png b/HDL-ON_Android/Assets/Phone/AksIcon/tingzhi.png
new file mode 100644
index 0000000..43343f6
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/AksIcon/tingzhi.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/AksIcon/touping.png b/HDL-ON_Android/Assets/Phone/AksIcon/touping.png
new file mode 100644
index 0000000..0fbf1d8
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/AksIcon/touping.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/AksIcon/xia.png b/HDL-ON_Android/Assets/Phone/AksIcon/xia.png
new file mode 100644
index 0000000..49170a6
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/AksIcon/xia.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/AksIcon/xiangshang.png b/HDL-ON_Android/Assets/Phone/AksIcon/xiangshang.png
new file mode 100644
index 0000000..c8b531d
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/AksIcon/xiangshang.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/AksIcon/xiangxia.png b/HDL-ON_Android/Assets/Phone/AksIcon/xiangxia.png
new file mode 100644
index 0000000..d48323e
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/AksIcon/xiangxia.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/AksIcon/xiayibu.png b/HDL-ON_Android/Assets/Phone/AksIcon/xiayibu.png
new file mode 100644
index 0000000..385bfa3
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/AksIcon/xiayibu.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/AksIcon/xinhaoyuan.png b/HDL-ON_Android/Assets/Phone/AksIcon/xinhaoyuan.png
new file mode 100644
index 0000000..0928e2e
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/AksIcon/xinhaoyuan.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/AksIcon/xinxi.png b/HDL-ON_Android/Assets/Phone/AksIcon/xinxi.png
new file mode 100644
index 0000000..be81c45
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/AksIcon/xinxi.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/AksIcon/xuanze.png b/HDL-ON_Android/Assets/Phone/AksIcon/xuanze.png
new file mode 100644
index 0000000..ab69584
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/AksIcon/xuanze.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/AksIcon/yingku.png b/HDL-ON_Android/Assets/Phone/AksIcon/yingku.png
new file mode 100644
index 0000000..a7219c5
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/AksIcon/yingku.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/AksIcon/yingkunext.png b/HDL-ON_Android/Assets/Phone/AksIcon/yingkunext.png
new file mode 100644
index 0000000..090033d
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/AksIcon/yingkunext.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/AksIcon/yingui.png b/HDL-ON_Android/Assets/Phone/AksIcon/yingui.png
new file mode 100644
index 0000000..bfad33e
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/AksIcon/yingui.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/AksIcon/yingyinzhongkong1.png b/HDL-ON_Android/Assets/Phone/AksIcon/yingyinzhongkong1.png
new file mode 100644
index 0000000..49b468f
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/AksIcon/yingyinzhongkong1.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/AksIcon/yingyinzhongkong2.png b/HDL-ON_Android/Assets/Phone/AksIcon/yingyinzhongkong2.png
new file mode 100644
index 0000000..1def0ae
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/AksIcon/yingyinzhongkong2.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/AksIcon/yinliangjia.png b/HDL-ON_Android/Assets/Phone/AksIcon/yinliangjia.png
new file mode 100644
index 0000000..dc496f3
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/AksIcon/yinliangjia.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/AksIcon/yinliangjian.png b/HDL-ON_Android/Assets/Phone/AksIcon/yinliangjian.png
new file mode 100644
index 0000000..0f2110d
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/AksIcon/yinliangjian.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/AksIcon/you.png b/HDL-ON_Android/Assets/Phone/AksIcon/you.png
new file mode 100644
index 0000000..98444d1
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/AksIcon/you.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/AksIcon/yule.png b/HDL-ON_Android/Assets/Phone/AksIcon/yule.png
new file mode 100644
index 0000000..b8966b7
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/AksIcon/yule.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/AksIcon/zanting.png b/HDL-ON_Android/Assets/Phone/AksIcon/zanting.png
new file mode 100644
index 0000000..bd6fe4b
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/AksIcon/zanting.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/AksIcon/zdyanjian.png b/HDL-ON_Android/Assets/Phone/AksIcon/zdyanjian.png
new file mode 100644
index 0000000..6e82fe5
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/AksIcon/zdyanjian.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/AksIcon/zdyshang1.png b/HDL-ON_Android/Assets/Phone/AksIcon/zdyshang1.png
new file mode 100644
index 0000000..c9e165f
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/AksIcon/zdyshang1.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/AksIcon/zdyxia2.png b/HDL-ON_Android/Assets/Phone/AksIcon/zdyxia2.png
new file mode 100644
index 0000000..248ee2f
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/AksIcon/zdyxia2.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/AksIcon/zdyyou2.png b/HDL-ON_Android/Assets/Phone/AksIcon/zdyyou2.png
new file mode 100644
index 0000000..eb5f5d6
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/AksIcon/zdyyou2.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/AksIcon/zdyzuo2.png b/HDL-ON_Android/Assets/Phone/AksIcon/zdyzuo2.png
new file mode 100644
index 0000000..cde06cd
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/AksIcon/zdyzuo2.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/AksIcon/zimu.png b/HDL-ON_Android/Assets/Phone/AksIcon/zimu.png
new file mode 100644
index 0000000..bde4002
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/AksIcon/zimu.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/AksIcon/zuo.png b/HDL-ON_Android/Assets/Phone/AksIcon/zuo.png
new file mode 100644
index 0000000..68c36a3
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/AksIcon/zuo.png
Binary files differ
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 68b87db..57b3d90 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -457,6 +457,59 @@
<AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\VideoDoorlockBatteryManagementBg.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\groupControl_white.png" />
<AndroidAsset Include="Assets\Phone\Classification\Room\HomePagebg.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\bofang.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\caidan.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\dankongdeng.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\dengguan.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\dianshi.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\dianying.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\fanhui.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\gongfang1.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\gongfang2.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\guan.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\huikan.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\jia.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\jian.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\jinchucang.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\jingyin.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\kai.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\kauitui.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\kuaijin.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\mubujiang.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\mubusheng.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\pindao1.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\pingdao2.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\quxiao.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\shang.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\shangyibu.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\shengdao.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\shixuqi.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\tingzhi.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\touping.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\xia.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\xiangshang.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\xiangxia.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\xiayibu.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\xinhaoyuan.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\xinxi.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\xuanze.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\yingku.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\yingkunext.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\yingui.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\yingyinzhongkong1.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\yingyinzhongkong2.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\yinliangjia.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\yinliangjian.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\you.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\yule.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\zanting.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\zdyanjian.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\zdyshang1.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\zdyxia2.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\zdyyou2.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\zdyzuo2.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\zimu.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\zuo.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\values\colors.xml" />
@@ -1673,6 +1726,7 @@
<Folder Include="Assets\Phone\FunctionIcon\Panel\" />
<Folder Include="Assets\Phone\FunctionIcon\Inverter\" />
<Folder Include="Assets\Phone\FunctionIcon\Electrical\MechanicalArm\" />
+ <Folder Include="Assets\Phone\AksIcon\" />
</ItemGroup>
<Import Project="..\HDL_ON\HDL_ON.projitems" Label="Shared" Condition="Exists('..\HDL_ON\HDL_ON.projitems')" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index aaf50ae..8432f28 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -3544,7 +3544,91 @@
public const int xinghao = 8513;
-
+ /// <summary>
+ /// 瀹跺涵褰遍櫌
+ /// </summary>
+ public const int jiatingyingyuan = 8701;
+ /// <summary>
+ /// 鎾斁鍣�
+ /// </summary>
+ public const int bofangqi = 8702;
+ /// <summary>
+ /// 鍔熸斁
+ /// </summary>
+ public const int gongfan = 8703;
+ /// <summary>
+ /// 铏氭嫙閬ユ帶鍣�
+ /// </summary>
+ public const int xuniyaokongqi = 8704;
+ /// <summary>
+ /// 褰卞簱
+ /// </summary>
+ public const int yingku = 8705;
+ /// <summary>
+ /// 鏃跺簭鍣�
+ /// </summary>
+ public const int shixuqi = 8706;
+ /// <summary>
+ /// 寮�
+ /// </summary>
+ public const int kai = 8707;
+ /// <summary>
+ /// 鍏�
+ /// </summary>
+ public const int guan = 8708;
+ /// <summary>
+ /// 澹伴亾
+ /// </summary>
+ public const int shengdao = 8709;
+ /// <summary>
+ /// 涓婁竴閮�
+ /// </summary>
+ public const int shangyibu= 8710;
+
+ /// <summary>
+ /// 杩涘嚭浠�
+ /// </summary>
+ public const int jinchucang = 8711;
+ /// <summary>
+ /// 瀛楀箷
+ /// </summary>
+ public const int zimu = 8712;
+ /// <summary>
+ /// 宸叉敹钘�
+ /// </summary>
+ public const int yishoucang= 8713;
+ /// <summary>
+ /// 鏈敹钘�
+ /// </summary>
+ public const int weishoucang = 8714;
+ /// <summary>
+ /// 缁煎悎
+ /// </summary>
+ public const int zonghe = 8715;
+ /// <summary>
+ /// 褰辩墖浠嬬粛
+ /// </summary>
+ public const int yingpianjieshao = 8716;
+ /// <summary>
+ /// 璇勫垎
+ /// </summary>
+ public const int pingfen = 8717;
+ /// <summary>
+ /// 绔嬪嵆鎾斁
+ /// </summary>
+ public const int lijibofang = 8718;
+ /// <summary>
+ /// 涓嬩竴閮�
+ /// </summary>
+ public const int xiayibu1 = 8719;
+ /// <summary>
+ /// 棰戦亾
+ /// </summary>
+ public const int pindao = 8720;
+ /// <summary>
+ /// 鎺у埗
+ /// </summary>
+ public const int kongzhi = 8721;
diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index fcb9604..4766d4f 100644
--- a/HDL_ON/DAL/Server/HttpUtil.cs
+++ b/HDL_ON/DAL/Server/HttpUtil.cs
@@ -18,8 +18,8 @@
/// 鍥哄畾鍩熷悕,姝ｅ紡鐜
/// 鍏叡鍩熷悕灏辫繎瑙ｆ瀽
/// </summary>
- public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
- //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
+ //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
+ public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
const string APP_KEY = "HDL-HOME-APP-TEST";
const string SECRET_KEY = "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss";
//public const string GlobalRequestHttpsHost = "http://59.41.255.150:7777";//mmmm
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 3fe97ad..1f8b69d 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -79,6 +79,7 @@
ShowFunction.SecurityMonitoring,
ShowFunction.VideoDoorLock,
ShowFunction.Series,
+ ShowFunction.Aks,
};
}
return dddd;
diff --git a/HDL_ON/Entity/Enumerative/MyEnum.cs b/HDL_ON/Entity/Enumerative/MyEnum.cs
index 0758bb7..a14796c 100644
--- a/HDL_ON/Entity/Enumerative/MyEnum.cs
+++ b/HDL_ON/Entity/Enumerative/MyEnum.cs
@@ -193,6 +193,10 @@
/// 璺戦┈鐏紙搴忓垪锛�
/// </summary>
Series = 0x27,
+ /// <summary>
+ /// 褰遍煶涓帶
+ /// </summary>
+ Aks = 0x28,
}
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 8e8602b..d17fa05 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -1558,6 +1558,10 @@
/// </summary>
public const string Ev_Ipcam = "security.ipcam.ez";
/// <summary>
+ /// 褰遍煶涓帶
+ /// </summary>
+ public const string AvZkAiks = "av.zk.aiks";
+ /// <summary>
/// 钀ょ煶瑙嗛闂ㄩ攣spk鍒楄〃
/// </summary>
/// <returns></returns>
@@ -1567,6 +1571,18 @@
list.Add(VideoDoorLock);
return list;
}
+ /// <summary>
+ /// 褰遍煶涓帶spk鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ public static List<string> GetVideoControlsSPKList()
+ {
+ var list = new List<string>
+ {
+ AvZkAiks
+ };
+ return list;
+ }
/// <summary>
/// 钀ょ煶鎽勫儚澶磗pk鍒楄〃
diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs
index f6aad52..5dbf0f1 100644
--- a/HDL_ON/Entity/FunctionList.cs
+++ b/HDL_ON/Entity/FunctionList.cs
@@ -185,6 +185,16 @@
}
/// <summary>
+ /// 鑾峰彇褰遍煶涓帶鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ public List<Function> GetVideoControlsList()
+ {
+ var spkList = SPK.GetVideoDoorLockSPKList();
+ return Functions.FindAll((obj) => spkList.Contains(obj.spk));
+ }
+
+ /// <summary>
/// 鏂伴鍒楄〃
/// </summary>
/// <returns></returns>
diff --git a/HDL_ON/HDL_ON.projitems b/HDL_ON/HDL_ON.projitems
index f946b7e..f665f1e 100644
--- a/HDL_ON/HDL_ON.projitems
+++ b/HDL_ON/HDL_ON.projitems
@@ -562,6 +562,9 @@
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\VideoDoorLock\VideoDoorlockAudioSetupPage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\VideoDoorLock\VideoDoorlockBatteryManagementPage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\2-Classification\SeriesFunctionListPage.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Aks\AksListPage.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Aks\AksCommonMethod.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Aks\AksPage.cs" />
</ItemGroup>
<ItemGroup>
<Folder Include="$(MSBuildThisFileDirectory)Entity\Device\" />
@@ -591,5 +594,6 @@
<Folder Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Acst\" />
<Folder Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\Face\" />
<Folder Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\CombinedDimming\" />
+ <Folder Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Aks\" />
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index c75fe65..4e8ddcf 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -771,6 +771,13 @@
#endif
functionOnCount = 1;
break;
+ case ShowFunction.Aks:
+ functionCount = FunctionList.List.GetVideoControlsList().Count;
+#if DEBUG
+ functionCount = 1;
+#endif
+ functionOnCount = 1;
+ break;
@@ -1201,10 +1208,24 @@
form.AddForm(list);
};
break;
+ case ShowFunction.Aks:
+ //鍩冨厠鏂奖闊充腑鎺�
+ btnName.TextID = StringId.jiatingyingyuan;
+ btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
+ {
+ var list = HDL_ON.UI.UI2.FuntionControlView.Aks.AksCommonMethod.Current.GetVideoControlsList();
+ var form = new HDL_ON.UI.UI2.FuntionControlView.Aks.AksListPage(() => {
+ functionContentView?.RemoveFromParent();
+ this.RefreshFunctionView();
+ });
+ form.AddForm(list);
+ };
+ break;
}
- //鐣岄潰璺宠浆--闊充箰璺宠浆鑷繁鐨勭晫闈�--鐜璺宠浆鑷繁鐨勭晫闈�--(钀ょ煶瑙嗛闂ㄩ攣)璺宠浆鑷繁鐨勭晫闈�
+ //鐣岄潰璺宠浆--闊充箰璺宠浆鑷繁鐨勭晫闈�--鐜璺宠浆鑷繁鐨勭晫闈�--(钀ょ煶瑙嗛闂ㄩ攣)璺宠浆鑷繁鐨勭晫闈�--鍩冨厠鏂奖闊充腑鎺�
if (item != ShowFunction.VideoDoorLock
+ && item != ShowFunction.Aks
&& item != ShowFunction.Music
&& item != ShowFunction.Environmental
&& item != ShowFunction.SecurityMonitoring
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
index a0ddf37..1c1e568 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
@@ -798,6 +798,7 @@
////钀ょ煶瑙嗛闂ㄩ攣
inputDevice.condition_type = "9";
inputDevice.identifier = this.identifier;
+ inputDevice.condition = new List<Dictionary<string, string>>();
}
else if (device.spk == SPK.SensorPirHold)
{
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
index 5d331cd..58bd067 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
@@ -189,7 +189,7 @@
list.AddRange(list2);
list.AddRange(FunctionList.List.groupControls);
#if DEBUG
- GetTestDevice(ref list, true);
+ //GetTestDevice(ref list, true);
#endif
return list;
}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/AksCommonMethod.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/AksCommonMethod.cs
new file mode 100644
index 0000000..c9b4115
--- /dev/null
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/AksCommonMethod.cs
@@ -0,0 +1,47 @@
+锘縰sing System;
+using HDL_ON.Entity;
+using System.Collections.Generic;
+using Shared;
+using HDL_ON.DAL.Server;
+namespace HDL_ON.UI.UI2.FuntionControlView.Aks
+{
+ /// <summary>
+ /// 褰遍煶涓帶灞忓叕鍏辨柟娉曠被
+ /// </summary>
+ public class AksCommonMethod
+ {
+ private static AksCommonMethod commonMethod = null;
+ /// <summary>
+ /// 鑾峰彇瀵硅薄
+ /// </summary>
+ public static AksCommonMethod Current
+ {
+ get
+ {
+ if (commonMethod == null)
+ {
+ commonMethod = new AksCommonMethod();
+ }
+
+ return commonMethod;
+
+ }
+
+ }
+
+
+ /// <summary>
+ /// 鑾峰彇褰遍煶涓帶灞忓垪琛�
+ /// </summary>
+ /// <returns></returns>
+ public List<Function> GetVideoControlsList()
+ {
+ var list = FunctionList.List.GetVideoControlsList();
+#if DEBUG
+ list.Add(new Function { name = "褰遍煶涓帶灞忎竴", sid = "11111111", spk = SPK.AvZkAiks });
+ list.Add(new Function { name = "褰遍煶涓帶灞忎簩", sid = "22222222", spk = SPK.AvZkAiks });
+#endif
+ return list;
+ }
+ }
+}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/AksListPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/AksListPage.cs
new file mode 100644
index 0000000..7936de1
--- /dev/null
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/AksListPage.cs
@@ -0,0 +1,250 @@
+锘縰sing System;
+using System.Collections.Generic;
+using HDL_ON.Entity;
+using HDL_ON.Stan;
+using HDL_ON.UI.CSS;
+using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock;
+using Shared;
+
+namespace HDL_ON.UI.UI2.FuntionControlView.Aks
+{
+ /// <summary>
+ /// 褰遍煶涓帶鍒楄〃鐣岄潰
+ /// </summary>
+ public class AksListPage : EditorCommonForm
+ {
+ #region 鈻� 鍙橀噺澹版槑___________________________
+
+ /// <summary>
+ /// 褰遍煶涓帶璁惧鍒楄〃
+ /// </summary>
+ private List<Function> listDevice = new List<Function>();
+ /// <summary>
+ /// 鐢垫睜鎺т欢鍒楄〃(key:璁惧鐨剆id)
+ /// </summary>
+ private Dictionary<string, BatteryPersentControl> dicBatteryContr = new Dictionary<string, BatteryPersentControl>();
+ /// <summary>
+ /// 鍒楄〃鎺т欢
+ /// </summary>
+ private VerticalListControl listView = null;
+ /// <summary>
+ /// 鍒犻櫎璁惧鍚庨渶瑕佹洿鏂扮晫闈㈢殑鍥炶皟
+ /// </summary>
+ public Action action;
+
+
+ #endregion
+
+ #region 鈻� 鍒濆鍖朹____________________________
+
+ public AksListPage(Action action)
+ {
+ this.action = action;
+ }
+
+
+ /// <summary>
+ /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
+ /// </summary>
+ /// <param name="i_listDevice">闂ㄩ攣璁惧鍒楄〃</param>
+ public void ShowForm(List<Function> i_listDevice)
+ {
+ this.listDevice.AddRange(i_listDevice);
+ //瀹跺涵褰遍櫌
+ base.SetTitleText(Language.StringByID(StringId.jiatingyingyuan));
+
+ //鍒濆鍖栦腑閮ㄤ俊鎭�
+ this.InitMiddleFrame();
+ }
+
+ /// <summary>
+ /// 鍒濆鍖栦腑閮ㄤ俊鎭�
+ /// </summary>
+ private void InitMiddleFrame()
+ {
+ //娓呯┖bodyFrame
+ this.ClearBodyFrame();
+
+ string nowSelectId = string.Empty;
+ //妤煎眰涓嬫媺鍥炬爣
+ var btnFloor = new NormalViewControl(500, Application.GetRealHeight(16), false);
+ var btnFloorIcon = new IconViewControl(16);
+ btnFloorIcon.X = HdlControlResourse.XXLeft;
+ btnFloorIcon.Y = Application.GetRealHeight(18);
+ btnFloorIcon.UnSelectedImagePath = "Public/DownIcon.png";
+ bodyFrameLayout.AddChidren(btnFloorIcon);
+ btnFloorIcon.ButtonClickEvent += (sender, e) =>
+ {
+ //鏄剧ず涓嬫媺鍒楄〃
+ var form = new FloorRoomSelectPopupView();
+ form.ShowDeviceFunctionView(btnFloor, this.listDevice, (selectId, listFunc) =>
+ {
+ btnFloor.Width = btnFloor.GetRealWidthByText();//閲嶇疆鏂囨湰瀹藉害
+ nowSelectId = selectId;
+ //閲嶆柊鍒濆鍖栧垪琛ㄦ帶浠�
+ this.InitDoorListControl(listFunc);
+
+ }, nowSelectId);
+ };
+ //妤煎眰
+ btnFloor.X = btnFloorIcon.Right + Application.GetRealWidth(2);
+ btnFloor.TextColor = CSS_Color.FirstLevelTitleColor;
+ btnFloor.TextSize = CSS_FontSize.PromptFontSize_FirstLevel;
+ btnFloor.Text = DB_ResidenceData.Instance.CurFloor.roomName;
+ //btnFloor.Width = btnFloor.GetRealWidthByText();
+ bodyFrameLayout.AddChidren(btnFloor);
+ //璁╁畠鐩稿鍥炬爣灞呬腑
+ btnFloor.Y = btnFloorIcon.Y + (btnFloorIcon.Height - btnFloor.Height) / 2;
+ btnFloor.ButtonClickEvent += (sender, e) =>
+ {
+ btnFloorIcon.ButtonClickEvent(null, null);
+ };
+
+ //鍒楄〃鎺т欢
+ this.listView = new VerticalListControl();
+ listView.Y = Application.GetRealHeight(53);
+ listView.Height = bodyFrameLayout.Height - Application.GetRealHeight(53);
+ bodyFrameLayout.AddChidren(listView);
+
+ //鍒濆鍖栧垪琛ㄦ帶浠�
+ this.InitDoorListControl(this.listDevice);
+ }
+
+ #endregion
+
+ #region 鈻� 娣诲姞褰遍煶涓帶鎺т欢_______________________
+
+ /// <summary>
+ /// 鍒濆鍖栧垪琛ㄦ帶浠�
+ /// </summary>
+ private void InitDoorListControl(List<Function> i_listDevice)
+ {
+ this.listView.RemoveAll();
+ this.dicBatteryContr = new Dictionary<string, BatteryPersentControl>();
+
+ //鐢熸垚褰遍煶涓帶鎺т欢
+ foreach (var device in i_listDevice)
+ {
+ this.AddDoorControl(device);
+ }
+ }
+
+ /// <summary>
+ /// 娣诲姞褰遍煶涓帶鎺т欢
+ /// </summary>
+ /// <param name="i_device">闂ㄩ攣瀵硅薄</param>
+ private void AddDoorControl(Function i_device)
+ {
+ //鐧借壊鑳屾櫙瀹瑰櫒
+ var frameBack = new FrameLayoutStatuControl();
+ frameBack.Width = Application.GetRealWidth(343);
+ frameBack.Height = Application.GetRealHeight(96);
+ frameBack.Radius = (uint)Application.GetRealWidth(12);
+ frameBack.Gravity = Gravity.CenterHorizontal;
+ frameBack.BackgroundColor = CSS_Color.MainBackgroundColor;
+ this.listView.AddChidren(frameBack);
+ //鍥炬爣
+ var btnIcon = new IconViewControl(32);
+ btnIcon.X = Application.GetRealWidth(10);
+ btnIcon.Y = Application.GetRealHeight(15);
+ btnIcon.UnSelectedImagePath = "AksIcon/yingyinzhongkong2.png";
+ frameBack.AddChidren(btnIcon, ChidrenBindMode.BindEvent);
+ //璁惧鍚嶅瓧
+ var btnName = new Button();
+ btnName.X = btnIcon.Right + Application.GetRealWidth(12);
+ btnName.Y = Application.GetRealHeight(12);
+ btnName.Width = Application.GetRealWidth(150);
+ btnName.Height = Application.GetRealHeight(20);
+ btnName.TextColor = CSS_Color.FirstLevelTitleColor;
+ btnName.TextAlignment = TextAlignment.CenterLeft;
+ btnName.Text = i_device.name;
+ frameBack.AddChidren(btnName, ChidrenBindMode.BindEvent);
+
+ var btnCollection = new Button()
+ {
+ X = Application.GetRealWidth(299),
+ Y = Application.GetRealHeight(10),
+ Width = Application.GetMinRealAverage(40),
+ Height = Application.GetMinRealAverage(40),
+ SelectedImagePath = "Collection/CollectionIcon.png",
+ UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
+ IsSelected = i_device.collect
+ };
+ frameBack.AddChidren(btnCollection, ChidrenBindMode.BindEvent);
+
+ //鎴块棿
+ var btnRoom = new Button();
+ btnRoom.X = btnName.X;
+ btnRoom.Y = btnName.Bottom + Application.GetRealHeight(4);
+ btnRoom.Width = Application.GetRealWidth(150);
+ btnRoom.Height = Application.GetRealHeight(15);
+ btnRoom.TextColor = CSS_Color.PromptingColor1;
+ btnRoom.TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel;
+ btnRoom.TextAlignment = TextAlignment.CenterLeft;
+ btnRoom.Text = i_device.GetRoomListName();
+ frameBack.AddChidren(btnRoom, ChidrenBindMode.BindEvent);
+ //鐢垫睜鍥炬爣
+ var btnBattery = new BatteryPersentControl();
+ //btnBattery.Y = Application.GetRealHeight(62);
+ //frameBack.AddChidren(btnBattery, ChidrenBindMode.BindEvent);
+ //btnBattery.InitControl();
+ //btnBattery.SetValue(80);
+ //btnBattery.X = frameBack.Width - btnBattery.Width - Application.GetRealWidth(12);
+ this.dicBatteryContr[i_device.sid] = btnBattery;
+
+ EventHandler<MouseEventArgs> CommonClick = (sender, e) =>
+ {
+
+ var form = new AksPage(i_device, btnName, btnRoom, CommonMethod.Comerom.function, () =>
+ {
+ this.CloseForm();
+ this.action?.Invoke();
+ });
+ MainPage.BasePageView.AddChidren(form);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ form.Show();
+
+ };
+ frameBack.MouseUpEventHandler += CommonClick;
+ btnIcon.MouseUpEventHandler += CommonClick;
+ btnName.MouseUpEventHandler += CommonClick;
+ btnRoom.MouseUpEventHandler += CommonClick;
+ //鏀惰棌
+ btnCollection.MouseUpEventHandler += (sender, e) =>
+ {
+ btnCollection.IsSelected = i_device.collect = !btnCollection.IsSelected;
+ i_device.CollectFunction();
+ };
+
+
+
+ //搴曢儴鍐嶅姞涓棿璺�
+ var frameSpace = new FrameLayout();
+ frameSpace.Height = Application.GetRealHeight(12);
+ this.listView.AddChidren(frameSpace);
+ }
+
+ #endregion
+
+
+ #region 鈻� 璁惧鐘舵�佹帹閫乢______________________
+
+ /// <summary>
+ /// 璁惧鐘舵�佹帹閫�
+ /// </summary>
+ /// <param name="i_LocalDevice"></param>
+ public override void DeviceStatuPush(Function i_LocalDevice)
+ {
+ //涓嶆槸鐩爣璁惧
+ if (this.dicBatteryContr.ContainsKey(i_LocalDevice.sid) == false)
+ {
+ return;
+ }
+
+ }
+
+ #endregion
+
+
+ }
+}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/AksPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/AksPage.cs
new file mode 100644
index 0000000..cb0dc58
--- /dev/null
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/AksPage.cs
@@ -0,0 +1,186 @@
+锘縰sing Shared;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using HDL_ON.UI.CSS;
+using HDL_ON.Entity;
+using HDL_ON.DriverLayer;
+using HDL_ON.UI.Music;
+using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock;
+namespace HDL_ON.UI.UI2.FuntionControlView.Aks
+{
+ public class AksPage : FrameLayout
+ {
+ #region 鈻� 鍙橀噺澹版槑___________________________
+ /// <summary>
+ /// 璁惧
+ /// </summary>
+ private Function device;
+ /// <summary>
+ /// 涓婁竴绾х晫闈㈢殑璁惧鍚嶅瓧鎺т欢
+ /// </summary>
+ private Button btnDeviceName;
+ /// <summary>
+ /// 涓婁竴绾х晫闈㈢殑鎴块棿鍚嶅瓧鎺т欢
+ /// </summary>
+ private Button btnRoomName;
+ /// <summary>
+ /// 澶撮儴甯冨眬
+ /// </summary>
+ private TopView topView;
+ /// <summary>
+ /// 褰撳墠璁惧鍚嶇О
+ /// </summary>
+ private Button btnCurrDeviceName;
+ /// <summary>
+ /// 鍖哄煙
+ /// </summary>
+ private Button btnCurrDeviceRoom;
+
+ /// <summary>
+ /// 琛ㄧず鏉ヨ嚜閭ｄ釜鐣岄潰
+ /// </summary>
+ private CommonMethod.Comerom comerom;
+ /// <summary>
+ /// 鍒犻櫎璁惧鍚庨渶瑕佹洿鏂扮晫闈㈢殑鍥炶皟
+ /// </summary>
+ public Action action;
+
+ public VerticalScrolViewLayout vv;
+ #endregion
+ public AksPage()
+ {
+ }
+
+ /// <summary>
+ /// 鏋勯�犲嚱鏁�
+ /// </summary>
+ /// <param name="function">璁惧</param>
+ /// <param name="btnDeviceName">涓婁竴绾х晫闈㈢殑璁惧鍚嶅瓧鎺т欢(娉�:涓嶈兘浼爊ull,娌℃湁鍙互浼爊ew Button())</param>
+ /// <param name="btnRoomName">涓婁竴绾х晫闈㈢殑鎴块棿鍚嶅瓧鎺т欢(娉�:涓嶈兘浼爊ull,娌℃湁鍙互浼爊ew Button())</param>
+ public AksPage(Function function, Button btnDeviceName, Button btnRoomName, CommonMethod.Comerom comerom, Action action)
+ {
+ this.device = function;
+ this.btnDeviceName = btnDeviceName;
+ this.btnRoomName = btnRoomName;
+ this.comerom = comerom;
+ this.action = action;
+
+ }
+
+ public void Show()
+ {
+ //鍒濆鍖朥I
+ this.InitTop();
+ this.InitMiddle();
+ //鍒濆鍖栦簨浠�
+ this.EventListener();
+ //璇诲彇鏁版嵁
+ this.ReadData();
+
+ }
+
+
+ /// <summary>
+ /// 鍒濆鍖栧ご閮ㄧ晫闈�
+ /// </summary>
+ private void InitTop()
+ {
+ this.BackgroundColor = MusicColor.ViewColor;
+ this.topView = new TopView();
+ this.topView.setBtn.Visible = true;
+ this.topView.topNameBtn.Text= this.device.name;
+ this.AddChidren(topView.TopFLayoutView());
+ }
+ /// <summary>
+ /// 鍒濆鍖栦腑閮ㄧ晫闈�
+ /// </summary>
+ private void InitMiddle()
+ {
+ this.vv = new VerticalScrolViewLayout()
+ {
+ Y = topView.fLayout.Bottom,
+ Height = Application.GetRealHeight(H_W.H - H_W.T_Height),
+ };
+ var middleFl = new FrameLayout
+ {
+
+ };
+ this.vv.AddChidren(middleFl);
+
+ var whiteFl = new FrameLayout
+ {
+
+ };
+ middleFl.AddChidren(whiteFl);
+
+ }
+ /// <summary>
+ /// 娉ㄥ唽浜嬩欢
+ /// </summary>
+ private void EventListener()
+ {
+ //杩斿洖
+ this.topView.clickBackBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ this.RemoveFromParent();
+ };
+ //璁剧疆
+ this.topView.clickSetBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ CommonMethod.Current.MainThread(() =>
+ {
+ //璋冪敤绉�缁曠殑鐣岄潰
+ var infoView = new UI.FunctionBaseInfoSetPage(this.device, () =>
+ {
+ if (this.btnDeviceName == null || this.btnRoomName == null || this.device == null)
+ {
+ return;
+ }
+ ////鍒锋柊鏄剧ず
+ this.btnDeviceName.Text = this.device.name;
+ this.btnRoomName.Text = this.device.GetRoomListName();
+ this.btnCurrDeviceName.Text = this.device.name;
+ this.btnCurrDeviceRoom.Text = this.device.GetRoomListName();
+ //this.CalculatedPosition();//閲嶆柊璁＄畻瀹藉害
+
+ });
+ infoView.actionDel += () =>
+ {
+ //瑙ｇ粦璁惧鍚�
+ this.RemoveFromParent();
+ this.action?.Invoke();
+
+ };
+ MainPage.BasePageView.AddChidren(infoView);
+ infoView.LoadPage();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ });
+ };
+
+
+ }
+ /// <summary>
+ /// 鍒濆鏁版嵁
+ /// </summary>
+ private void ReadData()
+ {
+ CommonMethod.Current.Loading.Start();
+ CommonMethod.Current.SunThread(() =>
+ {
+ try
+ {
+
+ }
+ catch { }
+ finally
+ {
+ Application.RunOnMainThread(() =>
+ {
+ CommonMethod.Current.Loading.Hide();
+ });
+ }
+ });
+ }
+ }
+}
--
Gitblit v1.8.0