From 1ebda09d954de4409c5a7f3ba3c3ee75626ec7c0 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 01 四月 2021 16:08:16 +0800
Subject: [PATCH] 2021-4-1-6
---
HDL-ON_Android/Properties/AndroidManifest.xml | 11 +
HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs | 42 +++--
HDL-ON_Android/VideoActivity.cs | 2
HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs | 8
HDL-ON_Android/FengLinVideo/Form/ReverseCallFragment.cs | 2
HDL_ON/Common/ApiUtlis.cs | 2
HDL_ON/HDL_ON.projitems | 3
HDL_ON/UI/UI2/FuntionControlView/Video/ObjectClass.cs | 115 ++++++++++++++++
HDL_ON/Entity/FunctionList.cs | 2
HDL_ON/DAL/Server/HttpUtil.cs | 2
HDL-ON_Android/Resources/Resource.designer.cs | 3
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs | 25 ++-
HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs | 110 ---------------
.vs/HDL_APP_Project/xs/UserPrefs.xml | 49 +++----
14 files changed, 204 insertions(+), 172 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 7073b85..f9d32a6 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,45 +1,38 @@
锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/Server/HttpServerRequest.cs">
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-001674E61438002E" />
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/Common/ApiUtlis.cs">
<Files>
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/MainView.cs" Line="19" Column="106" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs" Line="33" Column="1" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs" Line="22" Column="77" />
- <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/BrandList.cs" />
- <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs" Line="512" Column="1" />
- <File FileName="HDL_ON/Entity/Enumerative/MyEnum.cs" Line="1" Column="1" />
- <File FileName="HDL_ON/DAL/Server/NewAPI.cs" Line="541" Column="46" />
- <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="2249" Column="2" />
- <File FileName="HDL_ON/Common/ApiUtlis.cs" Line="281" Column="60" />
- <File FileName="HDL_ON/Entity/FunctionList.cs" Line="1" Column="1" />
- <File FileName="HDL_ON/DAL/FileUtils.cs" Line="1" Column="1" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs" Line="48" Column="10" />
+ <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs" />
+ <File FileName="HDL-ON_iOS/Resources/Language.ini" />
+ <File FileName="HDL_ON/Common/R.cs" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs" Line="116" Column="54" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs" Line="70" Column="57" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/ObjectClass.cs" Line="99" Column="16" />
+ <File FileName="HDL_ON/Entity/FunctionList.cs" Line="131" Column="22" />
+ <File FileName="HDL_ON/Common/ApiUtlis.cs" Line="279" Column="76" />
</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="DAL" expanded="True">
- <Node name="Server" expanded="True">
- <Node name="HttpServerRequest.cs" selected="True" />
- </Node>
- <Node name="ThirdPartySdk" expanded="True" />
+ <Node name="Common" expanded="True">
+ <Node name="ApiUtlis.cs" selected="True" />
</Node>
- <Node name="Entity" expanded="True">
- <Node name="Enumerative" expanded="True" />
- </Node>
+ <Node name="DAL" expanded="True" />
+ <Node name="Entity" expanded="True" />
<Node name="UI" expanded="True">
<Node name="UI2" expanded="True">
- <Node name="2-Classification" expanded="True" />
- <Node name="4-PersonalCenter" expanded="True">
- <Node name="PirDevice" expanded="True" />
- </Node>
+ <Node name="4-PersonalCenter" expanded="True" />
<Node name="FuntionControlView" expanded="True">
<Node name="Video" expanded="True" />
</Node>
</Node>
</Node>
+ </Node>
+ <Node name="HDL-ON_iOS" expanded="True">
+ <Node name="Resources" expanded="True" />
</Node>
</Node>
</State>
@@ -52,8 +45,8 @@
<String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String>
<String>Shared.IOS/Shared.IOS.csproj</String>
</DisabledProjects>
- <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
- <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
+ <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__Android AndroidDesignerPreferredDevice="Nexus 4" PreferredExecutionTarget="Android.4b65c4650918" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore />
</MonoDevelop.Ide.DebuggingService.Breakpoints>
diff --git a/HDL-ON_Android/FengLinVideo/Form/ReverseCallFragment.cs b/HDL-ON_Android/FengLinVideo/Form/ReverseCallFragment.cs
index 3d69f40..7585efa 100644
--- a/HDL-ON_Android/FengLinVideo/Form/ReverseCallFragment.cs
+++ b/HDL-ON_Android/FengLinVideo/Form/ReverseCallFragment.cs
@@ -279,7 +279,7 @@
{
string UserData = "user text";
//娉ㄦ剰锛歊equestAudio 璇锋眰瀵规柟闊抽锛孯equestVideo璇锋眰瀵规柟瑙嗛 SendAudio鍙戦�佹湰鍦伴煶棰� SendVideo 鍙戦�佹湰鍦拌棰� 涓�鑸棬鍙ｄ笉鎺ユ敹鍒拌棰戯紝鎵�浠ユ渶濂借缃�0锛屽噺灏戞祦閲忔秷鑰�
- string param = string.Format("RequestAudio=1\r\n" + "RequestVideo=1\r\n" + "SendAudio=1\r\n" + "SendVideo=0r\n" + "UserData=%s\r\n", UserData);
+ string param = string.Format("RequestAudio=1\r\n" + "RequestVideo=1\r\n" + "SendAudio=1\r\n" + "SendVideo=1r\n" + "UserData=%s\r\n", UserData);
mPhone.AcceptRing(param);
answerLayout.Visibility = ViewStates.Gone;
PostAnswer();
diff --git a/HDL-ON_Android/Properties/AndroidManifest.xml b/HDL-ON_Android/Properties/AndroidManifest.xml
index 7554ec9..b929bdc 100644
--- a/HDL-ON_Android/Properties/AndroidManifest.xml
+++ b/HDL-ON_Android/Properties/AndroidManifest.xml
@@ -1,6 +1,17 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202103302" android:versionName="1.1.202103302" package="com.hdl.onpro">
<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="26" />
+ <!-- 鍙瀵硅鏉冮檺-->
+ <uses-permission android:name="android.permission.CAMERA" />
+ <uses-feature android:name="android.hardware.camera" />
+ <uses-feature android:name="android.hardware.camera.autofocus" />
+ <uses-permission android:name="android.permission.INTERNET" />
+ <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
+ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+ <uses-permission android:name="android.permission.VIBRATE" />
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+ <uses-permission android:name="android.permission.RECORD_AUDIO" />
+ <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
<!-- 瀹氫綅鏉冮檺-->
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
diff --git a/HDL-ON_Android/Resources/Resource.designer.cs b/HDL-ON_Android/Resources/Resource.designer.cs
index e88a201..b3c46e6 100644
--- a/HDL-ON_Android/Resources/Resource.designer.cs
+++ b/HDL-ON_Android/Resources/Resource.designer.cs
@@ -2,7 +2,6 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -15,7 +14,7 @@
{
- [System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")]
public partial class Resource
{
diff --git a/HDL-ON_Android/VideoActivity.cs b/HDL-ON_Android/VideoActivity.cs
index 5229a2a..385ba73 100644
--- a/HDL-ON_Android/VideoActivity.cs
+++ b/HDL-ON_Android/VideoActivity.cs
@@ -169,7 +169,7 @@
mPhone.SetRemoteSurfaceHolder(mRemoteSurfaceHolder, "mRemoteSurfaceHolder!=null"); //璁剧疆鏉ョ數绐楀彛
}
- ViewGroup v = (ViewGroup)FindViewById(Resource.Id.localVideo);
+ ViewGroup v = (ViewGroup)FindViewById(Resource.Id.locaVideo);
mPhone.SetLocalVideoContainer(v);//璁剧疆鏈湴瑙嗛绐楀彛锛屼竴瀹氳璋冪敤锛屼笉鐒跺悗浼氬嚭鐜版病澹伴煶
}
else
diff --git a/HDL_ON/Common/ApiUtlis.cs b/HDL_ON/Common/ApiUtlis.cs
index 364561b..2013562 100644
--- a/HDL_ON/Common/ApiUtlis.cs
+++ b/HDL_ON/Common/ApiUtlis.cs
@@ -281,7 +281,7 @@
var flVideoInfo = HttpRequest.CheckFlVideo();
if(flVideoInfo.Code == StateCode.SUCCESS)
{
- FunctionList.List.videoIntercom = Newtonsoft.Json.JsonConvert.DeserializeObject<UI.UI2.FuntionControlView.Video.VideoMethod.VideoClouds>(flVideoInfo.Data.ToString());
+ FunctionList.List.videoIntercom = Newtonsoft.Json.JsonConvert.DeserializeObject<UI.UI2.FuntionControlView.Video.VideoClouds>(flVideoInfo.Data.ToString());
}
}
diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index 905c804..7f7b499 100644
--- a/HDL_ON/DAL/Server/HttpUtil.cs
+++ b/HDL_ON/DAL/Server/HttpUtil.cs
@@ -157,7 +157,7 @@
////**************娴嬭瘯**************
- // string requestFullUrl = GlobalRequestHttpsHost + apiPath;
+ //string requestFullUrl = GlobalRequestHttpsHost + apiPath;
////**************娴嬭瘯**************
RestClient client = new RestClient(requestFullUrl);
diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs
index a53457b..5725ed5 100644
--- a/HDL_ON/Entity/FunctionList.cs
+++ b/HDL_ON/Entity/FunctionList.cs
@@ -131,7 +131,7 @@
/// <summary>
/// 鍙瀵硅鍒楄〃
/// </summary>
- public UI.UI2.FuntionControlView.Video.VideoMethod.VideoClouds videoIntercom;
+ public UI.UI2.FuntionControlView.Video.VideoClouds videoIntercom;
/// <summary>
/// 鍦烘櫙鍒楄〃
diff --git a/HDL_ON/HDL_ON.projitems b/HDL_ON/HDL_ON.projitems
index f11d072..560e165 100644
--- a/HDL_ON/HDL_ON.projitems
+++ b/HDL_ON/HDL_ON.projitems
@@ -380,7 +380,6 @@
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\1ContorlPage\AcControlPage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\1ContorlPage\FhControlPage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\1ContorlPage\TvControlPage.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Video\MainView.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Video\View\FrameLayout50.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Video\View\FrameLayout60.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Video\View\ShowDialog.cs" />
@@ -394,6 +393,8 @@
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\1ContorlPage\AirFreshControlPage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Video\VideoMethod.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Video\VideoSend.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Video\VideoMainView.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Video\ObjectClass.cs" />
</ItemGroup>
<ItemGroup>
<Folder Include="$(MSBuildThisFileDirectory)DAL\" />
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs
index 31e6055..a7ced2e 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs
@@ -290,21 +290,28 @@
{
//娓呯┖涔嬪墠鏁版嵁
DeviceTypeList.Clear();
- var jArray = Newtonsoft.Json.Linq.JArray.Parse(responsePackNew.Data.ToString());
- for (int a = 0; a < jArray.Count; a++)
+ try
{
- var jay = jArray[a];
- var str = Newtonsoft.Json.JsonConvert.SerializeObject(jay);
- var objDeviceType = Newtonsoft.Json.JsonConvert.DeserializeObject<DeviceType>(str);
- if (objDeviceType != null)
+ var jArray = Newtonsoft.Json.Linq.JArray.Parse(responsePackNew.Data.ToString());
+ for (int a = 0; a < jArray.Count; a++)
{
- if (null == DeviceTypeList.Find((c) => c.id == objDeviceType.id))
+ var jay = jArray[a];
+ var str = Newtonsoft.Json.JsonConvert.SerializeObject(jay);
+ var objDeviceType = Newtonsoft.Json.JsonConvert.DeserializeObject<DeviceType>(str);
+ if (objDeviceType != null)
{
- DeviceTypeList.Add(objDeviceType);
+ if (null == DeviceTypeList.Find((c) => c.id == objDeviceType.id))
+ {
+ DeviceTypeList.Add(objDeviceType);
+ }
}
}
+ action();
}
- action();
+ catch
+ {
+
+ }
}
else
{
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/ObjectClass.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/ObjectClass.cs
new file mode 100644
index 0000000..6114108
--- /dev/null
+++ b/HDL_ON/UI/UI2/FuntionControlView/Video/ObjectClass.cs
@@ -0,0 +1,115 @@
+锘縰sing System;
+using System.Collections.Generic;
+
+namespace HDL_ON.UI.UI2.FuntionControlView.Video
+{
+ public class ObjectClass
+ {
+
+ }
+ [Serializable]
+ public class VideoClouds
+ {
+ /// <summary>
+ /// 涓版灄缁戝畾id锛坒lBindId锛�(userKey)
+ /// </summary>
+ public string id = string.Empty;
+ /// <summary>
+ /// 浣忓畢id
+ /// </summary>
+ public string homeId = string.Empty;
+ /// <summary>
+ /// 铏氭嫙鎵嬫満鍙�
+ /// </summary>
+ public string phone = string.Empty;
+ /// <summary>
+ /// 铏氭嫙韬唤璇佸彿鐮�
+ /// </summary>
+ public string idCard = string.Empty;
+ /// <summary>
+ /// 绀惧尯涓婚敭Id
+ /// </summary>
+ public string communtiyId = string.Empty;
+ /// <summary>
+ /// 涓版灄妤兼爧鍙�
+ /// </summary>
+ public string flBuildingId = string.Empty;
+ /// <summary>
+ /// 涓版灄妤兼爧鍚嶇О
+ /// </summary>
+ public string flBuildingName = string.Empty;
+ /// <summary>
+ /// 涓版灄鎴块棿鍚嶇О
+ /// </summary>
+ public string flRoomId = string.Empty;
+ /// <summary>
+ /// 涓版灄瀹夊叏瀵嗛挜
+ /// </summary>
+ public string flSecretKey = string.Empty;
+ /// <summary>
+ /// 涓版灄鐨勫皬鍖篒d
+ /// </summary>
+ public string flCmtId = string.Empty;
+
+ }
+ [Serializable]
+ public class Call
+ {
+ /// <summary>
+ ///璁板綍涓婚敭Id
+ /// </summary>
+ public string id = string.Empty;
+ /// <summary>
+ /// 浣忓畢id
+ /// </summary>
+ public string homeId = string.Empty;
+ /// <summary>
+ /// 鍛煎彨鏃堕棿
+ /// </summary>
+ public string callTime = string.Empty;
+ /// <summary>
+ /// 閫氳瘽鏃堕暱
+ /// </summary>
+ public string callDuration = string.Empty;
+ /// <summary>
+ /// 鍛煎彨鐘舵�侊紙0锛氭湭鎺ワ紱1锛氬凡鎺ワ紱2锛氭嫆鎺ワ級
+ /// </summary>
+ public string callStatus = string.Empty;
+ /// <summary>
+ /// 鏄惁寮�閿�
+ /// </summary>
+ public bool isUnlock;
+ /// <summary>
+ /// 鎴浘鍦板潃
+ /// </summary>
+ public string screenshotUrl = string.Empty;
+ /// <summary>
+ ///涓版灄缁戝畾涓婚敭id锛堥棬鍙ｆ満涓婚敭Id锛�
+ /// </summary>
+ public string flBindId = string.Empty;
+ }
+ [Serializable]
+ public class CallView
+ {
+ /// <summary>
+ ///骞�
+ /// </summary>
+ public string year = string.Empty;
+
+ public List<Call> callList = new List<Call>();
+
+ }
+ [Serializable]
+ public class FlVideo
+ {
+ /// <summary>
+ /// 璁惧鍚嶇О
+ /// </summary>
+ public string aliasName = string.Empty;
+ /// <summary>
+ /// 璁惧绫诲瀷锛�(1瀹ゅ唴鏈�,2瀹ゅ鏈猴紝3鍥村鏈猴紝4绠＄悊鏈�,5浜屾纭鏈�)
+ /// </summary>
+ public string devType = string.Empty;
+ public string uuid = string.Empty;
+ }
+}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/MainView.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs
similarity index 94%
rename from HDL_ON/UI/UI2/FuntionControlView/Video/MainView.cs
rename to HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs
index 1fd2899..e70db56 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Video/MainView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs
@@ -8,7 +8,7 @@
namespace HDL_ON.UI.UI2.FuntionControlView.Video
{
- public class MainView : FrameLayout
+ public class VideoMainView : FrameLayout
{
/// <summary>
/// 鍔犺浇鍙瀵硅UI
@@ -16,17 +16,14 @@
/// <param name="listVideo">闂ㄥ彛鏈哄垪琛�</param>
/// <param name="listCall">閫氳瘽璁板綍鍒楄〃</param>
/// <param name="video">褰撳墠鐨勫彲瑙嗗璁�</param>
- public void Show(List<VideoMethod.FlVideo> listVideo, List<CallView> listCall, VideoClouds video)
+ public void Show(List<FlVideo> listVideo, List<CallView> listCall, VideoClouds video)
{
#region 甯冨眬鐣岄潰
this.BackgroundColor = MusicColor.ViewColor;
var topView = new TopView();
this.AddChidren(topView.TopFLayoutView());
topView.topNameBtn.TextID = StringId.keshiduijiang;
- topView.clickBackBtn.MouseUpEventHandler += (sender, e) =>
- {
- RemoveFromParent();
- };
+
var pageView = new PageLayout()
{
@@ -97,6 +94,18 @@
}
};
+ topView.clickBackBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ if (pageView.PageIndex == 1)
+ {
+ pageView.PageIndex = 0;
+ }
+ else
+ {
+ RemoveFromParent();
+ }
+
+ };
#endregion
}
/// <summary>
@@ -105,7 +114,7 @@
/// <param name="view1">鐖舵帶浠�</param>
/// <param name="list">闂ㄥ彛鏈哄垪琛�</param>
/// <param name="videoClouds">褰撳墠鐨勫彲瑙嗗璁�</param>
- void View1(FrameLayout view1, List<VideoMethod.FlVideo> list, VideoClouds videoClouds)
+ void View1(FrameLayout view1, List<FlVideo> list, VideoClouds videoClouds)
{
#region 甯冨眬鐣岄潰
var bjFl = new FrameLayout
@@ -124,7 +133,7 @@
{
X = Application.GetRealWidth(16),
Y = Application.GetRealHeight(16),
- Width = Application.GetRealWidth(100),
+ Width = Application.GetRealWidth(200),
Height = Application.GetRealHeight(33),
TextColor = MusicColor.MusicTxet14Color,
TextSize = TextSize.Text24,
@@ -147,7 +156,7 @@
TextAlignment = TextAlignment.CenterLeft,
Text = "123456"
};
- // bjFl.AddChidren(regionBtn);
+ // bjFl.AddChidren(regionBtn);
/// <summary>
///鏀惰棌鍥炬爣
/// </summary>
@@ -160,7 +169,7 @@
UnSelectedImagePath = "MusicIcon/collect.png",
SelectedImagePath = "MusicIcon/collectSelected.png",
};
- // bjFl.AddChidren(collectIconBtn);
+ // bjFl.AddChidren(collectIconBtn);
///鍙瀵硅鍥炬爣
Button intercomBtnIcon = new Button
{
@@ -183,7 +192,7 @@
if (list.Count > 0)
{
//闂ㄧ浜岀淮鐮佸浐瀹氭湁鐨�,铏氭嫙涓�涓嚭鏉�
- list.Add(new VideoMethod.FlVideo { aliasName =Language.StringByID(StringId.menjinerweima), devType = "100" });
+ list.Add(new FlVideo { aliasName = Language.StringByID(StringId.menjinerweima), devType = "100" });
}
//鏁扮粍涓暟
//int value = 15;
@@ -274,6 +283,7 @@
if (string.IsNullOrEmpty(flVideo.uuid))
{
new Intelligence.Automation.LogicView.TipPopView().FlashingBox(Language.StringByID(StringId.peizhicanshuyouyichang));
+ return;
}
ESVideoInfo eSVideoInfo = new ESVideoInfo
{
@@ -316,7 +326,7 @@
{
X = Application.GetRealWidth(16),
Y = Application.GetRealHeight(16),
- Width = Application.GetRealWidth(100),
+ Width = Application.GetRealWidth(200),
Height = Application.GetRealHeight(33),
TextColor = MusicColor.MusicTxet14Color,
TextSize = TextSize.Text24,
@@ -343,8 +353,8 @@
var vv = new VerticalRefreshLayout
{
X = Application.GetRealWidth(16),
- Y = Application.GetRealHeight(58),
- Height = Application.GetRealHeight(458),
+ Y = Application.GetRealHeight(58 + 17),
+ Height = Application.GetRealHeight(458 - 17),
Width = Application.GetRealWidth(295),
};
bjFl.AddChidren(vv);
@@ -470,12 +480,12 @@
break;
case "1":
{
- Language.StringByID(StringId.yijieting);
+ s = Language.StringByID(StringId.yijieting);
}
break;
case "2":
{
- Language.StringByID(StringId.yijujue);
+ s = Language.StringByID(StringId.yijujue);
}
break;
}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs
index 4131181..b08335b 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs
@@ -19,7 +19,7 @@
Loading loading = new Loading();
frameLayout.AddChidren(loading);
loading.Start();
- List<VideoMethod.FlVideo> listESVideoInfo = new List<VideoMethod.FlVideo>();
+ List<FlVideo> listESVideoInfo = new List<FlVideo>();
List<CallView> listCall = new List<CallView>();
new System.Threading.Thread(() =>
{
@@ -37,7 +37,7 @@
Application.RunOnMainThread(() =>
{
loading.Hide();
- var mainView = new MainView();
+ var mainView = new VideoMainView();
MainPage.BasePageView.AddChidren(mainView);
mainView.Show(listESVideoInfo, listCall, video);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
@@ -218,111 +218,7 @@
System.DateTime startTime = TimeZone.CurrentTimeZone.ToLocalTime(new System.DateTime(1970, 1, 1)); // 褰撳湴鏃跺尯
return ((long)(DateTime.Now.AddDays(1) - startTime).TotalSeconds).ToString(); // 鐩稿樊绉掓暟
}
- [Serializable]
- public class VideoClouds
- {
- /// <summary>
- /// 涓版灄缁戝畾id锛坒lBindId锛�(userKey)
- /// </summary>
- public string id = string.Empty;
- /// <summary>
- /// 浣忓畢id
- /// </summary>
- public string homeId = string.Empty;
- /// <summary>
- /// 铏氭嫙鎵嬫満鍙�
- /// </summary>
- public string phone = string.Empty;
- /// <summary>
- /// 铏氭嫙韬唤璇佸彿鐮�
- /// </summary>
- public string idCard = string.Empty;
- /// <summary>
- /// 绀惧尯涓婚敭Id
- /// </summary>
- public string communtiyId = string.Empty;
- /// <summary>
- /// 涓版灄妤兼爧鍙�
- /// </summary>
- public string flBuildingId = string.Empty;
- /// <summary>
- /// 涓版灄妤兼爧鍚嶇О
- /// </summary>
- public string flBuildingName = string.Empty;
- /// <summary>
- /// 涓版灄鎴块棿鍚嶇О
- /// </summary>
- public string flRoomId = string.Empty;
- /// <summary>
- /// 涓版灄瀹夊叏瀵嗛挜
- /// </summary>
- public string flSecretKey = string.Empty;
- /// <summary>
- /// 涓版灄鐨勫皬鍖篒d
- /// </summary>
- public string flCmtId = string.Empty;
-
- }
- [Serializable]
- public class Call
- {
- /// <summary>
- ///璁板綍涓婚敭Id
- /// </summary>
- public string id = string.Empty;
- /// <summary>
- /// 浣忓畢id
- /// </summary>
- public string homeId = string.Empty;
- /// <summary>
- /// 鍛煎彨鏃堕棿
- /// </summary>
- public string callTime = string.Empty;
- /// <summary>
- /// 閫氳瘽鏃堕暱
- /// </summary>
- public string callDuration = string.Empty;
- /// <summary>
- /// 鍛煎彨鐘舵�侊紙0锛氭湭鎺ワ紱1锛氬凡鎺ワ紱2锛氭嫆鎺ワ級
- /// </summary>
- public string callStatus = string.Empty;
- /// <summary>
- /// 鏄惁寮�閿�
- /// </summary>
- public bool isUnlock;
- /// <summary>
- /// 鎴浘鍦板潃
- /// </summary>
- public string screenshotUrl = string.Empty;
- /// <summary>
- ///涓版灄缁戝畾涓婚敭id锛堥棬鍙ｆ満涓婚敭Id锛�
- /// </summary>
- public string flBindId = string.Empty;
- }
- [Serializable]
- public class CallView
- {
- /// <summary>
- ///骞�
- /// </summary>
- public string year = string.Empty;
-
- public List<Call> callList = new List<Call>();
-
- }
- [Serializable]
- public class FlVideo
- {
- /// <summary>
- /// 璁惧鍚嶇О
- /// </summary>
- public string aliasName = string.Empty;
- /// <summary>
- /// 璁惧绫诲瀷锛�(1瀹ゅ唴鏈�,2瀹ゅ鏈猴紝3鍥村鏈猴紝4绠＄悊鏈�,5浜屾纭鏈�)
- /// </summary>
- public string devType = string.Empty;
- public string uuid = string.Empty;
- }
+
}
}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs
index b77730f..d4ed6a6 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs
@@ -35,9 +35,9 @@
/// <summary>
/// 鑾峰彇闂ㄥ彛鏈哄垪琛�(1瀹ゅ唴鏈�,2瀹ゅ鏈猴紝3鍥村鏈猴紝4绠＄悊鏈�,5浜屾纭鏈�)
/// </summary>
- public static List<VideoMethod.FlVideo> GetVideoInfoList(VideoMethod.VideoClouds video)
+ public static List<FlVideo> GetVideoInfoList(VideoClouds video)
{
- List<VideoMethod.FlVideo> eSVideoInfosList = new List<VideoMethod.FlVideo>();
+ List<FlVideo> eSVideoInfosList = new List<FlVideo>();
var jobject = new JObject();
jobject.Add("cmtID", video.flCmtId);
jobject.Add("unitno", video.flBuildingId);
@@ -58,7 +58,7 @@
{
return eSVideoInfosList;
}
- eSVideoInfosList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<VideoMethod.FlVideo>>(json["list"].ToString());
+ eSVideoInfosList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<FlVideo>>(json["list"].ToString());
}
catch { }
@@ -67,7 +67,7 @@
/// <summary>
/// 涓婃姤鍔ㄦ�佸紑閿佸瘑鐮�(娉ㄦ剰锛氬瘑鐮佹湁鍙兘寤舵椂1鍒嗛挓鐢熸晥)
/// </summary>
- public static void GetQRcode(FrameLayout frame, VideoMethod.VideoClouds video, Action<bool, string> action)
+ public static void GetQRcode(FrameLayout frame, VideoClouds video, Action<bool, string> action)
{
///鏍囪鏄惁鎴愬姛
bool if_bool = false;
--
Gitblit v1.8.0