Merge branch 'WJC' into temp-wxr

wxr

2021-06-06 dc8967247d149e9b0d1f8e75829928db0ea1fe13

Merge branch 'WJC' into temp-wxr

 .vs/HDL_APP_Project/xs/UserPrefs.xml

@@ -1,30 +1,13 @@
<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.6242be7109c740c6cb8999a8904b6e0ea8d45192" />
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/DriverLayer/Control.cs">
<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.FE1D0763-7181-4B0C-AB18-E30AA773A6FA" />
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs">
    <Files>
      <File FileName="HDL_ON/Common/R.cs" Line="9" Column="19" />
      <File FileName="HDL-ON_iOS/Resources/Language.ini" />
      <File FileName="HDL-ON_Android/Assets/Language.ini" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs" />
      <File FileName="HDL_ON/UI/MainPage.cs" />
      <File FileName="HDL-ON_iOS/Info.plist" />
      <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" />
      <File FileName="HDL_ON/UI/UI0-Stan/Form/Base/EditorCommonForm.cs" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorMegahealth/SenesorMegahealthManagerPage.cs" />
      <File FileName="HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs" />
      <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs" />
      <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs" />
      <File FileName="HDL_ON/UI/UI2/FuntionControlView/ArmSensor/ArmSensorHistroyPaging.cs" />
      <File FileName="HDL_ON/UI/UI0-Stan/Form/DeviceFunctionCardCommonForm.cs" />
      <File FileName="HDL_ON/UI/UI2/FuntionControlView/ArmSensor/SenesorMegahealthPage.cs" />
      <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" Line="675" Column="34" />
      <File FileName="HDL_ON/DAL/Server/NewApiRes.cs" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs" />
      <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs" />
      <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" />
      <File FileName="HDL_ON/DAL/Server/NewAPI.cs" />
      <File FileName="HDL_ON/DAL/Mqtt/MqttClient.cs" Line="424" Column="69" />
      <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs" Line="41" Column="68" />
      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs" Line="93" Column="28" />
      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs" Line="618" Column="19" />
      <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" Line="203" Column="61" />
      <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="155" Column="18" />
      <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs" Line="229" Column="40" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
@@ -32,16 +15,21 @@
          <Node name="HDL_APP_Project" expanded="True">
            <Node name="HDL_ON" expanded="True">
              <Node name="DAL" expanded="True">
                <Node name="DriverLayer" expanded="True">
                  <Node name="Control.cs" selected="True" />
                </Node>
                <Node name="Mqtt" expanded="True" />
                <Node name="Server" expanded="True" />
              </Node>
              <Node name="Entity" expanded="True">
                <Node name="Function" expanded="True" />
              <Node name="UI" expanded="True">
                <Node name="UI1-Login" expanded="True" />
                <Node name="UI2" expanded="True">
                  <Node name="3-Intelligence" expanded="True">
                    <Node name="Automation" expanded="True" />
              </Node>
              <Node name="UI" expanded="True" />
                  <Node name="FuntionControlView" expanded="True">
                    <Node name="Video" expanded="True">
                      <Node name="VideoMainView.cs" selected="True" />
                    </Node>
                  </Node>
                </Node>
              </Node>
            </Node>
          </Node>
        </State>
