From 2704f6cb96e9460713c6730736e31af26c76dd53 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 21 三月 2023 15:33:30 +0800
Subject: [PATCH] 全视通IOS更新
---
HDL-ON_Android/Properties/AndroidManifest.xml | 2
HDL-ON_iOS/Info.plist | 4
HDL_ON/DAL/Server/NewAPI.cs | 4 +
HDL-ON_iOS/HDL-ON_iOS.csproj | 2
HDL_ON/Common/ApiUtlis.cs | 14 ++++
HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs | 103 +++++++++++++++++-----------------
HDL_ON/Entity/ResponseEntity/FreeviewMemberInfo.cs | 39 +++++++++++++
DLL/IOS/Shared.IOS.HDLFVSDK.dll | 0
HDL_ON/UI/MainPage.cs | 2
HDL_ON/HDL_ON.projitems | 1
10 files changed, 113 insertions(+), 58 deletions(-)
diff --git a/DLL/IOS/Shared.IOS.HDLFVSDK.dll b/DLL/IOS/Shared.IOS.HDLFVSDK.dll
index 885c7d7..1f38208 100644
--- a/DLL/IOS/Shared.IOS.HDLFVSDK.dll
+++ b/DLL/IOS/Shared.IOS.HDLFVSDK.dll
Binary files differ
diff --git a/HDL-ON_Android/Properties/AndroidManifest.xml b/HDL-ON_Android/Properties/AndroidManifest.xml
index 9843f1a..da74dbf 100644
--- a/HDL-ON_Android/Properties/AndroidManifest.xml
+++ b/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>-->
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index b227c9c..0b4c2d5 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/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>
diff --git a/HDL-ON_iOS/Info.plist b/HDL-ON_iOS/Info.plist
index 02d0012..5653784 100644
--- a/HDL-ON_iOS/Info.plist
+++ b/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>
diff --git a/HDL_ON/Common/ApiUtlis.cs b/HDL_ON/Common/ApiUtlis.cs
index cb5844c..0692981 100644
--- a/HDL_ON/Common/ApiUtlis.cs
+++ b/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
}
diff --git a/HDL_ON/DAL/Server/NewAPI.cs b/HDL_ON/DAL/Server/NewAPI.cs
index c812aa1..726f116 100644
--- a/HDL_ON/DAL/Server/NewAPI.cs
+++ b/HDL_ON/DAL/Server/NewAPI.cs
@@ -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>
diff --git a/HDL_ON/Entity/ResponseEntity/FreeviewMemberInfo.cs b/HDL_ON/Entity/ResponseEntity/FreeviewMemberInfo.cs
new file mode 100644
index 0000000..610ad6c
--- /dev/null
+++ b/HDL_ON/Entity/ResponseEntity/FreeviewMemberInfo.cs
@@ -0,0 +1,39 @@
+锘縰sing 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>
+ /// 绗笁鏂瑰钩鍙癐P
+ /// </summary>
+ public string extServerIp = string.Empty;
+ /// <summary>
+ /// 绗笁鏂圭鎴风紪鐮�
+ /// </summary>
+ public string extTenantCode = string.Empty;
+ /// <summary>
+ /// 绗笁鏂箄uid
+ /// </summary>
+ public string extUUID = string.Empty;
+ /// <summary>
+ /// 闄勫姞鏁版嵁
+ /// </summary>
+ public string extra = string.Empty;
+ }
+}
diff --git a/HDL_ON/HDL_ON.projitems b/HDL_ON/HDL_ON.projitems
index 6b31012..aa302be 100644
--- a/HDL_ON/HDL_ON.projitems
+++ b/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\" />
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 397b590..4aa662a 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/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>
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
index 34a2c9b..09e95f4 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
+++ b/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
--
Gitblit v1.8.0