From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:21 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1

---
 DLL/Shared.Droid.xml |  302 +++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 282 insertions(+), 20 deletions(-)

diff --git a/DLL/Shared.Droid.xml b/DLL/Shared.Droid.xml
index 67ada94..3dc8941 100644
--- a/DLL/Shared.Droid.xml
+++ b/DLL/Shared.Droid.xml
@@ -53,6 +53,13 @@
             锟姐播锟斤拷址
             </summary>
         </member>
+        <member name="M:Shared.Net.WifiUtil.GetWiFiList">
+            <summary>
+            鑾峰彇WiFi鍒楄〃
+            </summary>
+            <param name="mWifiManager"></param>
+            <returns></returns>
+        </member>
         <member name="M:Shared.DensityUtil.Dip2Px(System.Single)">
             <summary>
             鏍规嵁鎵嬫満鐨勫垎杈ㄧ巼浠� dp 鐨勫崟浣� 杞垚涓� px(鍍忕礌) 
@@ -244,6 +251,17 @@
             <summary>
             鍏抽棴瀹氫綅鏈嶅姟
             </summary>
+        </member>
+        <member name="F:Shared.Application.IsStatusBarBlack">
+            <summary>
+            褰撳墠鏄惁璁剧疆椤堕儴鐘舵�佹爮瀛椾綋棰滆壊
+            </summary>
+        </member>
+        <member name="M:Shared.Application.SetStatusBarTextBlack(System.Boolean)">
+            <summary>
+            璁剧疆椤堕儴鐘舵�佹爮瀛椾綋棰滆壊
+            </summary>
+            <param name="isBlack">鏄惁璁剧疆榛戣壊</param>
         </member>
         <member name="T:Shared.Button">
             <summary>
@@ -616,6 +634,11 @@
         <member name="F:Shared.EditText.TextChangeEventHandler">
             <summary>
             杈撳叆鏂囧瓧鍙樺寲浜嬩欢
+            </summary>
+        </member>
+        <member name="M:Shared.EditText.SetSelectionEnd">
+            <summary>
+            璁剧疆鐒︾偣浣嶇疆鍒版渶鍚�
             </summary>
         </member>
         <member name="F:Shared.FocusEventArgs.Focus">
@@ -1031,6 +1054,18 @@
         <member name="P:Shared.VerticalScrolViewLayout.VerticalScrollBarEnabled">
             <summary>鈥�        /// 鏄惁鏄剧ず婊氬姩鏉♀��        /// </summary>
         </member>
+        <member name="M:Shared.VerticalScrolViewLayout.ScrollToViewIndex(System.Int32)">
+            <summary>
+            婊戝姩鍒版寚瀹歏iew
+            </summary>
+            <param name="viewIndex"> 鎸囧畾view鐨勭储寮曞��</param>
+        </member>
+        <member name="M:Shared.VerticalScrolViewLayout.ScrollToY(System.Int32)">
+            <summary>
+            婊戝姩鍒版寚瀹氫綅缃� Y
+            </summary>
+            <param name="viewY"></param>
+        </member>
         <member name="T:Shared.AndroidScrolView">
             <summary>鈥�    /// 绔栫洿鏂瑰悜婊戝姩鎺т欢鈥�    /// </summary>鈥�
         </member>
@@ -1309,6 +1344,13 @@
             </summary>
             <param name="filePath"></param>
         </member>
+        <member name="M:Shared.View.getDrawable(System.String)">
+            <summary>
+            2020-12-23 褰摜鏂颁慨鏀规柟娉�
+            </summary>
+            <param name="filePath"></param>
+            <returns></returns>
+        </member>
         <member name="P:Shared.View.Padding">
             <summary>
             鍐呰竟璺�
@@ -1490,6 +1532,16 @@
         <member name="F:Shared.MouseEventArgs.Y">
             <summary>
             Y鍧愭爣
+            </summary>
+        </member>
+        <member name="F:Shared.Tip.IsTipLong">
+            <summary>
+            閽堝Android鏈夋晥
+            </summary>
+        </member>
+        <member name="P:Shared.Tip.CloseTime">
+            <summary>
+            閽堝iOS鏈夋晥
             </summary>
         </member>
         <member name="M:Shared.Tip.Show(Shared.View)">