@@ -54,18 +42,10 @@
    <String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String>
    <String>Shared.IOS/Shared.IOS.csproj</String>
  </DisabledProjects>
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
  <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" />
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
  <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.4b65c4650918" />
  <MonoDevelop.Ide.DebuggingService.Breakpoints>
    <BreakpointStore>
      <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs" line="34" column="1" />
      <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs" line="313" column="1" />
      <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/BindingResidence/BindingResidencePage.cs" relfile="HDL_ON/UI/BindingResidence/BindingResidencePage.cs" line="121" column="1" />
      <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/Server/HttpServerRequest.cs" relfile="HDL_ON/DAL/Server/HttpServerRequest.cs" line="1857" column="1" />
      <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorMegahealth/AddSenesorMegahealthDirection1Page.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorMegahealth/AddSenesorMegahealthDirection1Page.cs" line="119" column="1" />
      <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/Mqtt/MqttClient.cs" relfile="HDL_ON/DAL/Mqtt/MqttClient.cs" line="678" column="1" />
      <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/DriverLayer/Control.cs" relfile="HDL_ON/DAL/DriverLayer/Control.cs" line="673" column="1" />
    </BreakpointStore>
    <BreakpointStore />
  </MonoDevelop.Ide.DebuggingService.Breakpoints>
  <MultiItemStartupConfigurations />
</Properties>

 HDL-ON_Android/Assets/Language.ini

@@ -20,7 +20,7 @@
19=The phone number is incorrect. Please re-enter.
20=The password and confirmation you typed do not match. Please re-enter your password.
21=The password format does not comply with the requirements, please enter again.
22=The user has existed, yo24-hour defenseu can sign in directly.
22=The user has existed, you can sign in directly.
23=Incorrect verification code, please re-enter.
24=Incorrect account number, please enter the correct email address.
25=Email address
@@ -74,7 +74,7 @@
73=Floor Management
74=Room Management
75=Administrator migration
76=Privilege Migration
76=Administrator privilege migration
77=Debugging privilege
78=The administrator is migrated to other user.
79=All of the data for the residence is migrated to new user.
@@ -188,8 +188,8 @@
187=Fan
188=Socket
189=Level
190=Chl
191=Vol
190=Channel
191=Volume
192=TV
193=The room has existed, fail to change.
194=Environment
@@ -423,43 +423,10 @@
436=Added Devices
437=Device List
438=humidity:{0}%    air:{1}    wind:{2}
439=Real time power consumption: {0} kw
440=Next step
441=Please select all areas of capture status
442=Generate Scene
443=Custom deployment
444=SecurityCenter
445=House Defense
446=At Home Defense
447=Vacation Defense
448=Fixed deployment
449=*Undo defense does not affect
450=Disaster defense
451=24-hour defense
452=Burglar alarm
453=Alarm mute
454=Deployment information
455=The name can not be blank.
456=Canvas
457=Energy consumption
458=Date
459=Real time energy consumption
460=Energy consumption of this month
461=Outdoor/Indoor
462=You haven't added any devices yet
'
463=Please input the SN code of the device
464=Can start using Zhaoguan millimeter wave
465=Delete device
466=STB
467=Projector
468=Someone fell
469=Someone's in
'
470=Under protection
471=Millimeter wave sensor

1000=Room Humidity


1000=Indoor Humidity
1001=V-chip
1002=Anion
1003=Sterilization
@@ -548,10 +515,6 @@
1085=2nd Gear
1086=3rd Gear





4000=Video intercom
4001=Call record
4002=*Cloud photos are only kept for 30 days
@@ -567,10 +530,6 @@
4012=The configuration parameters are abnormal!
4013=Access Control QR Code
4014=Temporary password





5000=Music
5001=Group
@@ -620,6 +579,7 @@
5045=General volume
5046=Adjust volume
5047="QQ music" has not installed in your cell phone, please proceed in App center.
	

6000=normal
6001=Device status
@@ -714,53 +674,6 @@
6092=The device does not exist
6093=The device is not online
6094=The gateway device does not exist
 
 
7108=Leak/No Leak
7109=Leak
7110=No leak
7111=Water leaking/no water leaking
7112=Water leaking
7113=No water leaking
7114=Someone/Nobody
7115=Someone
7116=Nobody
7117=Open/Close
7118=On
7119=Close
7120=Anti-dismantling function
7121=Online
7122=Not online
7123=Air quality
7124=Excellent
7125=Good
7126=Poor
7127=Send notification
7128=Notification content
7129=(within 100 characters)
7130=Account selection
7131=App push
7132=Automation
7133=Executed


