From a9d1161b1df96e7ddad566335989a1444e433ef5 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 28 三月 2023 11:54:45 +0800
Subject: [PATCH] 2023年03月28日11:52:02
---
HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs | 5 +
/dev/null | 0
HDL-ON_iOS/Resources/Language.ini | 25 ++++++
HDL_ON/DAL/Server/NewAPI.cs | 40 ++++++++++
HDL-ON_Android/Assets/Language.ini | 35 ++++++++
HDL_ON/Common/HDLCommon.cs | 15 +++
HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs | 26 ++++++
HDL_ON/Common/R.cs | 54 +++++++++++++
HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs | 11 +-
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs | 4
10 files changed, 206 insertions(+), 9 deletions(-)
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index 696bd27..b5023d4 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -1122,6 +1122,21 @@
7167=main switch
7168=PM10
+8501=Video door lock
+8502=Electric quantity
+8503=The door is now closed
+8504=The door is not closed
+8505=RVC
+8506=One click to open the lock
+8507=Temporary password
+8508=History
+8509=Fluorite video door lock
+8510=Call from the doorbell
+8511=User Education
+
+
+
+
@@ -2348,6 +2363,26 @@
7168=PM10
+8501=瑙嗛闂ㄩ攣
+8502=鐢甸噺
+8503=褰撳墠闂ㄥ凡鍏�
+8504=褰撳墠闂ㄦ湭鍏�
+8505=瀹炴椂瑙嗛
+8506=涓�閿紑閿�
+8507=涓存椂瀵嗙爜
+8508=鍘嗗彶璁板綍
+8509=钀ょ煶瑙嗛闂ㄩ攣
+8510=鏉ヨ嚜鈥滈棬閾冣�濆懠鍙�
+8511=鐢ㄦ埛浜哄憳
+
+
+
+
+
+
+
+
+
9000=璇蜂娇鐢ㄦ柊鐨勬墜鏈鸿处鍙风櫥褰旳PP
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/DoorLock/History.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/DoorLock/History.png
deleted file mode 100644
index 7609540..0000000
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/DoorLock/History.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index 60578a8..ed95171 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -1122,6 +1122,19 @@
7167=main switch
7168=PM10
+8501=Video door lock
+8502=Electric quantity
+8503=The door is now closed
+8504=The door is not closed
+8505=RVC
+8506=One click to open the lock
+8507=Temporary password
+8508=History
+8509=Fluorite video door lock
+8510=Call from the doorbell
+8511=User Education
+
+
@@ -2348,6 +2361,18 @@
7167=鎬绘帶寮�鍏�
7168=PM10
+8501=瑙嗛闂ㄩ攣
+8502=鐢甸噺
+8503=褰撳墠闂ㄥ凡鍏�
+8504=褰撳墠闂ㄦ湭鍏�
+8505=瀹炴椂瑙嗛
+8506=涓�閿紑閿�
+8507=涓存椂瀵嗙爜
+8508=鍘嗗彶璁板綍
+8509=钀ょ煶瑙嗛闂ㄩ攣
+8510=鏉ヨ嚜鈥滈棬閾冣�濆懠鍙�
+8511=鐢ㄦ埛浜哄憳
+
diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs
index afe7b93..6d00e2d 100644
--- a/HDL_ON/Common/HDLCommon.cs
+++ b/HDL_ON/Common/HDLCommon.cs
@@ -386,6 +386,21 @@
{
ShowAlarmPushMessage(jpushMessageInfo, false);
}
+ else if (jpushMessageInfo.messageType.Contains(PushMessageType.DOOR_BELL.ToString()))
+ {
+ try
+ {
+ if (string.IsNullOrEmpty(jpushMessageInfo.expantContent)) return;
+ var expantContent = Newtonsoft.Json.JsonConvert.DeserializeObject<UI.UI2.FuntionControlView.VideoDoorLock.ExpantContent>(jpushMessageInfo.expantContent);
+ if (expantContent == null)
+ {
+ return;
+ }
+ ///瑙嗛闂ㄩ攣
+ HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.SkipRTVActivity(expantContent.devSerial, expantContent.deviceId,expantContent.spk,true);
+ }
+ catch { }
+ }
}
}
catch (Exception EX)
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index b8519cc..feddcc3 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -3062,7 +3062,59 @@
/// <summary>
/// PM210
/// </summary>
- public const int pm10= 7168;
+ public const int pm10 = 7168;
+
+ /// <summary>
+ /// 瑙嗛闂ㄩ攣
+ /// </summary>
+ public const int shipinmensuo = 8501;
+ /// <summary>
+ /// 鐢甸噺
+ /// </summary>
+ public const int dianliang = 8502;
+ /// <summary>
+ /// 褰撳墠闂ㄥ凡鍏�
+ /// </summary>
+ public const int dangqianmenyiguan = 8503;
+ /// <summary>
+ /// 褰撳墠闂ㄦ湭鍏�
+ /// </summary>
+ public const int dangqianmenweiguan = 8504;
+ /// <summary>
+ /// 瀹炴椂瑙嗛
+ /// </summary>
+ public const int shishishipin = 8505;
+ /// <summary>
+ /// 涓�閿紑閿�
+ /// </summary>
+ public const int yijiankaisuo = 8506;
+ /// <summary>
+ /// 涓存椂瀵嗙爜
+ /// </summary>
+ public const int linshimima1 = 8507;
+ /// <summary>
+ /// 鍘嗗彶璁板綍
+ /// </summary>
+ public const int lishijilu = 8508;
+ /// <summary>
+ /// 钀ょ煶瑙嗛闂ㄩ攣
+ /// </summary>
+ public const int yingshishipinmensuo = 8509;
+ /// <summary>
+ /// 鏉ヨ嚜鈥滈棬閾冣�濆懠鍙�
+ /// </summary>
+ public const int laizimenlinghujiao = 8510;
+ /// <summary>
+ /// 鐢ㄦ埛浜哄憳
+ /// </summary>
+ public const int yonghurenyuan = 8511;
+
+
+
+
+
+
+
diff --git a/HDL_ON/DAL/Server/NewAPI.cs b/HDL_ON/DAL/Server/NewAPI.cs
index e7e96bd..16302fe 100644
--- a/HDL_ON/DAL/Server/NewAPI.cs
+++ b/HDL_ON/DAL/Server/NewAPI.cs
@@ -462,6 +462,46 @@
/// 璁惧娑堟伅瑙勫垯閰嶇疆
/// </summary>
public const string Api_Post_DeviceMessageRulesSet = "/home-wisdom/app/device/deviceMessageRulesSet";
+
+ #endregion
+
+ #region Kaede -- 钀ょ煶瑙嗛闂ㄩ攣鎺ュ彛____________________________
+ /// <summary>
+ /// 鍒犻櫎璁惧锛堣悿鐭宠棰戦棬閿侊級
+ /// </summary>
+ public const string Api_Post_DeleteDevice = "/home-wisdom/platform/yingshi/child/deleteDevice";
+ /// <summary>
+ /// 鐢垫睜璇︽儏锛堣悿鐭宠棰戦棬閿侊級
+ /// </summary>
+ public const string Api_Post_Details = "/home-wisdom/platform/yingshi/lock/battery/details";
+ /// <summary>
+ /// 闂ㄩ攣鐢ㄦ埛鍒楄〃锛堣悿鐭宠棰戦棬閿侊級
+ /// </summary>
+ public const string Api_Post_UserList = "/home-wisdom/platform/yingshi/lock/user/list";
+ /// <summary>
+ /// 闂ㄩ攣鐘舵�侊紙钀ょ煶瑙嗛闂ㄩ攣锛�
+ /// </summary>
+ public const string Api_Post_Lockstatus = "/home-wisdom/platform/yingshi/lock/status";
+ /// <summary>
+ /// 鑾峰彇鎶ヨ鍒楄〃锛堣悿鐭宠棰戦棬閿侊級
+ /// </summary>
+ public const string Api_Post_Records = "/home-wisdom/platform/yingshi/alarm/records";
+ /// <summary>
+ /// 鍒犻櫎鎶ヨ璁板綍锛堣悿鐭宠棰戦棬閿侊級
+ /// </summary>
+ public const string Api_Post_AlarmDelet= "/home-wisdom/platform/yingshi/alarm/delete";
+ /// <summary>
+ /// 杩滅▼寮�閿侊紙钀ょ煶瑙嗛闂ㄩ攣锛�
+ /// </summary>
+ public const string Api_Post_OpenDoor = "/home-wisdom/platform/yingshi/lock/remote/open/door";
+ /// <summary>
+ /// 鑾峰彇闂ㄩ攣鍨嬪彿鍒楄〃锛堣悿鐭宠棰戦棬閿侊級
+ /// </summary>
+ public const string Api_Post_Models = "/home-wisdom/platform/yingshi/lock/models";
+
+
+
+
#endregion
#region Kaede -- 鍦烘櫙鎺ュ彛____________________________
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
index 61b2a8c..1c62cfb 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
@@ -618,7 +618,25 @@
}
}
break;
-
+ //钀ょ煶瑙嗛闂ㄩ攣
+ case SPK.VideoDoorLock:
+ {
+ LogicView.FunTypeView view1 = new LogicView.FunTypeView();
+ view1.btnText.TextID=StringId.yonghurenyuan;
+ view1.btnText.Name = Language.StringByID(StringId.shipinmensuo);
+ fLayout.AddChidren(view1.FLayoutView());
+ view1.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ this.identifier = "open_door";//寮�閿佷簨浠�
+ this.VideoDoorLockAction(this, device, view1.btnState);
+ };
+ if (edit)
+ {
+ this.GetEditState(device, index, view1.btnState,null, null, null);
+ }
+ }
+ break;
+
}
#region 淇濆瓨
///淇濆瓨View
@@ -669,6 +687,12 @@
inputDevice.condition = new List<Dictionary<string, string>>();
}
}
+ else if (device.spk == SPK.VideoDoorLock)
+ {
+ ////钀ょ煶瑙嗛闂ㄩ攣
+ inputDevice.condition_type = "9";
+ inputDevice.identifier = this.identifier;
+ }
if (edit)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs
index 84822aa..a7845f1 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs
@@ -92,11 +92,12 @@
//鏃ュ嚭/鏃ヨ惤/姝ｅ崍鐐瑰嚮浜嬩欢
timeSpecialView.btnClick.MouseUpEventHandler += (sen, e) =>
{
- if (string.IsNullOrEmpty( Entity.DB_ResidenceData.Instance.CurrentRegion.homeAddress))//.longitude == 0 && Entity.DB_ResidenceData.Instance.CurrentRegion.latitude == 0)
- {
- new PublicAssmebly().TipMsg(StringId.tip, StringId.GatewayLocationInformationIsNotConfigured);
- return;
- }
+
+ //if (string.IsNullOrEmpty( Entity.DB_ResidenceData.Instance.CurrentRegion.homeAddress))//.longitude == 0 && Entity.DB_ResidenceData.Instance.CurrentRegion.latitude == 0)
+ //{
+ // new PublicAssmebly().TipMsg(StringId.tip, StringId.GatewayLocationInformationIsNotConfigured);
+ // return;
+ //}
SpeciaTime speciaTime = new SpeciaTime();
MainPage.BasePageView.AddChidren(speciaTime);
speciaTime.Show();
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs
index 21466f5..b1cbf37 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs
@@ -421,6 +421,11 @@
this.RemoveFromParent();
};
break;
+ case SPK.VideoDoorLock: {
+ //璺宠浆鍒癮ndroid閭ｈ竟鍘�
+ HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.SkipAddDeviceActivity(SPK.VideoDoorLock);
+ }
+ break;
}
};
}
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs
index 7084db6..a37633b 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs
@@ -291,10 +291,10 @@
/// <returns></returns>
public static ResponsePackNew RequestServerhomeId(object o, string api_Url, int mTimeout = 20)
{
- MainPage.Log("绾㈠瀹濊姹傛暟鎹�:"+api_Url+"\r\n"+o.ToString());
+ MainPage.Log("绾㈠瀹�->鍙戦�佹暟鎹�:"+api_Url+"\r\n"+o.ToString());
var requestJson = HttpUtil.GetSignRequestJson(o);
var responsePackNew= HttpUtil.RequestHttpsPostFroHome(api_Url, requestJson, mTimeout);
- MainPage.Log("鍥炲绾㈠瀹濊姹傛暟鎹�:" + "\r\n"+ Newtonsoft.Json.JsonConvert.SerializeObject(responsePackNew));
+ MainPage.Log("绾㈠瀹�->鍥炲鏁版嵁:" + "\r\n"+ Newtonsoft.Json.JsonConvert.SerializeObject(responsePackNew));
return responsePackNew;
}
--
Gitblit v1.8.0