From 5d5a3cbf4aacca721745ff4267b0b4b4b437e548 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 30 三月 2021 15:17:26 +0800
Subject: [PATCH] 2021-3-30-1
---
HDL-ON_iOS/Resources/Language.ini | 14 ++
HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs | 68 ++++++-----
HDL-ON_Android/Assets/Language.ini | 16 ++
HDL-ON_Android/FengLinVideo/Form/ReverseCallFragment.cs | 3
HDL_ON/UI/UI2/FuntionControlView/Video/MainView.cs | 112 ++++++++++++++++--
HDL_ON/Common/R.cs | 13 ++
HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs | 80 +++++++------
.vs/HDL_APP_Project/xs/UserPrefs.xml | 38 +-----
HDL_ON/UI/UI2/FuntionControlView/Video/View/FrameLayout50.cs | 2
HDL_ON/UI/UI2/FuntionControlView/Video/View/FrameLayout60.cs | 9
10 files changed, 235 insertions(+), 120 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index d519c26..8790f74 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,35 +1,11 @@
锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
<MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/FuntionControlView/Video/MainView.cs">
<Files>
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/MainView.cs" Line="12" Column="7" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs" Line="35" Column="39" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs" Line="68" Column="44" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/MainView.cs" Line="64" Column="15" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs" />
</Files>
- <Pads>
- <Pad Id="ProjectPad">
- <State name="__root__">
- <Node name="HDL_APP_Project" expanded="True">
- <Node name="HDL_ON" expanded="True">
- <Node name="UI" expanded="True">
- <Node name="UI2" expanded="True">
- <Node name="3-Intelligence" expanded="True">
- <Node name="Automation" expanded="True" />
- </Node>
- <Node name="4-PersonalCenter" expanded="True">
- <Node name="PirDevice" expanded="True" />
- </Node>
- <Node name="FuntionControlView" expanded="True">
- <Node name="Video" expanded="True">
- <Node name="MainView.cs" selected="True" />
- </Node>
- </Node>
- </Node>
- </Node>
- </Node>
- </Node>
- </State>
- </Pad>
- </Pads>
</MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.DebuggingService.PinnedWatches />
<DisabledProjects>
@@ -38,11 +14,9 @@
<String>Shared.IOS/Shared.IOS.csproj</String>
</DisabledProjects>
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
- <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.4b65c4650918" />
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
- <BreakpointStore>
- <Breakpoint file="/Users/hdl/Desktop/wjc/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Video/MainView.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/Video/MainView.cs" line="12" column="1" />
- </BreakpointStore>
+ <BreakpointStore />
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
</Properties>
\ No newline at end of file
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index ffe1789..875ded3 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -1265,6 +1265,22 @@
1075=缃戠粶涓嶅彲鐢�
1076=閫夋嫨绾㈠閬ユ帶鍣�
+
+4000=鍙瀵硅
+4001=閫氳瘽璁板綍
+4002=*浜戠鐓х墖鍙繚鐣�30澶�
+4003=闂ㄥ彛鏈哄懠鍙�
+4004=宸叉帴鍚�
+4005=宸插紑閿�
+4006=骞�
+4007=鏉ヨ嚜
+4008=鍛煎彨
+4009=鏈紑閿�
+4010=鏈帴鍚�
+4011=宸叉嫆缁�
+4012=閰嶇疆鍙傛暟鏈夊紓甯�!
+
+
5000=闊充箰
5001=缁勫悎
5002=璁剧疆
diff --git a/HDL-ON_Android/FengLinVideo/Form/ReverseCallFragment.cs b/HDL-ON_Android/FengLinVideo/Form/ReverseCallFragment.cs
index ba0102f..b92134a 100644
--- a/HDL-ON_Android/FengLinVideo/Form/ReverseCallFragment.cs
+++ b/HDL-ON_Android/FengLinVideo/Form/ReverseCallFragment.cs
@@ -129,8 +129,11 @@
Thread.Sleep(15 * 1000);
Activity.RunOnUiThread(() =>
{
+ try {
if (unlockImg != null)
unlockImg.Enabled = true;
+ }
+ catch { }
});
}).Start();
}
diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index 9851c94..b3e33bc 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -1266,6 +1266,20 @@
1075=缃戠粶涓嶅彲鐢�
1076=閫夋嫨绾㈠閬ユ帶鍣�
+4000=鍙瀵硅
+4001=閫氳瘽璁板綍
+4002=*浜戠鐓х墖鍙繚鐣�30澶�
+4003=闂ㄥ彛鏈哄懠鍙�
+4004=宸叉帴鍚�
+4005=宸插紑閿�
+4006=骞�
+4007=鏉ヨ嚜
+4008=鍛煎彨
+4009=鏈紑閿�
+4010=鏈帴鍚�
+4011=宸叉嫆缁�
+4012=閰嶇疆鍙傛暟鏈夊紓甯�!
+
5000=闊充箰
5001=缁勫悎
5002=璁剧疆
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index fbf9563..0b4a240 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -742,6 +742,19 @@
public const int ChooseInfraredRemoteControl = 1076;
+ public const int keshiduijiang = 4000;
+ public const int tonghuajilu = 4001;
+ public const int baolu30 = 4002;
+ public const int menkoujihujiao = 4003;
+ public const int yijieting = 4004;
+ public const int yikaisuo = 4005;
+ public const int nian = 4006;
+ public const int laizi = 4007;
+ public const int hujiao = 4008;
+ public const int weikaisuo = 4009;
+ public const int weijieting = 4010;
+ public const int yijujue = 4011;
+ public const int peizhicanshuyouyichang = 4012;
public const int a31Music = 5000;
public const int merge = 5001;
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/MainView.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/MainView.cs
index c3752e2..647a483 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Video/MainView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Video/MainView.cs
@@ -8,12 +8,12 @@
{
public class MainView : FrameLayout
{
- public void Show(List<ESVideoInfo> listVideo, List<CallView> listCall)
+ public void Show(List<ESVideoInfo> listVideo, List<CallView> listCall, VideoClouds video)
{
this.BackgroundColor = MusicColor.ViewColor;
var topView = new TopView();
this.AddChidren(topView.TopFLayoutView());
- topView.topNameBtn.Text = "鍙瀵硅";
+ topView.topNameBtn.TextID =StringId.keshiduijiang;
topView.clickBackBtn.MouseUpEventHandler += (sender, e) =>
{
RemoveFromParent();
@@ -31,7 +31,7 @@
var view2 = new FrameLayout();
pageView.AddChidren(view2);
View1(view1, listVideo);
- View2(view2, listCall);
+ View2(view2, listCall, video);
Button btn11 = new Button
{
X = Application.GetRealWidth(170),
@@ -80,11 +80,11 @@
if (pageView.PageIndex == 0)
{
- topView.topNameBtn.Text = "鍙瀵硅";
+ topView.topNameBtn.TextID =StringId.keshiduijiang;
}
else
{
- topView.topNameBtn.Text = "閫氳瘽璁板綍";
+ topView.topNameBtn.TextID = StringId.tonghuajilu;
}
};
@@ -117,8 +117,9 @@
TextColor = MusicColor.MusicTxet14Color,
TextSize = TextSize.Text24,
TextAlignment = TextAlignment.CenterLeft,
- Text = "鍙瀵硅",
- };
+ //Text = "鍙瀵硅",
+ TextID= StringId.keshiduijiang,
+ };
bjFl.AddChidren(nameBtn);
/// <summary>
/// 鍖哄煙鍚嶇О
@@ -197,6 +198,7 @@
Height = Application.GetRealWidth(48),
X = Application.GetRealWidth(31 + (58 + 50) * j),
Y = Application.GetRealHeight(20 + (48 + 24) * line),
+ BackgroundColor=0xff357657
};
fL.AddChidren(fLayout);
@@ -235,6 +237,10 @@
clickBtn.MouseUpEventHandler += (sender, e) =>
{
var eSVideoInfo = clickBtn.Tag as ESVideoInfo;
+ if (string.IsNullOrEmpty(eSVideoInfo.uuid))
+ {
+ new Intelligence.Automation.LogicView.TipPopView().FlashingBox(Language.StringByID(StringId.peizhicanshuyouyichang));
+ }
ESOnVideo.Current.ShowESVideoMonitor(eSVideoInfo);
};
@@ -246,7 +252,7 @@
/// 绗簩涓晫闈�
/// </summary>
/// <param name="view2">鐖舵帶浠�</param>
- void View2(FrameLayout view2, List<CallView> listCall)
+ void View2(FrameLayout view2, List<CallView> listCall, VideoClouds video)
{
var bjFl = new FrameLayout
@@ -270,7 +276,7 @@
TextColor = MusicColor.MusicTxet14Color,
TextSize = TextSize.Text24,
TextAlignment = TextAlignment.CenterLeft,
- Text = "閫氳瘽璁板綍",
+ TextID=StringId.tonghuajilu,
};
bjFl.AddChidren(nameBtn);
/// <summary>
@@ -285,11 +291,11 @@
TextColor = MusicColor.SelectedColor,
TextSize = TextSize.Text12,
TextAlignment = TextAlignment.CenterLeft,
- Text = "*浜戠鐓х墖鍙繚鐣�30澶�"
+ TextID=StringId.baolu30,
};
bjFl.AddChidren(regionBtn);
- var vv = new VerticalScrolViewLayout
+ var vv = new VerticalRefreshLayout
{
X = Application.GetRealWidth(16),
Y = Application.GetRealHeight(58),
@@ -297,27 +303,105 @@
Width = Application.GetRealWidth(295),
};
bjFl.AddChidren(vv);
+ vv.BeginHeaderRefreshingAction += () =>
+ {
+ VideoMethod videoMethod = new VideoMethod();
+ var list = videoMethod.getCall(video.id);
+ RefreshView(vv, list);
+ //鍏抽棴鍒锋柊View锛�
+ vv.EndHeaderRefreshing();
+ };
+ RefreshView(vv, listCall);
+
+ }
+ /// <summary>
+ /// 鍒锋柊鐣岄潰
+ /// </summary>
+ /// <param name="vv"></param>
+ /// <param name="listCall"></param>
+ public void RefreshView(VerticalRefreshLayout vv, List<CallView> listCall)
+ {
+ vv.RemoveAll();
for (int i = 0; i < listCall.Count; i++)
{
var year = listCall[i];
View.FrameLayout50 frameLayout50 = new View.FrameLayout50();
vv.AddChidren(frameLayout50.FLayoutView());
+ frameLayout50.btnText.Text = year.year + Language.StringByID(StringId.nian);//骞�
for (int j = 0; j < year.callList.Count; j++)
{
var call = year.callList[j];
View.FrameLayout60 frameLayout60 = new View.FrameLayout60();
vv.AddChidren(frameLayout60.FLayoutView());
+ ///鍛煎彨鏃堕棿
+ frameLayout60.btnTime.Text = getTime(call.callTime);
+ ///鍛煎彨鐘舵�侊紙0锛氭湭鎺ワ紱1锛氬凡鎺ワ紱2锛氭嫆鎺ワ級锛涙槸鍚﹀紑閿侊紱
+ frameLayout60.btnStateText.Text = getStateText(call.callStatus) + "," + getUnlockText(call.isUnlock);
+
}
}
+
}
+
+ /// <summary>
+ /// 鑾峰彇鏄剧ず鏃堕棿鏂囨湰
+ /// </summary>
+ /// <param name="str"></param>
+ /// <returns></returns>
public string getTime(string str)
{
- var dd = Convert.ToDateTime(str);
- var time = dd.ToString("HH") + ":" + dd.ToString("mm");
- return time;
+ var utcTime = Convert.ToDateTime(str);
+ var dateTime = TimeZoneInfo.ConvertTimeFromUtc(utcTime, TimeZoneInfo.Local);
+ return dateTime.ToString("HH") + ":" + dateTime.ToString("mm");
+ }
+ /// <summary>
+ /// 鑾峰彇鍛煎彨鐘舵�佹枃鏈�
+ /// </summary>
+ /// <param name="str">鐘舵�佸��0锛氭湭鎺ワ紱1锛氬凡鎺ワ紱2锛氭嫆鎺�</param>
+ /// <returns></returns>
+ public string getStateText(string str)
+ {
+ string s = "";
+ switch (str)
+ {
+ case "0":
+ {
+ s = Language.StringByID(StringId.weijieting);
+ }
+ break;
+ case "1":
+ {
+ Language.StringByID(StringId.yijieting);
+ }
+ break;
+ case "2":
+ {
+ Language.StringByID(StringId.yijujue);
+ }
+ break;
+ }
+ return s;
+ }
+ /// <summary>
+ /// 鑾峰彇寮�閿佺姸鎬佹枃鏈�
+ /// </summary>
+ /// <param name="if_bool"></param>
+ /// <returns></returns>
+ public string getUnlockText(bool if_bool)
+ {
+ string s = "";
+ if (if_bool)
+ {
+ s = Language.StringByID(StringId.yikaisuo);
+ }
+ else
+ {
+ s = Language.StringByID(StringId.weikaisuo);
+ }
+ return s;
}
}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs
index e8086fb..b38522d 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs
@@ -6,53 +6,59 @@
namespace HDL_ON.UI.UI2.FuntionControlView.Video
{
- public class VideoMethod : FrameLayout
+ public class VideoMethod
{
- public void MianView()
+ /// <summary>
+ /// 绋嬪簭涓诲叆鍙�
+ /// </summary>
+ /// <param name="frameLayout">log鐖舵帶浠�</param>
+ /// <param name="video">鍙瀵硅瀵硅薄</param>
+ public void MianView(FrameLayout frameLayout, VideoClouds video)
{
- var d = VideoSend.GetVideo();
- getVideo((video) =>
+ //鍔犺浇log
+ Loading loading = new Loading();
+ frameLayout.AddChidren(loading);
+ loading.Start();
+ List<ESVideoInfo> listESVideoInfo = new List<ESVideoInfo>();
+ List<CallView> listCall = new List<CallView>();
+ new System.Threading.Thread(() =>
{
- List<ESVideoInfo> listESVideoInfo = new List<ESVideoInfo>();
- List<CallView> listCall = new List<CallView>();
- new System.Threading.Thread(() =>
+ try
{
- try
- {
- listESVideoInfo = VideoSend.GetVideoInfoList(video);
- listCall = getCall(video.id);
- }
- catch
- {
+ listESVideoInfo = VideoSend.GetVideoInfoList(video);
+ listCall = getCall(video.id);
+ }
+ catch
+ {
- }
- finally
+ }
+ finally
+ {
+ Application.RunOnMainThread(() =>
{
- Application.RunOnMainThread(() =>
- {
- var mainView = new MainView();
- MainPage.BasePageView.AddChidren(mainView);
- mainView.Show(listESVideoInfo, listCall);
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- });
- }
- })
- { IsBackground = true }.Start();
- }, this, true);
+ loading.Hide();
+ var mainView = new MainView();
+ MainPage.BasePageView.AddChidren(mainView);
+ mainView.Show(listESVideoInfo, listCall, video);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ });
+ }
+ })
+ { IsBackground = true }.Start();
}
/// <summary>
/// 鑾峰彇鍙瀵硅
/// </summary>
/// <param name="action">鍥炶皟鍑芥暟</param>
/// <param name="frame">log鐖舵帶浠�</param>
- public void getVideo(Action<VideoObj> action, FrameLayout frame, bool tag)
+ public void getVideo(Action<VideoClouds> action, FrameLayout frame, bool tag)
{
ThreadSend(null, (responsePackNew) =>
{
try
{
var str = responsePackNew.Data.ToString();
- var videoObj = Newtonsoft.Json.JsonConvert.DeserializeObject<VideoObj>(str);
+ var videoObj = Newtonsoft.Json.JsonConvert.DeserializeObject<VideoClouds>(str);
action(videoObj);
}
catch { }
@@ -67,6 +73,7 @@
List<CallView> callViewList = new List<CallView>();
try
{
+
List<Call> listCall = new List<Call>();
var responsePackNew = VideoSend.GetCall(id);
if (responsePackNew != null && responsePackNew.Code == "0" && responsePackNew.Data.ToString() != "")
@@ -77,6 +84,7 @@
}
List<string> strYear = new List<string>();
+ //鏌ヨ骞翠唤
for (int i = 0; i < listCall.Count; i++)
{
var call = listCall[i];
@@ -93,7 +101,7 @@
}
}
-
+ //閲嶆柊瀛樺偍
for (int j = 0; j < strYear.Count; j++)
{
var year = strYear[j];
@@ -130,7 +138,7 @@
/// <param name="frame">log鐖舵帶浠�</param>
/// <param name="dialog">log鐖舵帶浠�</param>
/// <param name="tag">鏄惁瑕佹樉绀簂og</param>
- public static void ThreadSend(VideoObj videoObj, Action<ResponsePackNew> action, string str, string view, FrameLayout frame, Dialog dialog, bool tag = true)
+ public static void ThreadSend(VideoClouds videoObj, Action<ResponsePackNew> action, string str, string view, FrameLayout frame, Dialog dialog, bool tag = true)
{
//鍔犺浇log
@@ -195,9 +203,10 @@
}
- [Serializable]
- public class VideoObj
- {
+
+ [Serializable]
+ public class VideoClouds
+ {
/// <summary>
/// 涓版灄缁戝畾id锛坒lBindId锛�
/// </summary>
@@ -276,7 +285,6 @@
/// </summary>
public string flBindId = string.Empty;
}
-
[Serializable]
public class CallView
{
@@ -288,8 +296,6 @@
public List<Call> callList = new List<Call>();
}
-
-
}
}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs
index 5e2a6c0..e0dde18 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs
@@ -39,49 +39,53 @@
/// <summary>
/// 鑾峰彇闂ㄥ彛鏈哄垪琛�(1瀹ゅ唴鏈�,2瀹ゅ鏈猴紝3鍥村鏈猴紝4绠＄悊鏈�,5浜屾纭鏈�)
/// </summary>
- public static List<ESVideoInfo> GetVideoInfoList(VideoObj video)
+ public static List<ESVideoInfo> GetVideoInfoList(VideoClouds video)
{
List<ESVideoInfo> eSVideoInfosList = new List<ESVideoInfo>();
var jobject = new JObject();
- jobject.Add("cmtID",video.flCmtId);
+ jobject.Add("cmtID", video.flCmtId);
jobject.Add("unitno", video.flBuildingId);
jobject.Add("method", "getUUIDList");
- var str = HttpWebRequest(NewAPI.API_POST_FL_List, jobject.ToString(), "POST");
- if (string.IsNullOrEmpty(str))
+ try
{
- return eSVideoInfosList;
- }
- var json = JObject.Parse(str);
- if (json == null)
- {
- return eSVideoInfosList;
- }
- if (json["resCode"].ToString() != "0")
- {
- return eSVideoInfosList;
- }
- var list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Dictionary<string, string>>>(json["list"].ToString());
- if (list.Count == 0)
- {
- return eSVideoInfosList;
- }
- foreach (var videoInfo in list)
- {
- ESVideoInfo eSVideoInfo = new ESVideoInfo();
- eSVideoInfo.DeviceName = videoInfo["aliasName"];
- if (videoInfo["uuid"].Contains(","))
+ var str = HttpWebRequest(NewAPI.API_POST_FL_List, jobject.ToString(), "POST");
+ if (string.IsNullOrEmpty(str))
{
- var uuid = videoInfo["uuid"].Split(',');
- eSVideoInfo.ESVideoUUID = uuid[0];
+ return eSVideoInfosList;
}
- else
+ var json = JObject.Parse(str);
+ if (json == null)
{
- eSVideoInfo.ESVideoUUID = videoInfo["uuid"];
+ return eSVideoInfosList;
}
- eSVideoInfo.uuid = videoInfo["uuid"];
- eSVideoInfo.roomno = video.flRoomId;
- eSVideoInfosList.Add(eSVideoInfo);
+ if (json["resCode"].ToString() != "0")
+ {
+ return eSVideoInfosList;
+ }
+ var list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Dictionary<string, string>>>(json["list"].ToString());
+ if (list.Count == 0)
+ {
+ return eSVideoInfosList;
+ }
+ foreach (var videoInfo in list)
+ {
+ ESVideoInfo eSVideoInfo = new ESVideoInfo();
+ eSVideoInfo.DeviceName = videoInfo["aliasName"];
+ if (videoInfo["uuid"].Contains(","))
+ {
+ var uuid = videoInfo["uuid"].Split(',');
+ eSVideoInfo.ESVideoUUID = uuid[0];
+ }
+ else
+ {
+ eSVideoInfo.ESVideoUUID = videoInfo["uuid"];
+ }
+ eSVideoInfo.uuid = videoInfo["uuid"];
+ eSVideoInfo.roomno = video.flRoomId;
+ eSVideoInfosList.Add(eSVideoInfo);
+ }
}
+ catch { }
return eSVideoInfosList;
}
/// <summary>
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/View/FrameLayout50.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/View/FrameLayout50.cs
index eea1f20..fa8d245 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Video/View/FrameLayout50.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Video/View/FrameLayout50.cs
@@ -25,7 +25,7 @@
TextSize = TextSize.text16,
TextAlignment = TextAlignment.CenterLeft,
IsBold = true,
- Text= "2020骞�",
+ Text= "2020"+Language.StringByID(StringId.nian),
};
public Button btnClick = new Button
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/View/FrameLayout60.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/View/FrameLayout60.cs
index bedc8ec..9eb9fc4 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Video/View/FrameLayout60.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Video/View/FrameLayout60.cs
@@ -24,7 +24,8 @@
Height = Application.GetRealHeight(20),
TextColor = CSS.CSS_Color.textColor,
TextSize = TextSize.text14,
- Text= "闂ㄥ彛鏈哄懠鍙�",
+ //Text= "闂ㄥ彛鏈哄懠鍙�",
+ TextID=StringId.menkoujihujiao,
TextAlignment = TextAlignment.CenterLeft,
};
/// <summary>
@@ -42,9 +43,9 @@
Text = "15:01",
};
/// <summary>
- /// 缂栬緫鏂囨湰
+ /// 鐘舵�佹枃鏈�
/// </summary>
- public Button btnEditText = new Button
+ public Button btnStateText = new Button
{
Y = Application.GetRealHeight(32),
Width = Application.GetRealWidth(260),
@@ -91,7 +92,7 @@
{
frameLayout.AddChidren(btnText);
frameLayout.AddChidren(btnTime);
- frameLayout.AddChidren(btnEditText);
+ frameLayout.AddChidren(btnStateText);
frameLayout.AddChidren(btnNextIcon);
btnLine.Y = frameLayout.Height - 1;
frameLayout.AddChidren(btnLine);
--
Gitblit v1.8.0