6000=Rename
6001=Please enter a name
6002=Xiaodu
6003=aispeech
6004="Unbind requires a third-party APP for operation", "transfer to a third-party APP"
6005=Unbind
6006=Smart speaker
6007=Control content
6008=Failed to upload data
6009=Failed to configure data
6010="There is no speaker yet,", "Please go to the third-party APP to bind the smart speaker."
6011=Modification of remarks is unsuccessful!
6012=Do you want to unbind?
6013=Unbinding...
6014=transfer to third-party APP
6015=Add speakers

    
7000=Create automation
7001=Edit automation
@@ -870,6 +783,34 @@
7105=Light pollution: 75 ~ 115ug/m3
7106=Moderate pollution: 115 ~ 150ug/m3
7107=Heavy pollution: > 150ug/m3
7108=Leak/No Leak
7109=Leak
7110=No leak
7111=Water leaking/no water leaking
7112=Water leaking
7113=No water leaking
7114=Someone/Nobody
7115=Someone
7116=Nobody
7117=Open/Close
7118=On
7119=Close
7120=Anti-dismantling function
7121=Online
7122=Not online
7123=Air quality
7124=Excellent
7125=Good
7126=Poor
7127=Send notification
7128=Notification content
7129=(within 100 characters)
7130=Account selection
7131=App push
7132=Automation
7133=Executed
7134=Target State
7135=Tumble
    
9000=Please sign in with new cell phone number.
9001=Please sign in with new email address.
@@ -912,7 +853,7 @@
9038=(Frequently Asked Questions)
9039=Share and function
9040=Alerts
9041=System info
9041=System info.
9042=Information Center
9043=Please note that your account number is logged in elsewhere. If it is not made by yourself, please change the password immediately.
9044=Successfully uploaded
@@ -936,11 +877,6 @@
9061=Find your password by clicking on "Forgot Password", or try again in {0} minute.
9062=Check
9063=You still have {0} times.
9064=Smart speaker
9065=Data management
9066=Remarks
9067=Remarks cannot be blank.
9068=Do you want to unbind?
    
10000=Invalid password, please log in again.
10001=Fail to request server, please try again later.
@@ -1306,7 +1242,7 @@
324=场景延时
325=延时设置
326=延时
327=捕捉场景
327=捕获场景
328=电影场景
329=普通
330=自动模式
@@ -1402,39 +1338,6 @@
437=设备列表
438=湿度:{0}%    空气:{1}    风速:{2}级
439=实时功耗: {0}kW
440=下一步
441=请选择捕捉状态的区域
442=生成场景
443=自定义布防
444=安防中心
445=全宅布防
446=在家布防
447=假期布防
448=固定布防
449=*不受撤防影响
450=灾害报警
451=24小时不撤防
452=防盗报警
453=报警静音
454=布防信息
455=名称不能为空。
456=画布
457=能耗
458=日期
459=实时能耗
460=本月能耗
461=室外/室内
462=您当前还未添加任何设备
463=请输入设备机上的sn码
464=可以开始使用兆观毫米波了
465=删除设备
466=机顶盒
467=投影仪
468=有人跌倒
469=有人进入
470=防护中
471=毫米波传感器


1000=室内湿度
1001=童锁
@@ -1525,6 +1428,7 @@
1086=风速3档



4000=可视对讲
4001=通话记录
4002=*云端照片只保留30天
@@ -1540,6 +1444,7 @@
4012=配置参数有异常!
4013=门禁二维码
4014=临时密码


5000=音乐
5001=组合
@@ -1821,6 +1726,9 @@
7131=App推送
7132=自动化
7133=已执行
7134=目标状态
7135=跌倒


9000=请使用新的手机账号登录APP
9001=请使用新的邮箱账号登录APP
@@ -1886,11 +1794,6 @@
9061=请通过忘记密码找回密码或{0}分钟后重试.
9062=查看
9063=还有{0}次机会。
9064=智能音箱
9065=数据管理
9066=备注
9067=备注不能为空
9068=是否解除绑定？

