From a9a4e7c5928a0b7031e7104eeeb960059f26f5c0 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 08 七月 2021 18:51:24 +0800
Subject: [PATCH] 2021-07-08 1.增加注释
---
HDL_ON/DAL/Server/NewAPI.cs | 3 +
HDL_ON/Common/HDLCommon.cs | 14 +++---
HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs | 16 ++++----
.vs/HDL_APP_Project/xs/UserPrefs.xml | 42 +++++++++++---------
4 files changed, 40 insertions(+), 35 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index e34934f..90b7114 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,31 +1,35 @@
锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
- <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.08FD445C-3EE8-4ED2-BF28-B42ADD0DA92C" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs">
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-00014C392121802E" />
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/Server/HttpUtil.cs">
<Files>
- <File FileName="HDL_ON/Common/HDLCommon.cs" Line="298" Column="43" />
+ <File FileName="HDL_ON/Common/HDLCommon.cs" Line="322" Column="27" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs" Line="83" Column="17" />
<File FileName="HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs" Line="63" Column="39" />
- <File FileName="HDL_ON/DAL/Server/NewApiRes.cs" Line="1424" Column="23" />
- <File FileName="HDL-ON_Android/Assets/Language.ini" Line="1722" Column="5" />
- <File FileName="HDL_ON/Common/R.cs" Line="1242" Column="37" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs" Line="310" Column="86" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/ObjectClass.cs" Line="141" Column="23" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs" Line="11" Column="31" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs" Line="92" Column="53" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs" Line="30" Column="46" />
+ <File FileName="HDL_ON/DAL/Server/NewAPI.cs" Line="636" Column="1" />
+ <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="22" Column="95" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="HDL_APP_Project" expanded="True">
<Node name="HDL_ON" expanded="True">
- <Node name="Common" expanded="True">
- <Node name="HDLCommon.cs" selected="True" />
+ <Node name="Common" expanded="True" />
+ <Node name="DAL" expanded="True">
+ <Node name="Server" expanded="True">
+ <Node name="HttpUtil.cs" selected="True" />
+ </Node>
+ <Node name="ThirdPartySdk" expanded="True" />
</Node>
- </Node>
- <Node name="HDL-ON_Android" expanded="True">
- <Node name="Assets" expanded="True" />
- </Node>
- <Node name="HDL-ON_iOS" expanded="True">
- <Node name="Resources" expanded="True">
- <Node name="EZ" expanded="True">
- <Node name="Base.lproj" expanded="True" />
+ <Node name="UI" expanded="True">
+ <Node name="UI2" expanded="True">
+ <Node name="1-HomePage" expanded="True" />
+ <Node name="3-Intelligence" expanded="True" />
+ <Node name="4-PersonalCenter" expanded="True">
+ <Node name="AboutOn" expanded="True" />
+ </Node>
</Node>
</Node>
</Node>
@@ -40,7 +44,7 @@
<String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String>
<String>Shared.IOS/Shared.IOS.csproj</String>
</DisabledProjects>
- <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
+ <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore>
<Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/ON+/HDL_ON/UI/UI2/FuntionControlView/Electrical/IrFanPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/Electrical/IrFanPage.cs" line="42" column="1" />
diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs
index 88c9782..af8827c 100644
--- a/HDL_ON/Common/HDLCommon.cs
+++ b/HDL_ON/Common/HDLCommon.cs
@@ -295,7 +295,7 @@
eSVideoInfo.ESVideoUUID = eSVideoInfo.uuid;
}
- ESOnVideo.Current.ShowESvideoVideoIntercom(eSVideoInfo, "FLVI");
+ ESOnVideo.Current.ShowESvideoVideoIntercom(eSVideoInfo, InterphoneType.FLVI.ToString());
}
else if (jpushMessageInfo.messageType.Contains(PushMessageType.HDL_INTERPHONE.ToString()))
@@ -304,16 +304,15 @@
//瀛楁鍏煎闂锛屽彧鑳界洿鎺ュ彇鍊间簡
var json = Newtonsoft.Json.Linq.JObject.Parse(jpushMessageInfo.expantContent);
- //瑙嗗璁插巶瀹剁被鍨�
+ //1.瑙嗗璁插巶瀹剁被鍨�
string interphoneTypeEnum = json["interphoneTypeEnum"].ToString();
-
if (string.IsNullOrEmpty(interphoneTypeEnum)) return;
-
+ //
ESVideoInfo eSVideoInfo = new ESVideoInfo();// GetESOnVideoJson(jpushMessageInfo.expantContent);
-
+ //2.鏍规嵁鍙瀵硅鍘傚绫诲瀷锛屽鐞嗕笉鍚岀殑鏁版嵁
if (interphoneTypeEnum == InterphoneType.IMOUVISIAL.ToString())
{
-
+ //澶у崕涔愭
eSVideoInfo.callId = json["callId"].ToString();
//eSVideoInfo.Lc_AccessToken = UI.UI2.PersonalCenter.PirDevice.PirSend.LcSubAccessToken;//json["subAccountToken"].ToString();//
eSVideoInfo.Lc_AccessToken = json["subAccountToken"].ToString();//2021-05-13 鐩墠浜戠杩樻病鎷垮埌Lc_AccessToken锛岀洰鍓嶆病鍔炴硶姝ｅ父浣跨敤
@@ -324,13 +323,14 @@
}
else if (interphoneTypeEnum == InterphoneType.EZVIZ.ToString())
{
+ //钀ょ煶鐚溂
eSVideoInfo.Lc_AccessToken = json["subToken"].ToString();//"瀛愯处鍙穞oken
eSVideoInfo.DeviceSerial = json["devSerial"].ToString();//璁惧搴忓垪鍙�
eSVideoInfo.HomeId = jpushMessageInfo.HomeId;
}
+ //3.鎵撳紑鍛煎彨椤甸潰
if (eSVideoInfo == null) return;
-
ESOnVideo.Current.ShowESvideoVideoIntercom(eSVideoInfo, interphoneTypeEnum);
}
diff --git a/HDL_ON/DAL/Server/NewAPI.cs b/HDL_ON/DAL/Server/NewAPI.cs
index 07638c5..40200dd 100644
--- a/HDL_ON/DAL/Server/NewAPI.cs
+++ b/HDL_ON/DAL/Server/NewAPI.cs
@@ -632,7 +632,8 @@
/// <summary>
/// 鑾峰彇閫氳瘽璁板綍
/// </summary>
- public const string API_POST_FL_GetCallList = "/home-wisdom/app/fl/vi/list";
+ //public const string API_POST_FL_GetCallList = "/home-wisdom/app/fl/vi/list";
+ public const string API_POST_FL_GetCallList = "/home-wisdom/platform/imou/listCallRecords";
/// <summary>
/// 鍒犻櫎閫氳瘽璁板綍
/// </summary>
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs
index 0b26a18..fa1831f 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs
@@ -72,15 +72,15 @@
bodyView.AddChidren(btnOnTitle);
#if DEBUG
- btnOnIcon.MouseUpEventHandler += (sender, e) =>
- {
- ESOnVideo.Current.Test();
- };
+ //btnOnIcon.MouseUpEventHandler += (sender, e) =>
+ //{
+ // ESOnVideo.Current.Test();
+ //};
- btnOnTitle.MouseUpEventHandler += (sender, e) =>
- {
- ESOnVideo.Current.Test(false);
- };
+ //btnOnTitle.MouseUpEventHandler += (sender, e) =>
+ //{
+ // ESOnVideo.Current.Test(false);
+ //};
#endif
--
Gitblit v1.8.0