DLL/Linphone/Android/Shared.Droid.HDLLinphone.dllBinary files differ
DLL/Linphone/iOS/Shared.IOS.HDLLinphoneSDK.dllBinary files differ
HDL-ON_Android/Assets/Language.ini
@@ -685,7 +685,8 @@ 698=Break 699=Choose automation 700=Add execution action 701=Link method 702=The configuration has been updated and will take effect after restarting. @@ -2086,7 +2087,8 @@ 698=断开 699=选择自动化 700=添加执行目标 701=连接方式 702=配置已经更新，重启之后生效。 @@ -3485,7 +3487,8 @@ 698=Break 699=Choose automation 700=Add execution action 701=Link method 702=The configuration has been updated and will take effect after restarting. @@ -4879,7 +4882,8 @@ 698=Break 699=Choose automation 700=Add execution action 701=Link method 702=The configuration has been updated and will take effect after restarting. 2532=Visitor Invitation Record @@ -6258,8 +6262,8 @@ 698=Break 699=Choose automation 700=Add execution action 701=Link method 702=The configuration has been updated and will take effect after restarting.
Diff too large HDL-ON_iOS/AppDelegate.cs
@@ -324,13 +324,13 @@ Console.WriteLine("启动友盟SDK异常："+ex.Message); } // 注册进入前台的通知 NSNotificationCenter.DefaultCenter.AddObserver(UIApplication.WillEnterForegroundNotification, (notification) => { // 停止播放铃声 UIApplication.SharedApplication.ApplicationIconBadgeNumber = 0; UNUserNotificationCenter.Current.RemoveAllDeliveredNotifications(); }); //// 注册进入前台的通知 //NSNotificationCenter.DefaultCenter.AddObserver(UIApplication.WillEnterForegroundNotification, (notification) => //{ // // 停止播放铃声 // UIApplication.SharedApplication.ApplicationIconBadgeNumber = 0; // UNUserNotificationCenter.Current.RemoveAllDeliveredNotifications(); //}); Console.WriteLine("FinishedLaunching"); return true; HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -101,9 +101,6 @@ <Reference Include="HDL.Shared.IOS.ScanQRCode"> <HintPath>..\DLL\IOS\HDL.Shared.IOS.ScanQRCode.dll</HintPath> </Reference> <Reference Include="Shared.IOS.HDLLinphoneSDK"> <HintPath>..\DLL\Linphone\iOS\Shared.IOS.HDLLinphoneSDK.dll</HintPath> </Reference> <Reference Include="Shared.IOS.LCVideoOnSDK"> <HintPath>..\DLL\LC\IOS\Shared.IOS.LCVideoOnSDK.dll</HintPath> </Reference> @@ -124,6 +121,9 @@ </Reference> <Reference Include="Aliyun.Api.LogService"> <HintPath>..\DLL\Aliyun.Api.LogService.dll</HintPath> </Reference> <Reference Include="Shared.IOS.HDLLinphoneSDK"> <HintPath>..\DLL\Linphone\iOS\Shared.IOS.HDLLinphoneSDK.dll</HintPath> </Reference> </ItemGroup> <ItemGroup> @@ -545,9 +545,6 @@ <Compile Include="Other\JLCountrycode.cs" /> <Compile Include="BlueWifi.cs" /> <Compile Include="Other\SkipControl.cs" /> <Compile Include="Other\PlaySystemRingtone.cs" /> <Compile Include="Other\ScheduleLocalNotification.cs" /> <Compile Include="Other\UserNotificationCenterDelegate.cs" /> <Compile Include="Other\SoundPlayer.cs" /> </ItemGroup> <ItemGroup> @@ -1799,6 +1796,14 @@ <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\Pm10Bg.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\Pm10Icon.png" /> <BundleResource Include="Resources\oldphone_mono.wav" /> <BundleResource Include="Resources\ic_esvideo_on_answer.png" /> <BundleResource Include="Resources\ic_esvideo_on_back.png" /> <BundleResource Include="Resources\ic_esvideo_on_hangup_all.png" /> <BundleResource Include="Resources\ic_esvideo_on_hangup.png" /> <BundleResource Include="Resources\ic_esvideo_on_takephoto_select.png" /> <BundleResource Include="Resources\ic_esvideo_on_takephoto_unselect.png" /> <BundleResource Include="Resources\ic_esvideo_on_unlock_select.png" /> <BundleResource Include="Resources\ic_esvideo_on_unlock_unselect.png" /> </ItemGroup> <ItemGroup> <ITunesArtwork Include="iTunesArtwork" /> HDL-ON_iOS/Other/PlaySystemRingtone.cs
File was deleted HDL-ON_iOS/Other/ScheduleLocalNotification.cs
File was deleted HDL-ON_iOS/Other/SoundPlayer.cs
@@ -6,7 +6,7 @@ { public class SoundPlayer { private AVAudioPlayer player; public AVAudioPlayer player; private static SoundPlayer _soundPlayer; public static SoundPlayer Ins @@ -43,15 +43,18 @@ } catch (Exception ex) { } } public void StopSound() { _soundPlayer.player.Stop(); _soundPlayer.player.Dispose(); _soundPlayer = null; if (_soundPlayer.player != null) { _soundPlayer.player.Stop(); _soundPlayer.player.Dispose(); _soundPlayer = null; } } } HDL-ON_iOS/Other/UserNotificationCenterDelegate.cs
File was deleted HDL-ON_iOS/Resources/Language.ini
@@ -685,7 +685,8 @@ 698=Break 699=Choose automation 700=Add execution action 701=Link method 702=The configuration has been updated and will take effect after restarting. @@ -2086,7 +2087,8 @@ 698=断开 699=选择自动化 700=添加执行目标 701=连接方式 702=配置已经更新，重启之后生效。 @@ -3485,7 +3487,8 @@ 698=Break 699=Choose automation 700=Add execution action 701=Link method 702=The configuration has been updated and will take effect after restarting. @@ -4879,7 +4882,8 @@ 698=Break 699=Choose automation 700=Add execution action 701=Link method 702=The configuration has been updated and will take effect after restarting. 2532=Visitor Invitation Record @@ -6258,8 +6262,8 @@ 698=Break 699=Choose automation 700=Add execution action 701=Link method 702=The configuration has been updated and will take effect after restarting.
@@ -7,7 +7,10 @@ using HDL_ON.Entity; using System.Threading; using HDL_ON.DriverLayer; #if __IOS__ using Other; using Shared.IOS.HDLLinphoneSDK; #endif namespace HDL_ON { /// <summary> @@ -373,7 +376,7 @@ #if __ANDROID__ Com.Hdl.Hdllinphonesdk.HDLLinphoneKit.Instance.MissedCallsTime = 10; Com.Hdl.Hdllinphonesdk.HDLLinphoneKit.Instance.MissedCallsTime = 30; Com.Hdl.Hdllinphonesdk.HDLLinphoneKit.Instance.SetMediaPlayerLooping(true); Com.Hdl.Hdllinphonesdk.HDLLinphoneKit.Instance.PlayRingtone(); new Thread(() => @@ -397,6 +400,41 @@ } }) { IsBackground = true }.Start(); #elif __IOS__ SoundPlayer.Ins.PlaySound(); new Thread(() => { int count = 0; while (true) { if (SoundPlayer.Ins.player == null) { break; } if (!SoundPlayer.Ins.player.Playing) { break; } System.Threading.Thread.Sleep(1000); count++; MainPage.Log("linphone 呼叫计时：" + count); if (count > 29) { SoundPlayer.Ins.StopSound(); Application.RunOnMainThread(() => { try { HDLLinPhoneSDK.Instance().HideIntercomeVC(); }catch(Exception ex) { MainPage.Log("error", "ios linphone 呼叫超时关闭界面异常：" + ex.Message); } }); break; } } }) { IsBackground = true }.Start(); #endif
@@ -5,6 +5,14 @@ public static class StringId { /// <summary> /// 连接方式更改提示 /// </summary> public const int ConnectionModeChangeTip = 702; /// <summary> /// 连接方式 /// </summary> public const int ConnectionMode = 701; /// <summary> /// 添加执行动作 /// </summary> public const int AddExecutionAction = 700; HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -22,13 +22,10 @@ var sss = Newtonsoft.Json.Linq.JObject.FromObject("sss"); var xxx = homeJsonStr.GetValue("xxx").ToString(), Dictionary<string, object> d = new Dictionary<string, object>(); d.Add("Id", fId); var jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d); */ Dictionary<string, object> d = new Dictionary<string, object>(); d.Add("Id", fId); var jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d); */ string severAddress = "https://global.hdlcontrol.com/ProposedProductionApi"; HDL_ON/DAL/Server/HttpUtil.cs
@@ -18,14 +18,14 @@ /// 固定域名,正式环境 /// 公共域名就近解析 /// </summary> //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com"; //public const string APP_KEY = "HDL-HOME-APP"; //public const string SECRET_KEY = "CPL345bn28gHnvi9G4tYbq3cTYkiHC"; public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com"; public const string APP_KEY = "HDL-HOME-APP"; public const string SECRET_KEY = "CPL345bn28gHnvi9G4tYbq3cTYkiHC"; public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com"; public const string APP_KEY = "HDL-HOME-APP-TEST"; public const string SECRET_KEY = "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss"; //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com"; //public const string APP_KEY = "HDL-HOME-APP-TEST"; //public const string SECRET_KEY = "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss"; //public const string GlobalRequestHttpsHost = "http://59.41.255.150:7777";//mmmm HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
@@ -13,6 +13,7 @@ using Android.Widget; using Com.Hdl.Hdllinphonesdk; #else using Other; using Foundation; using UIKit; using Shared.IOS.HDLLinphoneSDK; @@ -126,7 +127,7 @@ //登录sip服务器 #if __IOS__ Shared.IOS.HDLLinphoneSDK.HDLLinPhoneSDK.Instance().Login(mHDLSipInfo.sipAccount, mHDLSipInfo.sipPasswd, mHDLSipInfo.realm); Shared.IOS.HDLLinphoneSDK.HDLLinPhoneSDK.Instance().Login(mHDLSipInfo.sipAccount, mHDLSipInfo.sipPasswd, mHDLSipInfo.realm,DB_ResidenceData.Instance.linphoneConnectType.ToString()); #else if (mInterphoneType == InterphoneType.FREEVIEW.ToString()) { @@ -135,7 +136,8 @@ mHDLSipInfo.sipPasswd, mHDLSipInfo.realm, //"sip:139.159.157.75:47000;transport=udp", HDLLinphoneKit.InterPhoneTypeFreeview HDLLinphoneKit.InterPhoneTypeFreeview, DB_ResidenceData.Instance.linphoneConnectType.ToString() ); } else @@ -146,7 +148,8 @@ mHDLSipInfo.realm, //mHDLSipInfo.proxy+ ";transport=udp", //"sip:139.159.157.75:47000;transport=udp", HDLLinphoneKit.InterPhoneTypeHdl HDLLinphoneKit.InterPhoneTypeHdl, DB_ResidenceData.Instance.linphoneConnectType.ToString() ); } #endif @@ -607,7 +610,7 @@ bool IsIncomingReceivedCallState() { #if __IOS__ return Shared.IOS.HDLLinphoneSDK.HDLLinPhoneSDK.Instance().IsIncomingReceivedCallState; return HDLLinPhoneSDK.Instance().IsIncomingReceivedCallState; #else return HDLLinphoneKit.Instance.IsIncomingReceivedCallState; #endif @@ -620,6 +623,7 @@ #if __IOS__ HDLLinPhoneSDK.Instance().GotoHDLLinphoneIntercomVC(mHDLCallVideoInfo.DeviceName); #else @@ -885,6 +889,7 @@ /// </summary> public override void OnRejectCallAction() { MainPage.Log("iOS 全部拒接"); Other.SoundPlayer.Ins.StopSound(); hdlLinphone.HDLUpdateCallStatus(CallStatusType.REJECT, InterphoneType.HDL); } @@ -893,7 +898,7 @@ /// 截图成功 /// </summary> /// <param name = "image" ></ param > public void OnScreenshotSuccessfulAction(UIImage image) public override void OnScreenshotSuccessfulAction(UIImage image) { //NSData imageData = UIImagePNGRepresentation(image); UIImage NSData imageData = image.AsPNG(); @@ -919,6 +924,18 @@ Utlis.WriteLine("OnIncomingCall :" + userName); } public override void OnRejectAllCallAction() { MainPage.Log("iOS 全部拒接"); Other.SoundPlayer.Ins.StopSound(); hdlLinphone.HDLUpdateCallStatus(CallStatusType.REJECT, InterphoneType.HDL); hdlLinphone.HDLRejectCallIn(); } //public override void OnScreenshotSuccessfulAction(UIImage image) //{ // throw new NotImplementedException(); //} } #endregion HDL_ON/Entity/DB_ResidenceData.cs
@@ -513,5 +513,17 @@ /// </summary> public bool CheckGPS_IsFirst = true; /// <summary> /// 可视对讲连接方式 /// TCP/UDP /// </summary> public LinphoneConnectType linphoneConnectType = LinphoneConnectType.UDP; } public enum LinphoneConnectType { UDP, TCP, } } HDL_ON/Entity/Function/Sensor.cs
@@ -32,6 +32,12 @@ case SPK.SensorHumidity: nameId = StringId.Humidity; break; case SPK.SensorHcho: nameId = StringId.Formaldehyde; break; case SPK.SensorLight: nameId = StringId.guangzhao; break; } return nameId; } HDL_ON/UI/UI0-Public/TopViewDiv.cs
@@ -228,6 +228,29 @@ }; } public void LoadTopView_Linphone() { LoadTopView(); var btnSetting = new Button() { X = Application.GetRealWidth(337), Y = Application.GetRealHeight(28 + maginY), Width = Application.GetMinRealAverage(32), Height = Application.GetMinRealAverage(32), UnSelectedImagePath = "Public/FuncInfoSetIcon.png", }; contentView.AddChidren(btnSetting); btnSetting.MouseUpEventHandler = (sender, e) => { var infoView = new FunctionBaseInfoSetPage(); MainPage.BasePageView.AddChidren(infoView); infoView.LoadPage(); MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; }; } /// <summary> HDL_ON/UI/UI1-Login/RegisterPage.cs
@@ -238,7 +238,7 @@ }; pm = new HttpServerRequest(); OnAppConfig.Instance.GlobalRegion.regionUrl = ""; } //public RegisterPage(Action action) HDL_ON/UI/UI1-Login/RegisterPageBLL.cs
@@ -628,7 +628,6 @@ //判断之前是否选择过 if (OnAppConfig.Instance.GlobalRegion != null && !string.IsNullOrEmpty(OnAppConfig.Instance.GlobalRegion.regionUrl)) { SetServerText(); }
@@ -86,6 +86,13 @@ { AddRowView(data, VerticalScrolViewMiddle); } //if (string.IsNullOrEmpty(OnAppConfig.Instance.RequestHttpsHost)) //{ // if (Language.CurrentLanguage != "Chinese") // { // OnAppConfig.Instance.RequestHttpsHost = dataList.Find((obj)=>obj.regionUrl.Contains) // } //} } } }); @@ -156,7 +163,7 @@ urlBtn.MouseUpEventHandler += eHandler; urlBtn.Text = mGlobalRegion.regionName; if (mGlobalRegion.regionUrl == OnAppConfig.Instance.RequestHttpsHost) { urlBtn.TextColor = CSS_Color.MainColor; HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -2,7 +2,6 @@ using System.Collections.Generic; using HDL_ON.Entity; using HDL_ON.UI.CSS; using Other; using Shared; namespace HDL_ON.UI @@ -550,8 +549,6 @@ #endregion #if DEBUG bool isPlay = false; SoundPlayer soundPlayer = new SoundPlayer(); btnResidenceName.MouseUpEventHandler = (envent, ee) => { MainPage.Log("sss"); @@ -559,8 +556,6 @@ //HDLLinphoneKit.Instance.MediaPlayerLooping(true); Com.Hdl.Hdllinphonesdk.HDLLinphoneKit.Instance.PlayRingtone(); #elif __IOS__ ScheduleLocalNotification ss = new ScheduleLocalNotification(); ss.SetScheduleLocalNotification(); //if (isPlay) //{ HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EchartsOption_BrokenLine.cs
@@ -271,7 +271,7 @@ grid: { top: '15%', left: '13%', right: '12%', right: '15%', bottom: '10%', }, xAxis: { HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs
@@ -24,6 +24,7 @@ Sensor sensorTemp = new Sensor(); Function function; List<Function> showFunctions; List<Function> sensorList; @@ -237,16 +238,6 @@ TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel, }); break; //case SPK.SensorPm25: //_intervalValue.Add("0 ~ 35"); //_intervalValue.Add("36 ~ 75"); //_intervalValue.Add("76 ~ 115"); //_intervalValue.Add("115 ~"); //_levelTextList.Add(StringId.Great); //_levelTextList.Add(StringId.Good); //_levelTextList.Add(StringId.MildPollution); //_levelTextList.Add(StringId.HeavyPollution); //break; case SPK.SensorCO2: tipValuesView.AddChidren(new Button() { @@ -503,7 +494,7 @@ tipTextView.AddChidren(new Button() { Width = Application.GetRealWidth(101), TextID = StringId.SensorReferenceHumidityTipLevel1, TextID = StringId.SensorReferenceHumidityTipLevel3, TextAlignment = TextAlignment.Center, TextColor = CSS_Color.FirstLevelTitleColor, TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel, @@ -519,7 +510,7 @@ tipTextView.AddChidren(new Button() { Width = Application.GetRealWidth(101), TextID = StringId.SensorReferenceHumidityTipLevel3, TextID = StringId.SensorReferenceHumidityTipLevel1, TextAlignment = TextAlignment.Center, TextColor = CSS_Color.FirstLevelTitleColor, TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel, @@ -918,11 +909,18 @@ Application.RunOnMainThread(() => { ebl.xTitle = ""; ebl.yTitle = ""; if (curQueryType == "hour") { ebl.xTitle = Language.StringByID(StringId.HourUint); } else { ebl.xTitle = Language.StringByID(StringId.Date); } ebl.yTitle = Language.StringByID(StringId.Uint) + "(" + sensorTemp.Unit(function) + ")"; myEchartsView.ShowWithOption(ebl.InitOption()); }); } catch (Exception ex) { HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs
@@ -53,6 +53,12 @@ actionRefresh = action; } public FunctionBaseInfoSetPage() { bodyView = this; } public override void RemoveFromParent() { new System.Threading.Thread(() => @@ -84,6 +90,169 @@ ScrollEnabled = false, }; bodyView.AddChidren(contentView); //可视对讲 if(function == null) { var linphoneConnectView = new FrameLayout() { Height = Application.GetRealHeight(55), BackgroundColor = CSS_Color.MainBackgroundColor, }; contentView.AddChidren(linphoneConnectView); var linphoneConnectTitle = new Button() { X = Application.GetRealWidth(16), Width = Application.GetRealWidth(160), TextAlignment = TextAlignment.CenterLeft, TextColor = CSS_Color.FirstLevelTitleColor, TextSize = CSS_FontSize.SubheadingFontSize, TextID = StringId.ConnectionMode, }; linphoneConnectView.AddChidren(linphoneConnectTitle); var linphoneConnectValues = new Button() { X = Application.GetRealWidth(86), Width = Application.GetRealWidth(237), TextAlignment = TextAlignment.CenterRight, TextColor = CSS_Color.PromptingColor1, TextSize = CSS_FontSize.TextFontSize, Text = DB_ResidenceData.Instance.linphoneConnectType.ToString() }; linphoneConnectView.AddChidren(linphoneConnectValues); var linphoneConnectRight = new Button() { X = Application.GetRealWidth(339), Gravity = Gravity.CenterVertical, Width = Application.GetMinRealAverage(16), Height = Application.GetMinRealAverage(16), UnSelectedImagePath = "Public/RightIcon.png", }; linphoneConnectView.AddChidren(linphoneConnectRight); linphoneConnectView.AddChidren( new Button() { Gravity = Gravity.CenterHorizontal, BackgroundColor = CSS_Color.DividingLineColor, Width = Application.GetRealWidth(343), Height = Application.GetRealHeight(1) }); EventHandler<MouseEventArgs> linphoneHandler = (senderBase, senderBasee) => { Dialog dialog = new Dialog(); var pView = new FrameLayout() { BackgroundColor = CSS_Color.DialogTransparentColor1, }; dialog.AddChidren(pView); var optionBaseView = new FrameLayout() { Y = Application.GetRealHeight(500), Height = Application.GetRealHeight(160), AnimateSpeed = 0.3f, Animate = Animate.DownToUp, }; pView.AddChidren(optionBaseView); var optionView = new VerticalScrolViewLayout() { Gravity = Gravity.CenterHorizontal, Width = Application.GetRealWidth(343), Height = Application.GetRealHeight(100), BackgroundColor = CSS_Color.MainBackgroundColor, Radius = (uint)Application.GetRealWidth(12), ScrollEnabled = false, }; optionBaseView.AddChidren(optionView); var btnUdp = new Button() { Height = Application.GetRealHeight(50), TextAlignment = TextAlignment.Center, TextColor = CSS_Color.TextualColor, SelectedTextColor = CSS_Color.MainColor, TextSize = CSS_FontSize.SubheadingFontSize, Text = "UDP", IsSelected = DB_ResidenceData.Instance.linphoneConnectType == LinphoneConnectType.UDP }; optionView.AddChidren(btnUdp); optionView.AddChidren(new Button() { Height = Application.GetRealHeight(1), BackgroundColor = CSS_Color.DividingLineColor }); var btnTcp = new Button() { Height = Application.GetRealHeight(50), TextAlignment = TextAlignment.Center, TextColor = CSS_Color.TextualColor, SelectedTextColor = CSS_Color.MainColor, TextSize = CSS_FontSize.SubheadingFontSize, Text = "TCP", IsSelected = DB_ResidenceData.Instance.linphoneConnectType == LinphoneConnectType.TCP }; optionView.AddChidren(btnTcp); var btnCancel = new Button() { Gravity = Gravity.CenterHorizontal, Y = Application.GetRealHeight(8) + optionView.Bottom, Width = Application.GetRealWidth(343), Height = Application.GetRealHeight(50), BackgroundColor = CSS_Color.MainBackgroundColor, Radius = (uint)Application.GetRealWidth(12), TextID = StringId.Cancel, TextColor = CSS_Color.WarningColor, TextSize = CSS_FontSize.SubheadingFontSize, }; optionBaseView.AddChidren(btnCancel); dialog.Show(); pView.MouseUpEventHandler = (sender, e) => { dialog.Close(); }; btnCancel.MouseUpEventHandler = (sender, e) => { dialog.Close(); }; btnUdp.MouseUpEventHandler = (sender, e) => { DB_ResidenceData.Instance.linphoneConnectType = LinphoneConnectType.UDP; DB_ResidenceData.Instance.SaveResidenceData(); linphoneConnectValues.Text = LinphoneConnectType.UDP.ToString(); dialog.Close(); new PublicAssmebly().TipMsg(StringId.Tip, StringId.ConnectionModeChangeTip); }; btnTcp.MouseUpEventHandler = (sender, e) => { DB_ResidenceData.Instance.linphoneConnectType = LinphoneConnectType.TCP; DB_ResidenceData.Instance.SaveResidenceData(); linphoneConnectValues.Text = LinphoneConnectType.TCP.ToString(); dialog.Close(); new PublicAssmebly().TipMsg(StringId.Tip, StringId.ConnectionModeChangeTip); }; }; linphoneConnectValues.MouseUpEventHandler = linphoneHandler; linphoneConnectRight.MouseUpEventHandler = linphoneHandler; return; } #region name view var nameView = new FrameLayout() HDL_ON/UI/UI2/FuntionControlView/Music/View/TopView.cs
@@ -1,4 +1,5 @@ using System; using System.Drawing.Printing; using HDL_ON.UI.Music; using Shared; @@ -12,6 +13,7 @@ /// </summary> public FrameLayout fLayout = new FrameLayout { Y = Application.GetRealHeight(10), BackgroundColor = MusicColor.TopViewColor, Height = Application.GetRealHeight(64), Width=Application.GetRealWidth(375), @@ -90,6 +92,26 @@ fLayout.AddChidren(setBtn); fLayout.AddChidren(clickBackBtn); fLayout.AddChidren(clickSetBtn); var btnSetting = new Button() { X = Application.GetRealWidth(337), Y = Application.GetRealHeight(28), Width = Application.GetMinRealAverage(32), Height = Application.GetMinRealAverage(32), UnSelectedImagePath = "Public/FuncInfoSetIcon.png", }; fLayout.AddChidren(btnSetting); btnSetting.MouseUpEventHandler = (sender, e) => { var infoView = new FunctionBaseInfoSetPage(); MainPage.BasePageView.AddChidren(infoView); infoView.LoadPage(); MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; }; return fLayout; } #endregion HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs
@@ -27,6 +27,7 @@ this.AddChidren(topView.TopFLayoutView()); topView.topNameBtn.TextID = StringId.keshiduijiang; var pageView = new PageLayout() { Y = Application.GetRealHeight(64), SiriIntents/Server/HttpUtil.cs
@@ -16,14 +16,14 @@ /// 固定域名,正式环境 /// 公共域名就近解析 /// </summary> //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com"; //const string APP_KEY = "HDL-HOME-APP"; //const string SECRET_KEY = "CPL345bn28gHnvi9G4tYbq3cTYkiHC"; public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com"; const string APP_KEY = "HDL-HOME-APP"; const string SECRET_KEY = "CPL345bn28gHnvi9G4tYbq3cTYkiHC"; public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com"; public const string APP_KEY = "HDL-HOME-APP-TEST"; public const string SECRET_KEY = "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss"; //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com"; //public const string APP_KEY = "HDL-HOME-APP-TEST"; //public const string SECRET_KEY = "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss"; //public const string GlobalRequestHttpsHost = "http://59.41.255.150:7777";//mmmm