10000=无效登录密钥，请重新登录！
10001=请求服务器失败，请稍后再试！

 HDL-ON_Android/Properties/AndroidManifest.xml

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202105255" android:versionName="1.2.202105255" package="com.hdl.onpro">
    <uses-sdk android:minSdkVersion="26" android:targetSdkVersion="29" />
    <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="29" />
    <!--  可视对讲权限-->
    <uses-permission android:name="android.permission.CAMERA" />
    <uses-feature android:name="android.hardware.camera" />

 HDL-ON_iOS/Resources/Language.ini

@@ -20,7 +20,7 @@
19=The phone number is incorrect. Please re-enter.
20=The password and confirmation you typed do not match. Please re-enter your password.
21=The password format does not comply with the requirements, please enter again.
22=The user has existed, yo24-hour defenseu can sign in directly.
22=The user has existed, you can sign in directly.
23=Incorrect verification code, please re-enter.
24=Incorrect account number, please enter the correct email address.
25=Email address
@@ -74,7 +74,7 @@
73=Floor Management
74=Room Management
75=Administrator migration
76=Privilege Migration
76=Administrator privilege migration
77=Debugging privilege
78=The administrator is migrated to other user.
79=All of the data for the residence is migrated to new user.
@@ -188,8 +188,8 @@
187=Fan
188=Socket
189=Level
190=Chl
191=Vol
190=Channel
191=Volume
192=TV
193=The room has existed, fail to change.
194=Environment
@@ -423,43 +423,10 @@
436=Added Devices
437=Device List
438=humidity:{0}%    air:{1}    wind:{2}
439=Real time power consumption: {0} kw
440=Next step
441=Please select all areas of capture status
442=Generate Scene
443=Custom deployment
444=SecurityCenter
445=House Defense
446=At Home Defense
447=Vacation Defense
448=Fixed deployment
449=*Undo defense does not affect
450=Disaster defense
451=24-hour defense
452=Burglar alarm
453=Alarm mute
454=Deployment information
455=The name can not be blank.
456=Canvas
457=Energy consumption
458=Date
459=Real time energy consumption
460=Energy consumption of this month
461=Outdoor/Indoor
462=You haven't added any devices yet
'
463=Please input the SN code of the device
464=Can start using Zhaoguan millimeter wave
465=Delete device
466=STB
467=Projector
468=Someone fell
469=Someone's in
'
470=Under protection
471=Millimeter wave sensor

1000=Room Humidity


1000=Indoor Humidity
1001=V-chip
1002=Anion
1003=Sterilization
@@ -548,10 +515,6 @@
1085=2nd Gear
1086=3rd Gear





4000=Video intercom
4001=Call record
4002=*Cloud photos are only kept for 30 days
@@ -567,10 +530,6 @@
4012=The configuration parameters are abnormal!
4013=Access Control QR Code
4014=Temporary password





5000=Music
5001=Group
@@ -620,6 +579,7 @@
5045=General volume
5046=Adjust volume
5047="QQ music" has not installed in your cell phone, please proceed in App center.
	

6000=normal
6001=Device status
@@ -714,53 +674,6 @@
6092=The device does not exist
6093=The device is not online
6094=The gateway device does not exist
 
 
7108=Leak/No Leak
7109=Leak
7110=No leak
7111=Water leaking/no water leaking
7112=Water leaking
7113=No water leaking
7114=Someone/Nobody
7115=Someone
7116=Nobody
7117=Open/Close
7118=On
7119=Close
7120=Anti-dismantling function
7121=Online
7122=Not online
7123=Air quality
7124=Excellent
7125=Good
7126=Poor
7127=Send notification
7128=Notification content
7129=(within 100 characters)
7130=Account selection
7131=App push
7132=Automation
7133=Executed