@@ -2058,6 +2110,12 @@
             <summary>
             Y杞村潗鏍�
             </summary>
+        </member>
+        <member name="M:Shared.BaseActivity.HideVirtualButtons(Android.App.Activity)">
+            <summary>
+            HideVirtualButtons
+            </summary>
+            <param name="activity"></param>
         </member>
         <member name="M:Shared.BaseActivity.SetImagePermission(System.Action{System.Boolean})">
             <summary>
@@ -2642,6 +2700,17 @@
             璁剧疆PickerView 閫変腑鏂囧瓧鐨勯鑹�
             </summary>
         </member>
+        <member name="P:Shared.UIPickerView.TextSize">
+            <summary>
+            鏂囧瓧澶у皬
+            </summary>
+            <value>The size of the text.</value>
+        </member>
+        <member name="P:Shared.UIPickerView.PickerBackgroundColor">
+            <summary>
+            鑳屾櫙棰滆壊
+            </summary>
+        </member>
         <member name="F:Shared.UIPickerView.mOnSelectChangeListener">
             <summary>
             OnProgressChangeListener 缁ф壙鍝嶅簲浜嬩欢
@@ -2923,16 +2992,6 @@
             </summary>
             <value>鏄惁鍙互婊戝姩</value>
         </member>
-        <member name="P:Shared.CurtainSeekBar.CurtainPaddingLeftRight">
-            <summary>
-            杩涘害鏉′笌宸﹀彸杈规杈硅窛
-            </summary>
-        </member>
-        <member name="P:Shared.CurtainSeekBar.CurtainPaddingTop">
-            <summary>
-            椤堕儴padding
-            </summary>
-        </member>
         <member name="P:Shared.CurtainSeekBar.IsOffline">
             <summary>
             鏄惁绂荤嚎 绂荤嚎鐨勮瘽绂佹婊戝姩骞剁粯鍒惰儗鏅伄鎸″眰
@@ -3018,16 +3077,6 @@
             鏄惁鍙互婊戝姩
             </summary>
             <value>鏄惁鍙互婊戝姩</value>
-        </member>
-        <member name="P:Shared.CurtainRollSeekBar.CurtainPaddingLeftRight">
-            <summary>
-            杩涘害鏉′笌宸﹀彸杈规杈硅窛
-            </summary>
-        </member>
-        <member name="P:Shared.CurtainRollSeekBar.CurtainPaddingTop">
-            <summary>
-            椤堕儴padding
-            </summary>
         </member>
         <member name="P:Shared.CurtainRollSeekBar.IsOffline">
             <summary>
@@ -3242,6 +3291,11 @@
         <member name="M:Shared.EditTextView.InitIosPlaceholderUILabelWithHeight(System.Int32)">
             <summary>
             鍒锋柊placeholderUILabel甯冨眬
+            </summary>
+        </member>
+        <member name="M:Shared.EditTextView.SetSelectionEnd">
+            <summary>
+            璁剧疆鐒︾偣浣嶇疆鍒版渶鍚�
             </summary>
         </member>
         <member name="T:Shared.HorizontalPages">
@@ -3514,6 +3568,17 @@
             </summary>
             <value>鏄惁绂荤嚎</value>
         </member>
+        <member name="P:Shared.DiyImageSeekBar.NowProgressX">
+            <summary>
+            褰撳墠杩涘害鍊� X鍧愭爣
+            </summary>
+            <value>X鍧愭爣</value>
+        </member>
+        <member name="P:Shared.DiyImageSeekBar.IsInvertedProgress">
+            <summary>
+            杩涘害鍊兼槸鍚﹀彇鍙�
+            </summary>
+        </member>
         <member name="F:Shared.DiyImageSeekBar.OnProgressChangedEvent">
             <summary>
             EventHandler
@@ -3738,6 +3803,12 @@
             </summary>
             <value>鏄惁绂荤嚎</value>
         </member>
+        <member name="P:Shared.DiyImageVerticalSeekBar.NowProgressY">
+            <summary>
+            褰撳墠杩涘害鍊� Y鍧愭爣
+            </summary>
+            <value>Y鍧愭爣</value>
+        </member>
         <member name="F:Shared.DiyImageVerticalSeekBar.OnProgressChangedEvent">
             <summary>
             EventHandler
