| DLL/IOS/Shared.IOS.HDLFVSDK.dll | 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_Android/Properties/AndroidManifest.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_iOS/HDL-ON_iOS.csproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_iOS/Info.plist | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/Common/ApiUtlis.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/DAL/Server/NewAPI.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/Entity/ResponseEntity/FreeviewMemberInfo.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/HDL_ON.projitems | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/MainPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
DLL/IOS/Shared.IOS.HDLFVSDK.dllBinary files differ
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="1.7" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202303172"> <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.6.6" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202303211"> <uses-sdk android:minSdkVersion="26" android:targetSdkVersion="29" /> <!--友盟--> <!--<uses-sdk android:minSdkVersion="8"></uses-sdk>--> HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -69,7 +69,7 @@ <WarningLevel>4</WarningLevel> <CodesignEntitlements>Entitlements.plist</CodesignEntitlements> <MtouchArch>ARM64</MtouchArch> <CodesignKey>iPhone Distribution: HDL Automation Co., Ltd (BVTA78PRYA)</CodesignKey> <CodesignKey>Apple Distribution: HDL Automation Co., Ltd (BVTA78PRYA)</CodesignKey> <MtouchLink>SdkOnly</MtouchLink> <MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs> <MtouchI18n>cjk</MtouchI18n> HDL-ON_iOS/Info.plist
@@ -100,9 +100,9 @@ <key>UIStatusBarStyle</key> <string>UIStatusBarStyleLightContent</string> <key>CFBundleShortVersionString</key> <string>1.6.402302261</string> <string>1.6.602303211</string> <key>CFBundleVersion</key> <string>1.6.402261</string> <string>1.6.603211</string> <key>NSLocationWhenInUseUsageDescription</key> <string>Use geographic location to provide services such as weather</string> <key>NSAppleMusicUsageDescription</key> HDL_ON/Common/ApiUtlis.cs
@@ -315,8 +315,18 @@ if (isInterphoneType_FREEVIEW) { #if __IOS__ //登录全视通 Shared.IOS.HDLFVSDK.Video.Init("", DB_ResidenceData.Instance.CurrentRegion.id); List<VisitorTempPassword> dataList = new List<VisitorTempPassword>(); Dictionary<string, object> dictionary = new Dictionary<string, object>(); dictionary.Add("homeId", Entity.DB_ResidenceData.Instance.CurrentRegion.id); var requestJson = HttpUtil.GetSignRequestJson(dictionary); ResponsePackNew pack = HttpUtil.RequestHttpsPost(NewAPI.Api_Post_GetExtMemberInfo, requestJson); if(pack!= null) { var data = Newtonsoft.Json.JsonConvert.DeserializeObject<FreeviewMemberInfo>(pack.Data.ToString()); //登录全视通 Shared.IOS.HDLFVSDK.Video.Init("", data.extUserId, DB_ResidenceData.Instance.CurrentRegion.id, "78FF1E4D-FC0A-4E71-9B79-0448E4460BD7", "T0001", "120.77.53.170:9700", "120.77.53.170:21664"); } #endif }
@@ -92,6 +92,10 @@ /// 获取临时密码 /// </summary> public const string API_POST_GET_TEMP_PASSWORD_LIST = "/community-wisdom/app/visitor/freeview/page"; /// <summary> /// 获取第三方注册的用户信息 /// </summary> public const string Api_Post_GetExtMemberInfo = "/community-wisdom/app/visitor/freeview/getExtMemberInfo"; #endregion /// <summary> HDL_ON/Entity/ResponseEntity/FreeviewMemberInfo.cs
New file @@ -0,0 +1,39 @@ using System; namespace HDL_ON.Entity { /// <summary> /// 全视通信息类 /// </summary> public class FreeviewMemberInfo { public FreeviewMemberInfo() { } /// <summary> /// 第三方注册的userid /// </summary> public string extUserId = string.Empty; /// <summary> /// 第三方平台 /// </summary> public string extPlatform = string.Empty; /// <summary> /// 第三方平台IP /// </summary> public string extServerIp = string.Empty; /// <summary> /// 第三方租户编码 /// </summary> public string extTenantCode = string.Empty; /// <summary> /// 第三方uuid /// </summary> public string extUUID = string.Empty; /// <summary> /// 附加数据 /// </summary> public string extra = string.Empty; } } HDL_ON/HDL_ON.projitems
@@ -535,6 +535,7 @@ <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\CombinedDimming\CombinedDimmingListPage.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\CombinedDimming\GroupControl.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\CombinedDimming\AddCombineDimmingPage.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Entity\ResponseEntity\FreeviewMemberInfo.cs" /> </ItemGroup> <ItemGroup> <Folder Include="$(MSBuildThisFileDirectory)Entity\Device\" /> HDL_ON/UI/MainPage.cs
@@ -26,7 +26,7 @@ /// <summary> /// 版本号 /// </summary> public static string VersionString = "1.7"; public static string VersionString = "1.6.6"; ///// <summary> ///// 客户端类型 ///// </summary> HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
@@ -294,21 +294,21 @@ var residenceFunctionCount = 0; #region 住宅信息区域 if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare && DB_ResidenceData.Instance.GatewayType == 1) { residenceInfoView = new FrameLayout() { Gravity = Gravity.CenterHorizontal, Width = Application.GetRealWidth(343), Height = Application.GetRealHeight(213), BackgroundColor = CSS_Color.MainBackgroundColor, Radius = (uint)Application.GetRealHeight(12), BorderColor = 0x00FFFFFF, BorderWidth = 0, }; contentView.AddChidren(residenceInfoView); } else //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare && DB_ResidenceData.Instance.GatewayType == 1) //{ // residenceInfoView = new FrameLayout() // { // Gravity = Gravity.CenterHorizontal, // Width = Application.GetRealWidth(343), // Height = Application.GetRealHeight(213), // BackgroundColor = CSS_Color.MainBackgroundColor, // Radius = (uint)Application.GetRealHeight(12), // BorderColor = 0x00FFFFFF, // BorderWidth = 0, // }; // contentView.AddChidren(residenceInfoView); //} //else { residenceInfoView = new FrameLayout() { @@ -586,45 +586,46 @@ residenceFunctionCount++; #region ---组合调光 var faceManagementView = new FrameLayout() { X = Application.GetRealWidth(28 - 24), Y = residenceManageView.Bottom, Width = Application.GetRealWidth(64 + 48), Height = Application.GetRealWidth(64), }; residenceInfoView.AddChidren(faceManagementView); //var faceManagementView = new FrameLayout() //{ // X = Application.GetRealWidth(28 - 24), // Y = residenceManageView.Bottom, // Width = Application.GetRealWidth(64 + 48), // Height = Application.GetRealWidth(64), //}; //residenceInfoView.AddChidren(faceManagementView); var btnFaceManagementIcon = new Button { Gravity = Gravity.CenterHorizontal, Y = Application.GetRealHeight(5), Width = Application.GetMinRealAverage(30), Height = Application.GetMinRealAverage(30), UnSelectedImagePath = "PersonalCenter/CombinedDimmingIcon.png", }; faceManagementView.AddChidren(btnFaceManagementIcon); var btnFaceManagementText = new Button() { Y = btnResidenceManageIcon.Bottom, Height = Application.GetRealHeight(29), TextID = StringId.CombinedDimming, TextAlignment = TextAlignment.Center, TextColor = CSS_Color.FirstLevelTitleColor, TextSize = CSS_FontSize.PromptFontSize_FirstLevel }; faceManagementView.AddChidren(btnFaceManagementText); //var btnFaceManagementIcon = new Button //{ // Gravity = Gravity.CenterHorizontal, // Y = Application.GetRealHeight(5), // Width = Application.GetMinRealAverage(30), // Height = Application.GetMinRealAverage(30), // UnSelectedImagePath = "PersonalCenter/CombinedDimmingIcon.png", //}; //faceManagementView.AddChidren(btnFaceManagementIcon); //var btnFaceManagementText = new Button() //{ // Y = btnResidenceManageIcon.Bottom, // Height = Application.GetRealHeight(29), // TextID = StringId.CombinedDimming, // TextAlignment = TextAlignment.Center, // TextColor = CSS_Color.FirstLevelTitleColor, // TextSize = CSS_FontSize.PromptFontSize_FirstLevel //}; //faceManagementView.AddChidren(btnFaceManagementText); //EventHandler<MouseEventArgs> eventHandler = (sender, e) => { // var page = new CombinedDimmingListPage(); // MainPage.BasePageView.AddChidren(page); // page.LoadPage(); // MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; //}; //faceManagementView.MouseUpEventHandler = eventHandler; //btnFaceManagementText.MouseUpEventHandler = eventHandler; //btnFaceManagementIcon.MouseUpEventHandler = eventHandler; #endregion EventHandler<MouseEventArgs> eventHandler = (sender, e) => { var page = new CombinedDimmingListPage(); MainPage.BasePageView.AddChidren(page); page.LoadPage(); MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; }; faceManagementView.MouseUpEventHandler = eventHandler; btnFaceManagementText.MouseUpEventHandler = eventHandler; btnFaceManagementIcon.MouseUpEventHandler = eventHandler; } } else