6000=Rename
6001=Please enter a name
6002=Xiaodu
6003=aispeech
6004="Unbind requires a third-party APP for operation", "transfer to a third-party APP"
6005=Unbind
6006=Smart speaker
6007=Control content
6008=Failed to upload data
6009=Failed to configure data
6010="There is no speaker yet,", "Please go to the third-party APP to bind the smart speaker."
6011=Modification of remarks is unsuccessful!
6012=Do you want to unbind?
6013=Unbinding...
6014=transfer to third-party APP
6015=Add speakers

    
7000=Create automation
7001=Edit automation
@@ -870,6 +783,34 @@
7105=Light pollution: 75 ~ 115ug/m3
7106=Moderate pollution: 115 ~ 150ug/m3
7107=Heavy pollution: > 150ug/m3
7108=Leak/No Leak
7109=Leak
7110=No leak
7111=Water leaking/no water leaking
7112=Water leaking
7113=No water leaking
7114=Someone/Nobody
7115=Someone
7116=Nobody
7117=Open/Close
7118=On
7119=Close
7120=Anti-dismantling function
7121=Online
7122=Not online
7123=Air quality
7124=Excellent
7125=Good
7126=Poor
7127=Send notification
7128=Notification content
7129=(within 100 characters)
7130=Account selection
7131=App push
7132=Automation
7133=Executed
7134=Target State
7135=Tumble
    
9000=Please sign in with new cell phone number.
9001=Please sign in with new email address.
@@ -912,7 +853,7 @@
9038=(Frequently Asked Questions)
9039=Share and function
9040=Alerts
9041=System info
9041=System info.
9042=Information Center
9043=Please note that your account number is logged in elsewhere. If it is not made by yourself, please change the password immediately.
9044=Successfully uploaded
@@ -936,11 +877,6 @@
9061=Find your password by clicking on "Forgot Password", or try again in {0} minute.
9062=Check
9063=You still have {0} times.
9064=Smart speaker
9065=Data management
9066=Remarks
9067=Remarks cannot be blank.
9068=Do you want to unbind?
    
10000=Invalid password, please log in again.
10001=Fail to request server, please try again later.
@@ -1306,7 +1242,7 @@
324=场景延时
325=延时设置
326=延时
327=捕捉场景
327=捕获场景
328=电影场景
329=普通
330=自动模式
@@ -1402,39 +1338,6 @@
437=设备列表
438=湿度:{0}%    空气:{1}    风速:{2}级
439=实时功耗: {0}kW
440=下一步
441=请选择捕捉状态的区域
442=生成场景
443=自定义布防
444=安防中心
445=全宅布防
446=在家布防
447=假期布防
448=固定布防
449=*不受撤防影响
450=灾害报警
451=24小时不撤防
452=防盗报警
453=报警静音
454=布防信息
455=名称不能为空。
456=画布
457=能耗
458=日期
459=实时能耗
460=本月能耗
461=室外/室内
462=您当前还未添加任何设备
463=请输入设备机上的sn码
464=可以开始使用兆观毫米波了
465=删除设备
466=机顶盒
467=投影仪
468=有人跌倒
469=有人进入
470=防护中
471=毫米波传感器


1000=室内湿度
1001=童锁
@@ -1525,6 +1428,7 @@
1086=风速3档



4000=可视对讲
4001=通话记录
4002=*云端照片只保留30天
@@ -1540,6 +1444,7 @@
4012=配置参数有异常!
4013=门禁二维码
4014=临时密码


5000=音乐
5001=组合
@@ -1821,6 +1726,8 @@
7131=App推送
7132=自动化
7133=已执行
7134=目标状态
7135=跌倒

9000=请使用新的手机账号登录APP
9001=请使用新的邮箱账号登录APP
@@ -1886,11 +1793,6 @@
9061=请通过忘记密码找回密码或{0}分钟后重试.
9062=查看
9063=还有{0}次机会。
9064=智能音箱
9065=数据管理
9066=备注
9067=备注不能为空
9068=是否解除绑定？