@@ -3824,6 +3895,11 @@
             褰撳墠杩涘害鍊� X鍧愭爣
             </summary>
             <value>X鍧愭爣</value>
+        </member>
+        <member name="P:Shared.CurtainSeekBarOn.IsInvertedProgress">
+            <summary>
+            杩涘害鍊兼槸鍚﹀彇鍙�
+            </summary>
         </member>
         <member name="F:Shared.CurtainSeekBarOn.OnProgressChangedEvent">
             <summary>
@@ -3915,6 +3991,11 @@
         <member name="M:Shared.CurtainRollSeekBarOn.SetBlindsType(System.Boolean)">
             <summary>
             璁剧疆鏄惁涓虹櫨鍙剁獥鏍峰紡
+            </summary>
+        </member>
+        <member name="P:Shared.CurtainRollSeekBarOn.IsInvertedProgress">
+            <summary>
+            杩涘害鍊兼槸鍚﹀彇鍙�
             </summary>
         </member>
         <member name="F:Shared.CurtainRollSeekBarOn.OnProgressChangedEvent">
@@ -4167,6 +4248,187 @@
             OnProgressChangeListener 缁ф壙鍝嶅簲浜嬩欢
             </summary>
         </member>
+        <member name="T:Shared.MyEchartsViewOn">
+            <summary>
+            MyEchartsViewOn
+            </summary>
+        </member>
+        <member name="F:Shared.MyEchartsViewOn.optionJsonString">
+            <summary>
+             Option鐨勯厤缃甁sonString
+            </summary>
+        </member>
+        <member name="M:Shared.MyEchartsViewOn.#ctor">
+            <summary>
+            MyEchartsViewOn
+            </summary>
+        </member>
+        <member name="F:Shared.MyEchartsViewOn.IsLoadEchartsNew">
+            <summary>
+            鏄惁閲囩敤LoadEchartsNew鐨勬柟寮�
+            </summary>
+        </member>
+        <member name="M:Shared.MyEchartsViewOn.ShowWithOption(System.String)">
+            <summary>
+            鍔犺浇Option閰嶇疆鍙傛暟
+            鍒锋柊鍥捐〃
+            </summary>
+            <param name="option"></param>
+        </member>
+        <member name="M:Shared.MyEchartsViewOn.ShowWithOptionJsonString(System.String)">
+            <summary>
+            鍔犺浇Option閰嶇疆JsonString
+            鍒锋柊鍥捐〃
+            </summary>
+            <param name="jsonString"></param>
+        </member>
+        <member name="M:Shared.MyEchartsViewOn.refreshEcharts">
+            <summary>
+            鍒锋柊鐣岄潰
+            </summary>
+        </member>
+        <member name="P:Shared.MyEchartsViewOn.webView">
+            <summary>
+            MyWebView
+            </summary>
+        </member>
+        <member name="T:Shared.WebView">
+            <summary>
+            WebView
+            </summary>
+        </member>
+        <member name="F:Shared.WebView.DidFinishAction">
+            <summary>
+            DidFinishAction
+            </summary>
+        </member>
+        <member name="P:Shared.WebView.webView">
+            <summary>
+            MyWebView
+            </summary>
+        </member>
+        <member name="M:Shared.WebView.#ctor">
+            <summary>
+            WebView
+            </summary>
+        </member>
+        <member name="M:Shared.WebView.LoadRequest(System.String)">
+            <summary>
+            鍔犺浇缃戦〉
+            </summary>
+            <param name="url"></param>
+        </member>
+        <member name="M:Shared.WebView.LoadFileUrl(System.String)">
+            <summary>
+            鍔犺浇鏈湴HTML
+            </summary>
+        </member>
+        <member name="T:Shared.WebView.MyWebViewClient">
+            <summary>
+            MyWebViewClient
+            </summary>
+        </member>
+        <member name="T:Shared.WebView.MyWebView">
+            <summary>
+            MyWebView
+            </summary>
+        </member>
+        <member name="T:Shared.CurtainSingleSeekBar">
+            <summary>
+            CurtainSingleSeekBar
+            鍚戝乏鎴栬�呭悜鍙筹紝鍗曞悜鎵撳紑鐨勫紑鍚堝笜
+            IsRightOpenStyle
+            false锛氬彸婊戝叧闂紝杩涘害Progress 100-->0
+            true锛氬彸婊戞墦寮�锛岃繘搴rogress 0-->100
+            </summary>
+        </member>
+        <member name="P:Shared.CurtainSingleSeekBar.mHDLOACSingleCurtainSeekBar">
+            <summary>
+             褰撳墠瑙嗗浘
+            </summary>
+            <value>The HDLOACSingleCurtainSeekBar.</value>
+        </member>
+        <member name="M:Shared.CurtainSingleSeekBar.#ctor">
+            <summary>
+            鏋勯�犲嚱鏁�
+            </summary>
+        </member>
+        <member name="P:Shared.CurtainSingleSeekBar.ProgressBarUnitSring">
+            <summary>
+            杩涘害鍊兼樉绀哄崟浣�
+            </summary>
+            <value>鍗曚綅瀛楃</value>
+        </member>
+        <member name="P:Shared.CurtainSingleSeekBar.MaxValue">
+            <summary>
+            杩涘害鍊兼渶澶у��
+            </summary>
+            <value>鏈�澶у��</value>
+        </member>
+        <member name="P:Shared.CurtainSingleSeekBar.MinValue">
+            <summary>
+            杩涘害鍊兼渶灏忓��
+            </summary>
+            <value>鏈�灏忓��</value>
+        </member>
+        <member name="P:Shared.CurtainSingleSeekBar.Progress">
+            <summary>
+            褰撳墠杩涘害鍊�
+            </summary>
+            <value>杩涘害鍊�</value>
+        </member>
+        <member name="P:Shared.CurtainSingleSeekBar.ProgressTextColor">
+            <summary>
+            褰撳墠杩涘害鍊兼樉绀虹殑鏂囧瓧棰滆壊
+            </summary>
+            <value>鏂囧瓧棰滆壊</value>
+        </member>
+        <member name="P:Shared.CurtainSingleSeekBar.ProgressTextSize">
+            <summary>
+            褰撳墠杩涘害鍊兼樉绀虹殑鏂囧瓧澶у皬
+            </summary>
+            <value>鏂囧瓧澶у皬</value>
+        </member>
+        <member name="P:Shared.CurtainSingleSeekBar.IsClickable">
+            <summary>
+            鏄惁鍙互婊戝姩
+            </summary>
+            <value>鏄惁鍙互婊戝姩</value>
+        </member>
+        <member name="P:Shared.CurtainSingleSeekBar.IsProgressTextShow">
+            <summary>
+            鏄惁鍙互婊戝姩
+            </summary>
+            <value>鏄惁鍙互婊戝姩</value>
+        </member>
+        <member name="P:Shared.CurtainSingleSeekBar.IsOffline">
+            <summary>
+            鏄惁绂荤嚎 绂荤嚎鐨勮瘽绂佹婊戝姩骞剁粯鍒惰儗鏅伄鎸″眰
+            </summary>
+            <value>鏄惁绂荤嚎</value>
+        </member>
+        <member name="P:Shared.CurtainSingleSeekBar.NowProgressX">
+            <summary>
+            褰撳墠杩涘害鍊� X鍧愭爣
+            </summary>
+            <value>X鍧愭爣</value>
+        </member>
+        <member name="P:Shared.CurtainSingleSeekBar.IsRightOpenStyle">
+            <summary>
+            鏄惁浠庡乏鍒板彸鎵撳紑鍒�100%锛岄粯璁alse
+            </summary>
+            <value>榛樿false</value>
+        </member>
+        <member name="F:Shared.CurtainSingleSeekBar.OnProgressChangedEvent">
+            <summary>
+            EventHandler
+            </summary>
+        </member>
+        <member name="F:Shared.CurtainSingleSeekBar.mOnProgressChangeListener">
+            <summary>
+            OnProgressChangeListener 缁ф壙鍝嶅簲浜嬩欢
+            </summary>
+        </member>
         <member name="T:ViewFlow.ViewSwitchListener">
             Receives call backs when a new {@link View} has been scrolled to.
         </member>

--
Gitblit v1.8.0