~wxr/OnPro.git - Gitblit

Binary files differ

			@@ -73,7 +73,7 @@
			"device_open_success"="Success to open the door!";
			"device_please_input_door_password"="Input the unlock password";
			"device_history"="History";
			"device_his_no_more_data"="No more data";
			"device_his_no_more_data"="In the end";
			"device_temp_pass"="Temporary password";
			"device_temp_year"=".";
			"device_temp_month"=".";

			@@ -85,7 +85,7 @@
			"device_open_success"="开门成功！";
			"device_please_input_door_password"="请输入开锁密码";
			"device_history"="历史记录";
			"device_his_no_more_data"="没有更多数据";
			"device_his_no_more_data"="到底啦";
			"device_temp_pass"="临时密码";
			"device_temp_year"="年";
			"device_temp_month"="月";

			@@ -358,6 +358,14 @@
			eSVideoInfo.Lc_AccessToken = json["subToken"].ToString();//"子账号token
			eSVideoInfo.DeviceSerial = json["devSerial"].ToString();//设备序列号
			eSVideoInfo.HomeId = jpushMessageInfo.HomeId;
			if (json.ContainsKey("msgId") && !string.IsNullOrEmpty(json["msgId"].ToString()))
			{
			eSVideoInfo.msgId = json["msgId"].ToString();
			}
			if (json.ContainsKey("currentTime") && !string.IsNullOrEmpty(json["currentTime"].ToString()))
			{
			eSVideoInfo.currentTime = json["currentTime"].ToString();
			}
			}
			else if (interphoneTypeEnum == InterphoneType.HDL.ToString())
			{

			@@ -213,8 +213,14 @@
			//2.设置萤石子账号的AccessToken到SDK
			EZSDK.IOS.EZSDK.SharedInstance().SetEZAccessToken(mESVideoInfo.Lc_AccessToken);
			//3.打开视频播放页面
			EZSDK.IOS.EZSDK.SharedInstance().PlayWithDeviceSerial(mESVideoInfo.DeviceSerial);
			string currentTimeStr = Utlis.GetTimestamp(); // 当前时间

			if (string.IsNullOrEmpty(mESVideoInfo.currentTime) && string.IsNullOrEmpty(currentTimeStr) && (long.Parse(currentTimeStr) - long.Parse(mESVideoInfo.currentTime)) > 30000) { // 超时30s
			EZSDK.IOS.EZSDK.SharedInstance().PlayWithDeviceSerial(mESVideoInfo.DeviceSerial);
			}
			else {
			EZSDK.IOS.EZSDK.SharedInstance().PlayWithDeviceSerial(mESVideoInfo.DeviceSerial, mESVideoInfo.msgId);
			}
			}
			else if (interphoneType == InterphoneType.HDL.ToString())
			{
			@@ -816,6 +822,14 @@
			/// 设备序列号
			/// </summary>
			public string DeviceSerial = string.Empty;
			/// <summary>
			/// 服务器推送时间
			/// </summary>
			public string currentTime = string.Empty;
			/// <summary>
			/// 消息id
			/// </summary>
			public string msgId = string.Empty;
			//========================HDL SIP==========================
			/// <summary>
			/// 设备sip账号 interphoneType是HDL时才会有值

	DLL/IOS/EZSDK.IOS.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HDL-ON_iOS/Resources/en.lproj/Localizable.strings	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HDL-ON_iOS/Resources/zh-Hans.lproj/Localizable.strings	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HDL_ON/Common/HDLCommon.cs	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史