10000=无效登录密钥，请重新登录！
10001=请求服务器失败，请稍后再试！

 HDL_ON/Common/R.cs

@@ -1178,6 +1178,8 @@
        public const int apptuisong = 7131;
        public const int zidontghua = 7132;
        public const int yizhixing = 7133;
        public const int mubiaozhuangtai = 7134;
        public const int diedao = 7135;

        #region LE新增
        /// <summary>

 HDL_ON/DAL/Server/HttpUtil.cs

@@ -153,7 +153,7 @@
                {
                    urlHead = OnAppConfig.Instance.RequestHttpsHost;
                }
                //"https://test-gz.hdlcontrol.com";
                urlHead="https://test-gz.hdlcontrol.com";
                //"https://bahrain-gateway.hdlcontrol.com";
                //urlHead="https://china-gateway.hdlcontrol.com";
                string requestFullUrl = urlHead + apiPath;

 HDL_ON/Entity/Function/Function.cs

@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using HDL_ON.Common;
using HDL_ON.DAL.Server;
@@ -1169,7 +1169,6 @@
        /// 毫米波传感器
        /// </summary>
        public const string SenesorMegahealth = "sensor.megahealth";


        /// <summary>
        /// 安防传感器spk列表

 HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs

@@ -1,4 +1,5 @@
using System;
using System.Collections.Generic;
using Shared;
namespace HDL_ON.UI.UI2.Intelligence.Automation
{
@@ -58,6 +59,7 @@
            {
                viewLayout.AddChidren(shiwaiView.FLayoutView());
            }
           
            #endregion

            #region  所有点击事件

 HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs

@@ -175,6 +175,21 @@
                        }
                    }
                    break;
                case SPK.SenesorMegahealth:
                    {
                        LogicView.FunTypeView view = new LogicView.FunTypeView();
                        view.btnText.TextID = StringId.mubiaozhuangtai ;//目标状态
                        fLayout.AddChidren(view.FLayoutView());
                        view.btnClick.MouseUpEventHandler += (sender, e) =>
                        {
                            DeviceView(device, view.btnState, StringId.wuren, StringId.diedao);
                        };
                        if (edit)
                        {
                            GetEditState(device, index, view.btnState, null, null, null);
                        }
                    }
                    break;

            }
            #region  保存
@@ -268,6 +283,11 @@
                            keyVlaue = "status";
                        }
                        break;
                    case SPK.SenesorMegahealth:
                        {
                            keyVlaue = "action_state";
                        }
                        break;

                }
                switch (intValue)
@@ -294,12 +314,21 @@
                            value = "off";
                        }
                        break;
                    case StringId.youren: {
                    case StringId.youren:
                        {
                            value = "true";
                        }
                        break;
                    case StringId.wuren: {
                    case StringId.wuren:
                        {
                            if (device.spk == SPK.SenesorMegahealth)
                            {
                                value = "uninhabited";
                            }
                            else
                            {
                            value = "false";
                            }
                        }
                        break;
                    case StringId.kaiqi:
@@ -312,7 +341,8 @@
                            value = "close";
                        }
                        break;
                    case StringId.zaixian: {
                    case StringId.zaixian:
                        {
                            keyVlaue = "dismantle";
                            value = "true";
                        };break;
@@ -321,6 +351,10 @@
                            keyVlaue = "dismantle";
                            value = "false";
                        }; break;
                    case StringId.diedao:
                        {
                            value = "fall";
                        }; break;
                }
                //显示文本
                button.TextID = intValue;

 HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs

