From 69d4483b7c54660d1563f4ac110ca6da864b93d5 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 03 二月 2021 11:27:48 +0800
Subject: [PATCH] 2021-02-03 1.显示设备列表标题
---
HDL-ON_iOS/Resources/EZ/Base.lproj/EZMain.storyboard | 12 ------------
HDL_ON/UI/UI1-Login/LoginPageBLL.cs | 25 +++++++++++++++++++++++++
.vs/HDL_APP_Project/xs/UserPrefs.xml | 18 ++++++++++++++----
3 files changed, 39 insertions(+), 16 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index b29272d..7c93c2e 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,22 +1,32 @@
锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
<MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-00014C392121802E" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL-ON_iOS/ViewController.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/Server/HttpUtil.cs">
<Files>
<File FileName="HDL-ON_iOS/Other/ESVideo.cs" Line="4" Column="17" />
<File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" />
- <File FileName="HDL_ON/UI/UI1-Login/LoginPageBLL.cs" />
+ <File FileName="HDL_ON/UI/UI1-Login/LoginPageBLL.cs" Line="899" Column="25" />
<File FileName="../ESVideoPhoneSDKProject/xamarin/Shared.IOS.ESVideoPhoneSDK/ApiDefinition.cs" />
<File FileName="../ESVideoPhoneSDKProject/xamarin/Shared.IOS.ESVideoPhoneSDK/Properties/AssemblyInfo.cs" />
<File FileName="HDL-ON_iOS/AppDelegate.cs" />
<File FileName="HDL-ON_iOS/ViewController.cs" Line="20" Column="42" />
+ <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="545" Column="37" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="HDL_APP_Project" expanded="True">
- <Node name="HDL-ON_iOS" expanded="True">
- <Node name="ViewController.cs" selected="True" />
+ <Node name="HDL_ON" expanded="True">
+ <Node name="DAL" expanded="True">
+ <Node name="Server" expanded="True">
+ <Node name="HttpUtil.cs" selected="True" />
+ </Node>
+ </Node>
+ <Node name="Entity" expanded="True" />
+ <Node name="UI" expanded="True">
+ <Node name="UI1-Login" expanded="True" />
+ </Node>
</Node>
+ <Node name="HDL-ON_iOS" expanded="True" />
</Node>
</State>
</Pad>
diff --git a/HDL-ON_iOS/Resources/EZ/Base.lproj/EZMain.storyboard b/HDL-ON_iOS/Resources/EZ/Base.lproj/EZMain.storyboard
index c27e14f..73d04bc 100644
--- a/HDL-ON_iOS/Resources/EZ/Base.lproj/EZMain.storyboard
+++ b/HDL-ON_iOS/Resources/EZ/Base.lproj/EZMain.storyboard
@@ -355,17 +355,6 @@
</connections>
</tableView>
<navigationItem key="navigationItem" id="QiI-QE-qqY">
- <segmentedControl key="titleView" hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="bar" selectedSegmentIndex="0" id="F62-D9-UTh">
- <rect key="frame" x="112.5" y="6" width="150" height="32"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
- <segments>
- <segment title="鎴戠殑"/>
- <segment title="鍒嗕韩"/>
- </segments>
- <connections>
- <action selector="segmentControl:" destination="PUV-T9-WXJ" eventType="valueChanged" id="AUJ-pw-F6P"/>
- </connections>
- </segmentedControl>
<rightBarButtonItems>
<barButtonItem systemItem="add" id="yGh-cj-oPZ">
<connections>
@@ -382,7 +371,6 @@
<connections>
<outlet property="addButton" destination="yGh-cj-oPZ" id="KX9-xN-pem"/>
<outlet property="logoutBtn" destination="5JV-V5-93l" id="mDS-mp-F4P"/>
- <outlet property="segmentedControl" destination="F62-D9-UTh" id="Ybb-pD-fvi"/>
<segue destination="uBF-Yq-Qo0" kind="push" identifier="go2LivePlay" id="X3Q-o5-p8V"/>
<segue destination="I6z-uV-dEU" kind="push" identifier="go2Playback" id="Qls-Y0-o2u"/>
<segue destination="MVz-Sq-jf5" kind="push" identifier="go2MessageList" id="Kgx-sc-mTL"/>
diff --git a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
index 7d8eace..e526391 100644
--- a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
@@ -6,6 +6,8 @@
using Shared;
using HDL_ON.Entity;
using HDL_ON.DAL.Server;
+using System.Security.Cryptography;
+using System.Text;
namespace HDL_ON.UI.UI1Login
{
@@ -886,13 +888,36 @@
}
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="signstr"></param>
+ /// <returns></returns>
+ static string SignMD5Encrypt(string s)
+ {
+ byte[] sign = MD5.Create().ComputeHash(UTF8Encoding.UTF8.GetBytes(s));
+ string signstr = string.Empty;
+ foreach (byte item in sign)
+ {
+ signstr += item.ToString("X2");
+ }
+ return signstr.ToLower();
+ }
+
void TestEZSDK()
{
#if __Android__
#else
+ //璁剧疆瀛愯处鍙稟ccessToken鏂规
+ EZSDK.IOS.EZSDK.SetEZAccessToken("ra.cekz6j9y1zg7mqgj3rmb099p49fuf6w3-9keosamseq-00wktld-brmhuciz1");
+
EZSDK.IOS.EZSDK.Go2EZvizMonitor();
+
+ //var psw = SignMD5Encrypt("1aa98a90489b4838b966b57018b4b04b#123456");
+
+ //Utlis.WriteLine("MD5 psw: " + psw);
return;
#endif
--
Gitblit v1.8.0