From 6d3cd537a09dfd7b2eff9935f663f6988347256e Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 02 四月 2021 11:45:30 +0800
Subject: [PATCH] 2021-04-02 1.支持中心显示不全修复。
---
HDL_ON/UI/UI2/4-PersonalCenter/GetSupport/GetSupportPage.cs | 8 +++-
.vs/HDL_APP_Project/xs/UserPrefs.xml | 30 ++++++++------
HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs | 26 ++++++++----
3 files changed, 40 insertions(+), 24 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index df9809d..9ec9cfb 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,23 +1,30 @@
锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
- <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-000404163432002E" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI1-Login/LoginPage.cs">
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-00014C392121802E" />
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs">
<Files>
- <File FileName="HDL_ON/Common/HDLCommon.cs" Line="545" Column="14" />
- <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs" Line="482" Column="31" />
- <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="21" Column="89" />
- <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" Line="1" Column="1" />
+ <File FileName="HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs" Line="67" Column="34" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs" Line="11" Column="31" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="HDL_APP_Project" expanded="True">
<Node name="HDL_ON" expanded="True">
+ <Node name="DAL" expanded="True">
+ <Node name="ThirdPartySdk" expanded="True">
+ <Node name="ESOnVideo.cs" selected="True" />
+ </Node>
+ </Node>
<Node name="UI" expanded="True">
- <Node name="UI1-Login" expanded="True">
- <Node name="LoginPage.cs" selected="True" />
+ <Node name="UI2" expanded="True">
+ <Node name="2-Classification" expanded="True" />
+ <Node name="FuntionControlView" expanded="True">
+ <Node name="Video" expanded="True" />
+ </Node>
</Node>
</Node>
</Node>
+ <Node name="HDL-ON_iOS" expanded="True" />
</Node>
</State>
</Pad>
@@ -29,12 +36,9 @@
<String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String>
<String>Shared.IOS/Shared.IOS.csproj</String>
</DisabledProjects>
- <MonoDevelop.Ide.Workspace ActiveConfiguration="Release|iPhone" />
- <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.364c4b3158493098" />
+ <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
<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" />
- </BreakpointStore>
+ <BreakpointStore />
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
</Properties>
\ No newline at end of file
diff --git a/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs b/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
index 1466184..9758f95 100644
--- a/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
+++ b/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
@@ -46,7 +46,7 @@
public ESVideoInfo esVideoInfo;
/// <summary>
- ///
+ /// 鏆傛椂娌＄敤
/// </summary>
public void InitESVideoSDK()
{
@@ -56,7 +56,7 @@
/// <summary>
/// 鐩戞帶椤甸潰
/// </summary>
- /// <param name="mESVideoInfo"></param>
+ /// <param name="mESVideoInfo">涓版灄鐩戣鎵�闇�鐩稿叧鍙傛暟</param>
public void ShowESVideoMonitor(ESVideoInfo mESVideoInfo)
{
#if __IOS__
@@ -67,7 +67,9 @@
vc.MESRoomID =roomID;
vc.DeviceName = mESVideoInfo.DeviceName;
//vc.RoomName = mESVideoInfo.RoomName;
- vc.MESCallDelegate = new OnESCallDelegate(this);
+ //vc.MESCallDelegate = new OnESCallDelegate(this);
+ mOnESCallDelegate = new OnESCallDelegate(this);
+ vc.MESCallDelegate = mOnESCallDelegate;
Shared.Application.currentVC.NavigationController.PushViewController(vc, true);
#else
@@ -91,7 +93,7 @@
/// <summary>
/// 琚懠鍙〉闈�
/// </summary>
- /// <param name="mESVideoInfo"></param>
+ /// <param name="mESVideoInfo">涓版灄鍛煎彨鍔熻兘鎵�闇�鐩稿叧鍙傛暟</param>
public void ShowESvideoVideoIntercom(ESVideoInfo mESVideoInfo)
{
this.esVideoInfo = mESVideoInfo;
@@ -300,23 +302,29 @@
{ IsBackground = false }.Start();
}
-#endregion
+ #endregion
#if __IOS__
-#region OnESCallDelegate
+ #region OnESCallDelegate
/////// <summary>
/////// OnESCallDelegate 缁ф壙鍝嶅簲浜嬩欢
/////// </summary>
OnESCallDelegate mOnESCallDelegate;
/// <summary>
- ///
+ /// iOS鍘熺敓濮旀墭浜嬩欢
/// </summary>
public class OnESCallDelegate : ESCallDelegate
{
-
+ /// <summary>
+ /// ESOnVideo
+ /// </summary>
[Weak] ESOnVideo _ESOnVideo;
+ /// <summary>
+ /// 鍒濆鍖�
+ /// </summary>
+ /// <param name="mESOnVideo">鍛煎彨鐩稿叧鐨勫弬鏁�</param>
public OnESCallDelegate(ESOnVideo mESOnVideo)
{
_ESOnVideo = mESOnVideo;
@@ -400,7 +408,7 @@
}
/// <summary>
- ///
+ /// 涓版灄鐩戣鍜屽懠鍙姛鑳芥墍闇�鐩稿叧鍙傛暟
/// </summary>
public class ESVideoInfo
{
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/GetSupport/GetSupportPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/GetSupport/GetSupportPage.cs
index a7065a3..5e7d678 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/GetSupport/GetSupportPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/GetSupport/GetSupportPage.cs
@@ -44,7 +44,7 @@
TextColor = CSS_Color.FirstLevelTitleColor,
};
phoneRow.AddChidren(btnPhoneTitle);
-
+
Button btnPhoneText = new Button()
{
X = btnPhoneTitle.Right,
@@ -88,7 +88,11 @@
emailRow.AddChidren(btnEmailText);
emailRow.AddChidren(new Button() { X = Application.GetRealWidth(16), Y = Application.GetRealWidth(49), Height = Application.GetRealHeight(1), BackgroundColor = CSS_Color.DividingLineColor });
-
+ if (Language.CurrentLanguage == "English")
+ {
+ btnPhoneTitle.Text = "Tel:";
+ btnEmailTitle.Width = Application.GetRealWidth(80);
+ }
}
--
Gitblit v1.8.0