@@ -297,6 +297,22 @@
                                        inputView.btnState.Text = str;
                                    }
                                    break;
                                case SPK.SenesorMegahealth:
                                    {
                                        foreach (var dic in dicList)
                                        {
                                            string value = dic["value"];
                                            if (value == "fall")
                                            {
                                                inputView.btnState.Text = Language.StringByID(StringId.diedao);
                                            }
                                            else
                                            {
                                                inputView.btnState.Text = Language.StringByID(StringId.wuren);
                                            }
                                        }
                                    }
                                    break;

                            }
                        }
@@ -1371,6 +1387,22 @@
                        }
                    }
                    break;
                case SPK.SenesorMegahealth:
                    {
                        foreach (var dic in dicList)
                        {
                            string value = dic["value"];
                            if (value == "fall")
                            {
                                button1.Text = Language.StringByID(StringId.diedao);
                            }
                            else
                            {
                                button1.Text = Language.StringByID(StringId.wuren);
                            }
                        }
                    }
                    break;
            }
        }
        /// <summary>

 HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs

@@ -308,6 +308,7 @@
                case SPK.SensorPir:
                case SPK.SensorDoorWindow:
                case SPK.SensoruUtrasonic:
                case SPK.SenesorMegahealth:
                    {
                        strPath = "LogicIcon/sensor.png";
                    }
@@ -365,6 +366,7 @@
            || device.spk == SPK.SensorPir
            || device.spk == SPK.SensorDoorWindow
            || device.spk == SPK.SensoruUtrasonic
            || device.spk == SPK.SenesorMegahealth
            );
            if (sensor != null)
            {
@@ -414,6 +416,7 @@
                functionTypeList.Add(SPK.SensorPir);
                functionTypeList.Add(SPK.SensorDoorWindow);
                functionTypeList.Add(SPK.SensoruUtrasonic);
                functionTypeList.Add(SPK.SenesorMegahealth);
              
            }
            return functionTypeList;
@@ -449,6 +452,7 @@
                        deviceTypeList.Add(SPK.SensorPir);
                        deviceTypeList.Add(SPK.SensorDoorWindow);
                        deviceTypeList.Add(SPK.SensoruUtrasonic);
                        deviceTypeList.Add(SPK.SenesorMegahealth);
                    }
                    break;
                case target_if:

 HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs

@@ -511,7 +511,7 @@
            }
        }
        /// <summary>
        /// 判断网关类型
        /// 判断网关类型(0:bus网关；1:A协议网关)
        /// </summary>
        /// <returns></returns>
        public static bool IsGatewayType
@@ -522,11 +522,7 @@
                {
                    return true;
                }
                else
                {
                    return false;

                }
            }
        }
    }

 HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs

