| HDL-ON_Android/Properties/AndroidManifest.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_iOS/Info.plist | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/DAL/Server/HttpUtil.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/MainPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| SiriIntents/Server/HttpUtil.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
HDL-ON_Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.1.2" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202308281"> <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.1.3" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202309061"> <uses-sdk android:minSdkVersion="26" android:targetSdkVersion="29" /> <uses-permission android:name="android.permission.RECEIVE_SMS" /> <!--友盟--> HDL-ON_iOS/Info.plist
@@ -11,7 +11,7 @@ <key>CFBundleName</key> <string>On Pro</string> <key>CFBundleShortVersionString</key> <string>2.1.2</string> <string>2.1.3</string> <key>CFBundleURLTypes</key> <array> <dict> @@ -36,7 +36,7 @@ </dict> </array> <key>CFBundleVersion</key> <string>2.1.2</string> <string>2.1.3</string> <key>LSApplicationQueriesSchemes</key> <array> <string>weixinULAPI</string> HDL_ON/DAL/Server/HttpUtil.cs
@@ -18,8 +18,8 @@ /// 固定域名,正式环境 /// 公共域名就近解析 /// </summary> public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com"; //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com"; //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com"; public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com"; const string APP_KEY = "HDL-HOME-APP-TEST"; const string SECRET_KEY = "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss";
@@ -454,7 +454,13 @@ #if __IOS__ if (mHDLCallVideoInfo.spk == "door.gate") { Shared.IOS.HDLLinphoneSDK.HDLLinPhoneSDK.Instance().CallHDLSRWithUserName(mHDLCallVideoInfo.DeviceSipAccount, mHDLCallVideoInfo.DeviceName); }else{ Shared.IOS.HDLLinphoneSDK.HDLLinPhoneSDK.Instance().CallWithUserName(mHDLCallVideoInfo.DeviceSipAccount, mHDLCallVideoInfo.DeviceName); } #else //1.先呼叫设备 HDL_ON/UI/MainPage.cs
@@ -26,7 +26,7 @@ /// <summary> /// 版本号 /// </summary> public static string VersionString = "2.1.2"; public static string VersionString = "2.1.3"; ///// <summary> ///// 客户端类型 ///// </summary> HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -89,14 +89,14 @@ #region top FrameLayout topView = new FrameLayout() { Height = Application.GetRealHeight(64), Height = Application.GetRealHeight(74), BackgroundColor = CSS_Color.TopViewColor, }; bodyView.AddChidren(topView); btnRoomTilte = new Button() { Y = Application.GetRealHeight(30), Y = Application.GetRealHeight(40), Width = Application.GetRealWidth(170), Height = Application.GetRealHeight(25), TextAlignment = TextAlignment.CenterRight, @@ -111,7 +111,7 @@ btnFuncTitle = new Button() { X = Application.GetRealWidth(209), Y = Application.GetRealHeight(30), Y = Application.GetRealHeight(40), Width = Application.GetRealWidth(170), Height = Application.GetRealHeight(25), TextAlignment = TextAlignment.CenterLeft, @@ -125,8 +125,8 @@ contentPageView = new PageLayout() { Y = Application.GetRealHeight(64), Height = Application.GetRealHeight(667 - 64 - 49 + 30), Y = Application.GetRealHeight(74), Height = Application.GetRealHeight(667 - 74 - 49 + 30), BackgroundColor = CSS_Color.MainBackgroundColor, IsShowPoint = false }; HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
@@ -76,7 +76,7 @@ #region top topView = new FrameLayout() { Height = Application.GetRealHeight(64), Height = Application.GetRealHeight(74), BackgroundColor = CSS_Color.TopViewColor, }; bodyView.AddChidren(topView); @@ -122,7 +122,7 @@ btnSceneTilte = new Button() { Y = Application.GetRealHeight(30), Y = Application.GetRealHeight(40), //Width = Application.GetRealWidth(170), Height = Application.GetRealHeight(25), TextAlignment = TextAlignment.Center, @@ -143,7 +143,7 @@ { btnAutomationTitle = new Button() { Y = Application.GetRealHeight(30), Y = Application.GetRealHeight(40), Gravity = Gravity.CenterHorizontal, Height = Application.GetRealHeight(25), TextAlignment = TextAlignment.Center, @@ -162,7 +162,7 @@ btnSceneTilte = new Button() { Y = Application.GetRealHeight(30), Y = Application.GetRealHeight(40), Width = otherWidth, Height = Application.GetRealHeight(25), TextAlignment = TextAlignment.CenterRight, @@ -178,7 +178,7 @@ btnSecurityTitle = new Button() { X = btnAutomationTitle.Right, Y = Application.GetRealHeight(30), Y = Application.GetRealHeight(40), Width = otherWidth, Height = Application.GetRealHeight(25), TextAlignment = TextAlignment.CenterLeft, @@ -193,7 +193,7 @@ { btnSceneTilte = new Button() { Y = Application.GetRealHeight(30), Y = Application.GetRealHeight(40), Width = Application.GetRealWidth(170), Height = Application.GetRealHeight(25), TextAlignment = TextAlignment.CenterRight, @@ -208,7 +208,7 @@ btnAutomationTitle = new Button() { X = Application.GetRealWidth(209), Y = Application.GetRealHeight(30), Y = Application.GetRealHeight(40), Width = Application.GetRealWidth(170), Height = Application.GetRealHeight(25), TextAlignment = TextAlignment.CenterLeft, @@ -223,7 +223,7 @@ btnAddIconBg = new Button() { X = Application.GetRealWidth(337), Y = Application.GetRealHeight(29), Y = Application.GetRealHeight(39), Width = Application.GetMinRealAverage(28), Height = Application.GetMinRealAverage(28), UnSelectedImagePath = "Public/AddIcon.png", @@ -240,8 +240,8 @@ contentPageView = new PageLayout() { Y = Application.GetRealHeight(64), Height = Application.GetRealHeight(667 - 64 - 49 + 30), Y = Application.GetRealHeight(74), Height = Application.GetRealHeight(667 - 74 - 49 + 30), BackgroundColor = CSS_Color.BackgroundColor, IsShowPoint = false }; @@ -399,6 +399,8 @@ var rowView = new FrameLayout(); new System.Threading.Thread(() => { try { foreach (var scene in listScene) { if(scene == null) @@ -431,6 +433,17 @@ index++; }); } }catch(Exception ex) { MainPage.Log($"加载场景列表异常：{ex.Message}"); } finally { Application.RunOnMainThread(() => { sceneFunctionView.AddChidren(new Button { Height = Application.GetRealHeight(30) }); }); } }) { IsBackground = true }.Start(); } @@ -439,8 +452,6 @@ { MainPage.Log("homepage erorr : " + ex.Message); } sceneFunctionView.AddChidren(new Button { Height = Application.GetRealHeight(30) }); } /// <summary> SiriIntents/Server/HttpUtil.cs
@@ -16,8 +16,8 @@ /// 固定域名,正式环境 /// 公共域名就近解析 /// </summary> public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com"; //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com"; //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com"; public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com"; const string APP_KEY = "HDL-HOME-APP-TEST"; const string SECRET_KEY = "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss"; //public const string GlobalRequestHttpsHost = "http://59.41.255.150:7777";//mmmm