@@ -164,14 +164,13 @@
                logicIfon.Add("pushConfigs", pushConfigsArray);
                logicjArray.Add(logicIfon);
                var jObject = new JObject { { "homeId", LogicMethod.HomeId }, { "logics", logicjArray } };
                responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_Logic_Add);
                responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_Logic_Add,5);
                //如果是token过期则刷新token
                if (responsePackNew.Code == StateCode.TOKEN_EXPIRED)
                {
                    RefreshToken();
                    AddLogic(logic);
                }
                Console.WriteLine("添加逻辑===" + logicjArray);
            }
            catch (Exception e)
            {
@@ -275,7 +274,7 @@

                logicjArray.Add(logicIfon);
                var jObject = new JObject { { "homeId", LogicMethod.HomeId }, { "logics", logicjArray } };
                responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_Logic_Update);
                responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_Logic_Update,5);
                //如果是token过期则刷新token
                if (responsePackNew.Code == StateCode.TOKEN_EXPIRED)
                {

 HDL_ON/UI/UI2/3-Intelligence/Automation/Weather.cs

@@ -45,7 +45,6 @@
            weatherView.btnLine.Width = Application.GetRealWidth(375 - 16 - 16);
            weatherView.btnText.TextID = StringId.tianqibianhua;
            viewLayout.AddChidren(weatherView.FLayoutView());

            //空气质量
            LogicView.SelectTypeView kongqiViewk = new LogicView.SelectTypeView(); 
            kongqiViewk.frameLayout.Y = weatherView.frameLayout.Bottom;
@@ -56,7 +55,6 @@
            kongqiViewk.btnText.TextID = StringId.kongqizhiliang;
            viewLayout.AddChidren(kongqiViewk.FLayoutView());
            #endregion

            #region  所有点击事件
            //室外温、湿度、PM2.5变化
            airqualityView.btnClick.MouseUpEventHandler += (sen, e) => {

 HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs

@@ -148,6 +148,7 @@
            };
            fLayout.AddChidren(succeedBtn);
            #endregion

            #region 点击事件
            //表示库列表索引值(目前只20个库)
            int index = 1; 
@@ -215,7 +216,6 @@
                {
                    var library = libraryList[index-1];
                    var control = GetControl(spk, testBtn.TextID, library);

                    if (spk == SPK.TvIr)
                    {
                        //备注：伟南要求小米电视换掉spk=ir.tvxm（听说是临时解决方案）
@@ -229,8 +229,6 @@
                            }
                        }
                    }


                    PirMethod method = new PirMethod();
                    //发送库添加遥控器命令
                    method.ThreadAddControl(control, this, (device) =>  

 HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs

@@ -35,8 +35,8 @@
            pageView.AddChidren(view1);
            var view2 = new FrameLayout();
            pageView.AddChidren(view2);
            View1(view1, listVideo, video);
            View2(view2, listCall, video);
            ViewFrameLayout1(view1, listVideo, video);
            ViewFrameLayout2(view2, listCall, video);
            Button btn11 = new Button
            {
                X = Application.GetRealWidth(170),
@@ -113,8 +113,10 @@
        /// <param name="view1">父控件</param>
        /// <param name="list">门口机列表</param>
        /// <param name="videoClouds">当前的可视对讲</param>
        void View1(FrameLayout view1, List<FlVideo> list, VideoClouds videoClouds)
        void ViewFrameLayout1(FrameLayout view1, List<FlVideo> list, VideoClouds videoClouds)
        {


            #region 布局界面
            var bjFl = new FrameLayout
            {
@@ -220,17 +222,16 @@
                #region
                var fLayout = new FrameLayout
                {
                    Width = Application.GetRealWidth(50),
                    Width = Application.GetRealWidth(96),
                    Height = Application.GetRealWidth(48),
                    X = Application.GetRealWidth(31 + (58 + 50) * j),
                    X = Application.GetRealWidth(20 + (26 + 28 + 42) * j),
                    Y = Application.GetRealHeight(20 + (48 + 24) * line),

                };
                fL.AddChidren(fLayout);

                var iconBtn = new Button
                {
                    X = Application.GetRealWidth(11),
                    Gravity=Gravity.CenterHorizontal,
                    Width = Application.GetRealWidth(28),
                    Height = Application.GetRealWidth(28),
                    UnSelectedImagePath = "VideoIcon/weiqiangji.png",
@@ -240,7 +241,8 @@
                var deviceNameBtn = new Button
                {
                    Y = iconBtn.Bottom + Application.GetRealHeight(6),
                    Width = Application.GetRealWidth(50),
                    X = Application.GetRealWidth(6),
                    Width = Application.GetRealWidth(96-12),
                    Height = Application.GetRealHeight(14),
                    TextSize = TextSize.Text10,
                    TextColor = CSS.CSS_Color.TextualColor,
@@ -306,7 +308,7 @@
        /// <param name="view2">父控件</param>
        /// <param name="listCall">通话记录列表</param>
        /// <param name="video">当前的可视对讲</param>
        void View2(FrameLayout view2, List<CallView> listCall, VideoClouds video)
        void ViewFrameLayout2(FrameLayout view2, List<CallView> listCall, VideoClouds video) 
        {

            var bjFl = new FrameLayout