From af4101b1d8461331bc3163b738fc75d4bf67c85c Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 28 七月 2020 17:47:44 +0800
Subject: [PATCH] 2020-07-28-1
---
HDL_ON/UI/UI2/.DS_Store | 0
HDL_ON/UI/.DS_Store | 0
.vs/HDL_APP_Project/xs/sqlite3/storage.ide-shm | 0
DLL/.DS_Store | 0
HDL_ON/UI/UI2/FuntionControlView/Music/View/TopView.cs | 12 ++++++
DLL/DLL/.DS_Store | 0
.vs/HDL_APP_Project/xs/project-cache/Shared.Droid-Debug.json | 2
HDL_ON/UI/UI2/FuntionControlView/.DS_Store | 0
HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs | 3 -
HDL_ON/UI/UI2/FuntionControlView/Music/View/SizeClass.cs | 11 ++++-
HDL_ON/.DS_Store | 0
.DS_Store | 0
.vs/HDL_APP_Project/xs/project-cache/Shared.Droid.HDLWidget-Debug.json | 2
.vs/HDL_APP_Project/xs/sqlite3/storage.ide | 0
.vs/HDL_APP_Project/xs/UserPrefs.xml | 39 ++++++++-----------
HDL_ON/UI/MainPage.cs | 2
HDL_ON/DriverLayer/Packet.cs | 34 +++++++++--------
HDL_ON/UI/UI2/FuntionControlView/Music/.DS_Store | 0
HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs | 7 ++-
.vs/HDL_APP_Project/xs/sqlite3/storage.ide-wal | 0
20 files changed, 64 insertions(+), 48 deletions(-)
diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000..d1ae52d
--- /dev/null
+++ b/.DS_Store
Binary files differ
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 700f9b2..583b010 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,45 +1,38 @@
锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
<MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.913cb77b0eef11c9119c61a02bc00fec01bf67d6" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/FuntionControlView/Music/View/TopView.cs">
<Files>
- <File FileName="HDL_ON/DriverLayer/Control_Bus.cs" Line="6" Column="22" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs" Line="346" Column="19" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs" Line="10" Column="34" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Music/A31LocalMusicList.cs" Line="447" Column="1" />
+ <File FileName="HDL-ON_Android/Application.cs" Line="100" Column="28" />
+ <File FileName="Shared.Droid/BaseActivity.cs" Line="169" Column="35" />
+ <File FileName="Shared.Droid/Other/MusicService.cs" Line="99" Column="1" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Music/A31USBMusicList.cs" Line="96" Column="34" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs" Line="266" Column="70" />
<File FileName="HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicView.cs" Line="131" Column="32" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs" Line="31" Column="46" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Music/View/PlayView.cs" Line="40" Column="52" />
- <File FileName="HDL_ON/Entity/Function/Function.cs" Line="294" Column="27" />
- <File FileName="HDL_ON/Common/R.cs" Line="280" Column="36" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs" Line="46" Column="96" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPageBLL.cs" Line="14" Column="29" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicSourceView.cs" Line="20" Column="10" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicSourcePage.cs" Line="196" Column="57" />
- <File FileName="HDL_ON/UI/UI0-Public/TopViewDiv.cs" Line="103" Column="47" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs" Line="47" Column="23" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Music/View/TopView.cs" Line="54" Column="23" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="HDL_APP_Project" expanded="True">
<Node name="HDL_ON" expanded="True">
- <Node name="Common" expanded="True" />
- <Node name="DriverLayer" expanded="True" />
- <Node name="Entity" expanded="True">
- <Node name="Enumerative" expanded="True" />
- <Node name="Function" expanded="True" />
- </Node>
<Node name="UI" expanded="True">
- <Node name="UI0-Public" expanded="True" />
<Node name="UI2" expanded="True">
- <Node name="2-Classification" expanded="True" />
<Node name="FuntionControlView" expanded="True">
<Node name="Music" expanded="True">
- <Node name="View" expanded="True" />
- <Node name="A31MusicModel.cs" selected="True" />
+ <Node name="View" expanded="True">
+ <Node name="TopView.cs" selected="True" />
+ </Node>
</Node>
</Node>
</Node>
</Node>
</Node>
+ <Node name="HDL-ON_Android" expanded="True" />
+ <Node name="Shared.Droid" expanded="True">
+ <Node name="Other" expanded="True" />
+ </Node>
</Node>
</State>
</Pad>
diff --git a/.vs/HDL_APP_Project/xs/project-cache/Shared.Droid-Debug.json b/.vs/HDL_APP_Project/xs/project-cache/Shared.Droid-Debug.json
index 63d879b..ec956d5 100644
--- a/.vs/HDL_APP_Project/xs/project-cache/Shared.Droid-Debug.json
+++ b/.vs/HDL_APP_Project/xs/project-cache/Shared.Droid-Debug.json
@@ -1 +1 @@
-{"Format":1,"ProjectReferences":[],"MetadataReferences":[{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/10.0.6.2/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Java.Interop.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/10.0.6.2/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v8.0/Mono.Android.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/10.0.6.2/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/mscorlib.dll","Aliases":[],"Framework":null},{"FilePath":"/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/bin/Debug/Newtonsoft.Json.dll","Aliases":[],"Framework":null},{"FilePath":"/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/bin/Debug/Shared.Droid.Smartrefresh.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/10.0.6.2/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/System.Core.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/10.0.6.2/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/System.Data.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/10.0.6.2/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/System.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/10.0.6.2/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Runtime.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/10.0.6.2/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/System.Web.Services.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/10.0.6.2/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/System.Xml.dll","Aliases":[],"Framework":null},{"FilePath":"/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/bin/Debug/Xamarin.Android.Arch.Core.Common.dll","Aliases":[],"Framework":null},{"FilePath":"/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/bin/Debug/Xamarin.Android.Arch.Lifecycle.Common.dll","Aliases":[],"Framework":null},{"FilePath":"/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/bin/Debug/Xamarin.Android.Arch.Lifecycle.Runtime.dll","Aliases":[],"Framework":null},{"FilePath":"/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/bin/Debug/Xamarin.Android.Support.Animated.Vector.Drawable.dll","Aliases":[],"Framework":null},{"FilePath":"/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/bin/Debug/Xamarin.Android.Support.Annotations.dll","Aliases":[],"Framework":null},{"FilePath":"/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/bin/Debug/Xamarin.Android.Support.Compat.dll","Aliases":[],"Framework":null},{"FilePath":"/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/bin/Debug/Xamarin.Android.Support.Core.UI.dll","Aliases":[],"Framework":null},{"FilePath":"/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/bin/Debug/Xamarin.Android.Support.Core.Utils.dll","Aliases":[],"Framework":null},{"FilePath":"/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/bin/Debug/Xamarin.Android.Support.Fragment.dll","Aliases":[],"Framework":null},{"FilePath":"/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/bin/Debug/Xamarin.Android.Support.Media.Compat.dll","Aliases":[],"Framework":null},{"FilePath":"/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/bin/Debug/Xamarin.Android.Support.v4.dll","Aliases":[],"Framework":null},{"FilePath":"/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/bin/Debug/Xamarin.Android.Support.v7.AppCompat.dll","Aliases":[],"Framework":null},{"FilePath":"/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/bin/Debug/Xamarin.Android.Support.Vector.Drawable.dll","Aliases":[],"Framework":null},{"FilePath":"/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid.HDLWidget/bin/Debug/Shared.Droid.HDLWidget.dll","Aliases":[],"Framework":null},{"FilePath":"/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid.TouchID/bin/Debug/Shared.Droid.TouchID.dll","Aliases":[],"Framework":null}],"Files":["/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/Properties/AssemblyInfo.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/IO/FileUtils.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/Net/NetWiFi.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/Other/DensityUtil.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/Alert.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/Application.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/Button.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/DateView.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/TimeView.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/Dialog.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/EditText.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/Enum.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/HorizontalScrolViewLayout.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/HorizontalSeekBar.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/Lanuage.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/Loading.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/PageLayout.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/RowLayout.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/Spinner.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/VerticalScrolViewLayout.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/VerticalSeekBar.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/Video.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/View.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/Tip.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/FrameLayout.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/ViewGroup.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/Camera.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/TextView.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/ColorPicker.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/UrlMonitor.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/MusicVerticalScrolViewLayout.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/SwipeLayout.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/ImageView.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/WiimuUPnp.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/BaseActivity.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/Other/Server.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/Other/ServerHandler.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/Other/MusicService.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/Other/MusicInfo.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/Other/Volume.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/CommonClass.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/MyBroadcastReceive.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/Net/WifiUtil.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/SplashActivity.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/MyEchartsView.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/PickerView.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/ArcSeekBar.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/Utils/TouchIDUtils.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/WaveSeekBar.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/GDMapView.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/Utils/HDLUtils.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/UIPickerView.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/UICoverFlowView.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/CropImage.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/UIDrawerLayout.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/MyService.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/GestureLockView.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/QRCode.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/Contacts.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/VerticalRefreshLayout.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/CurtainSeekBar.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/CurtainRollSeekBar.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/ArcScaleSeekBar.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/EditTextView.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/HorizontalPages.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/DiyImageSeekBar.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/BaseSeekBar.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/ImageViewNew.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/ProgressLoading.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/GradientMaskView.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/DiyImageVerticalSeekBar.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/Additions/AboutAdditions.txt","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/Jars/AboutJars.txt","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/Transforms/EnumFields.xml","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/Transforms/EnumMethods.xml","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/Transforms/Metadata.xml","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/Jars/EzvizGlobalAPI.jar","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/Jars/MyJar.jar","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/Jars/libammsdk.jar"],"BuildActions":["Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","None","None","TransformFile","TransformFile","TransformFile","EmbeddedJar","EmbeddedJar","EmbeddedJar"],"Analyzers":[]}
\ No newline at end of file
+{"Format":1,"ProjectReferences":[],"MetadataReferences":[{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/10.0.6.2/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Java.Interop.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/10.0.6.2/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v8.0/Mono.Android.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/10.0.6.2/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/mscorlib.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/10.0.6.2/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/System.Core.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/10.0.6.2/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/System.Data.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/10.0.6.2/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/System.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/10.0.6.2/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Runtime.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/10.0.6.2/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/System.Web.Services.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/10.0.6.2/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/System.Xml.dll","Aliases":[],"Framework":null},{"FilePath":"/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid.HDLWidget/bin/Debug/Shared.Droid.HDLWidget.dll","Aliases":[],"Framework":null},{"FilePath":"/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid.TouchID/bin/Debug/Shared.Droid.TouchID.dll","Aliases":[],"Framework":null}],"Files":["/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/Properties/AssemblyInfo.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/IO/FileUtils.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/Net/NetWiFi.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/Other/DensityUtil.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/Alert.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/Application.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/Button.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/DateView.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/TimeView.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/Dialog.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/EditText.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/Enum.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/HorizontalScrolViewLayout.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/HorizontalSeekBar.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/Lanuage.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/Loading.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/PageLayout.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/RowLayout.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/Spinner.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/VerticalScrolViewLayout.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/VerticalSeekBar.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/Video.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/View.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/Tip.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/FrameLayout.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/ViewGroup.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/Camera.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/TextView.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/ColorPicker.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/UrlMonitor.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/MusicVerticalScrolViewLayout.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/SwipeLayout.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/ImageView.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/WiimuUPnp.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/BaseActivity.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/Other/Server.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/Other/ServerHandler.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/Other/MusicService.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/Other/MusicInfo.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/Other/Volume.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/CommonClass.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/MyBroadcastReceive.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/Net/WifiUtil.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/SplashActivity.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/MyEchartsView.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/PickerView.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/ArcSeekBar.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/Utils/TouchIDUtils.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/WaveSeekBar.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/GDMapView.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/Utils/HDLUtils.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/UIPickerView.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/UICoverFlowView.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/CropImage.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/UIDrawerLayout.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/MyService.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/GestureLockView.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/QRCode.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/Contacts.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/VerticalRefreshLayout.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/CurtainSeekBar.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/CurtainRollSeekBar.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/ArcScaleSeekBar.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/EditTextView.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/HorizontalPages.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/DiyImageSeekBar.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/BaseSeekBar.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/ImageViewNew.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/ProgressLoading.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/GradientMaskView.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/UI/DiyImageVerticalSeekBar.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/Additions/AboutAdditions.txt","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/Jars/AboutJars.txt","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/Transforms/EnumFields.xml","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/Transforms/EnumMethods.xml","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/Transforms/Metadata.xml","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/Jars/EzvizGlobalAPI.jar","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/Jars/MyJar.jar","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid/Jars/libammsdk.jar"],"BuildActions":["Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","None","None","TransformFile","TransformFile","TransformFile","EmbeddedJar","EmbeddedJar","EmbeddedJar"],"Analyzers":[]}
\ No newline at end of file
diff --git a/.vs/HDL_APP_Project/xs/project-cache/Shared.Droid.HDLWidget-Debug.json b/.vs/HDL_APP_Project/xs/project-cache/Shared.Droid.HDLWidget-Debug.json
index 307ed9a..57702a7 100644
--- a/.vs/HDL_APP_Project/xs/project-cache/Shared.Droid.HDLWidget-Debug.json
+++ b/.vs/HDL_APP_Project/xs/project-cache/Shared.Droid.HDLWidget-Debug.json
@@ -1 +1 @@
-{"Format":1,"ProjectReferences":[],"MetadataReferences":[{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/10.0.6.2/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Java.Interop.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/10.0.6.2/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v8.0/Mono.Android.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/10.0.6.2/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/mscorlib.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/10.0.6.2/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/System.Core.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/10.0.6.2/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/System.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/10.0.6.2/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Runtime.dll","Aliases":[],"Framework":null},{"FilePath":"/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid.HDLWidget/bin/Debug/Xamarin.Android.Arch.Core.Common.dll","Aliases":[],"Framework":null},{"FilePath":"/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid.HDLWidget/bin/Debug/Xamarin.Android.Arch.Lifecycle.Common.dll","Aliases":[],"Framework":null},{"FilePath":"/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid.HDLWidget/bin/Debug/Xamarin.Android.Arch.Lifecycle.Runtime.dll","Aliases":[],"Framework":null},{"FilePath":"/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid.HDLWidget/bin/Debug/Xamarin.Android.Support.Animated.Vector.Drawable.dll","Aliases":[],"Framework":null},{"FilePath":"/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid.HDLWidget/bin/Debug/Xamarin.Android.Support.Annotations.dll","Aliases":[],"Framework":null},{"FilePath":"/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid.HDLWidget/bin/Debug/Xamarin.Android.Support.Compat.dll","Aliases":[],"Framework":null},{"FilePath":"/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid.HDLWidget/bin/Debug/Xamarin.Android.Support.Core.UI.dll","Aliases":[],"Framework":null},{"FilePath":"/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid.HDLWidget/bin/Debug/Xamarin.Android.Support.Core.Utils.dll","Aliases":[],"Framework":null},{"FilePath":"/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid.HDLWidget/bin/Debug/Xamarin.Android.Support.Fragment.dll","Aliases":[],"Framework":null},{"FilePath":"/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid.HDLWidget/bin/Debug/Xamarin.Android.Support.Media.Compat.dll","Aliases":[],"Framework":null},{"FilePath":"/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid.HDLWidget/bin/Debug/Xamarin.Android.Support.v7.AppCompat.dll","Aliases":[],"Framework":null},{"FilePath":"/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid.HDLWidget/bin/Debug/Xamarin.Android.Support.Vector.Drawable.dll","Aliases":[],"Framework":null}],"Files":["/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid.HDLWidget/Properties/AssemblyInfo.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid.HDLWidget/Jars/AboutJars.txt","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid.HDLWidget/Additions/AboutAdditions.txt","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid.HDLWidget/packages.config","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid.HDLWidget/Info.plist","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid.HDLWidget/Transforms/Metadata.xml","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid.HDLWidget/Transforms/EnumFields.xml","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid.HDLWidget/Transforms/EnumMethods.xml","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid.HDLWidget/Jars/HDLWidgetXM-V1.0.6.aar"],"BuildActions":["Compile","None","None","None","None","TransformFile","TransformFile","TransformFile","LibraryProjectZip"],"Analyzers":[]}
\ No newline at end of file
+{"Format":1,"ProjectReferences":[],"MetadataReferences":[{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/10.0.6.2/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Java.Interop.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/10.0.6.2/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v8.0/Mono.Android.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/10.0.6.2/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/mscorlib.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/10.0.6.2/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/System.Core.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/10.0.6.2/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/System.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/10.0.6.2/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Runtime.dll","Aliases":[],"Framework":null}],"Files":["/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid.HDLWidget/Properties/AssemblyInfo.cs","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid.HDLWidget/Jars/AboutJars.txt","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid.HDLWidget/Additions/AboutAdditions.txt","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid.HDLWidget/packages.config","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid.HDLWidget/Info.plist","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid.HDLWidget/Transforms/Metadata.xml","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid.HDLWidget/Transforms/EnumFields.xml","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid.HDLWidget/Transforms/EnumMethods.xml","/Users/hdl/Desktop/wjc/HDL_APP_Project/Shared.Droid.HDLWidget/Jars/HDLWidgetXM-V1.0.6.aar"],"BuildActions":["Compile","None","None","None","None","TransformFile","TransformFile","TransformFile","LibraryProjectZip"],"Analyzers":[]}
\ No newline at end of file
diff --git a/.vs/HDL_APP_Project/xs/sqlite3/storage.ide b/.vs/HDL_APP_Project/xs/sqlite3/storage.ide
index 2682d98..1bb971f 100644
--- a/.vs/HDL_APP_Project/xs/sqlite3/storage.ide
+++ b/.vs/HDL_APP_Project/xs/sqlite3/storage.ide
Binary files differ
diff --git a/.vs/HDL_APP_Project/xs/sqlite3/storage.ide-shm b/.vs/HDL_APP_Project/xs/sqlite3/storage.ide-shm
new file mode 100644
index 0000000..f615ce7
--- /dev/null
+++ b/.vs/HDL_APP_Project/xs/sqlite3/storage.ide-shm
Binary files differ
diff --git a/.vs/HDL_APP_Project/xs/sqlite3/storage.ide-wal b/.vs/HDL_APP_Project/xs/sqlite3/storage.ide-wal
new file mode 100644
index 0000000..7a69c0e
--- /dev/null
+++ b/.vs/HDL_APP_Project/xs/sqlite3/storage.ide-wal
Binary files differ
diff --git a/DLL/.DS_Store b/DLL/.DS_Store
new file mode 100644
index 0000000..45f57dd
--- /dev/null
+++ b/DLL/.DS_Store
Binary files differ
diff --git a/DLL/DLL/.DS_Store b/DLL/DLL/.DS_Store
new file mode 100644
index 0000000..d87a566
--- /dev/null
+++ b/DLL/DLL/.DS_Store
Binary files differ
diff --git a/HDL_ON/.DS_Store b/HDL_ON/.DS_Store
new file mode 100644
index 0000000..1fc412b
--- /dev/null
+++ b/HDL_ON/.DS_Store
Binary files differ
diff --git a/HDL_ON/DriverLayer/Packet.cs b/HDL_ON/DriverLayer/Packet.cs
index fb19585..06b29b2 100644
--- a/HDL_ON/DriverLayer/Packet.cs
+++ b/HDL_ON/DriverLayer/Packet.cs
@@ -95,28 +95,30 @@
//鏈夌敤鐨勯檮鍔犳暟鎹�
usefulBytes = new byte[this.Bytes[16] - 11];
Array.Copy(Bytes, 25, usefulBytes, 0, usefulBytes.Length);
- }
- if (ReceiveEvent != null)
- {
- string revIp = $"{Bytes[0]}.{Bytes[1]}.{Bytes[2]}.{Bytes[3]}";
- if (revIp == "172.16.2.237")
+
+
+ if (ReceiveEvent != null)
{
+ string revIp = $"{Bytes[0]}.{Bytes[1]}.{Bytes[2]}.{Bytes[3]}";
+ if (revIp == "172.16.2.237")
+ {
+ }
+ ReceiveEvent(subnetID, deviceID, command, usefulBytes, revIp);
}
- ReceiveEvent(subnetID, deviceID, command, usefulBytes, revIp);
- }
- //if (command == Command.SuperGatewayAgentACK) {
- // SuperGateWay.SendAndReceiveDatas.Recevice (subnetID, deviceID, usefulBytes);
- //}
- if (ReceviceAllDadaAction != null)
- {
- ReceviceAllDadaAction(subnetID, deviceID, deviceType, command, targetSubnetID, targetDeviceID, usefulBytes, (System.Net.IPEndPoint)RemoteEndPoint);
- }
- //澶勭悊鏄惁瑕侀噸鍙戞暟鎹�
- Control.ManagerReceive(subnetID, deviceID, command, targetSubnetID, targetDeviceID, usefulBytes, RemoteEndPoint);
+ //if (command == Command.SuperGatewayAgentACK) {
+ // SuperGateWay.SendAndReceiveDatas.Recevice (subnetID, deviceID, usefulBytes);
+ //}
+ if (ReceviceAllDadaAction != null)
+ {
+ ReceviceAllDadaAction(subnetID, deviceID, deviceType, command, targetSubnetID, targetDeviceID, usefulBytes, (System.Net.IPEndPoint)RemoteEndPoint);
+ }
+ //澶勭悊鏄惁瑕侀噸鍙戞暟鎹�
+ Control.ManagerReceive(subnetID, deviceID, command, targetSubnetID, targetDeviceID, usefulBytes, RemoteEndPoint);
+ }
}
}
}
diff --git a/HDL_ON/UI/.DS_Store b/HDL_ON/UI/.DS_Store
new file mode 100644
index 0000000..eba2adf
--- /dev/null
+++ b/HDL_ON/UI/.DS_Store
Binary files differ
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 4959ca6..7b2716a 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -129,7 +129,7 @@
BasePageView.ScrollEnabled = false;
};
BaseView.AddChidren(BasePageView);
-
+
//璺宠浆椤甸潰----
var userPage = new UI.UserPage();
BasePageView.AddChidren(userPage);
diff --git a/HDL_ON/UI/UI2/.DS_Store b/HDL_ON/UI/UI2/.DS_Store
new file mode 100644
index 0000000..31bfbdc
--- /dev/null
+++ b/HDL_ON/UI/UI2/.DS_Store
Binary files differ
diff --git a/HDL_ON/UI/UI2/FuntionControlView/.DS_Store b/HDL_ON/UI/UI2/FuntionControlView/.DS_Store
new file mode 100644
index 0000000..4ec95b4
--- /dev/null
+++ b/HDL_ON/UI/UI2/FuntionControlView/.DS_Store
Binary files differ
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/.DS_Store b/HDL_ON/UI/UI2/FuntionControlView/Music/.DS_Store
new file mode 100644
index 0000000..d6e3f9d
--- /dev/null
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/.DS_Store
Binary files differ
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs
index cc5652d..3a5df3a 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs
@@ -44,7 +44,7 @@
{
RemoveFromParent();
};
- topView.setBtn.MouseUpEventHandler += (sender, e) =>
+ topView.clickSetBtn.MouseUpEventHandler += (sender, e) =>
{
A31MusicSourcePage a31MusicSourcePage = new A31MusicSourcePage();
MainPage.BasePageView.AddChidren(a31MusicSourcePage);
@@ -165,7 +165,6 @@
{
A31MusicModel.Current.LoveMusicInfoList.RemoveAll((musicInfo) =>
{
- //涔熻鍔犳瓕鎵嬪悕鍒ゆ柇
return musicInfo.URL == url;
});
}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
index ea893de..a190998 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
@@ -50,7 +50,7 @@
public void Show()
{
-
+
#region 鐣岄潰甯冨眬
this.BackgroundColor = Color.ViewColor;
@@ -263,7 +263,10 @@
};
musicView.musicIfonFl.MouseUpEventHandler += clickPlayView;
musicView.clickBtn.MouseUpEventHandler += clickPlayView;//
-
+ musicView.singerBtn.MouseUpEventHandler += clickPlayView;
+ musicView.songNameBtn.MouseUpEventHandler += clickPlayView;//
+ musicView.musicNameBtn.MouseUpEventHandler += clickPlayView;
+ musicView.regionBtn.MouseUpEventHandler += clickPlayView;//
///涓婁竴鏇茬偣鍑讳簨浠�
musicView.prevBtn.MouseDownEventHandler += (sender, e) =>
{
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/View/SizeClass.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/View/SizeClass.cs
index 7c199ee..baeac52 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/View/SizeClass.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/View/SizeClass.cs
@@ -1,12 +1,14 @@
锘縰sing System;
namespace HDL_ON.UI.Music
{
+ /// <summary>
+ /// 鏂囨湰瀛楀彿澶у皬
+ /// </summary>
public static class TextSize
{
public static int TopLine = 1;
public static int MiddleLine =1;
public static int DownLine = 1;
-
public static int Text24 = 24;
@@ -18,6 +20,9 @@
public static int Text10 = 10;
}
+ /// <summary>
+ /// 甯冨眬棰滆壊鍊�
+ /// </summary>
public static class Color
{
/// <summary>
@@ -69,7 +74,9 @@
public static uint TextCancelColor = 0xFF798394;
}
-
+ /// <summary>
+ /// 鐣岄潰甯冨眬鍥哄畾鍍忕礌
+ /// </summary>
public static class H_W {
/// <summary>
/// app楂樺害
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/View/TopView.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/View/TopView.cs
index 453aa2b..acc343d 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/View/TopView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/View/TopView.cs
@@ -60,6 +60,8 @@
UnSelectedImagePath = "MusicIcon/set.png",
Visible=false,
};
+
+
/// <summary>
/// 澧炲姞鐑敭澶у皬Btn
/// </summary>
@@ -67,6 +69,15 @@
{
Width = Application.GetRealWidth(16+12+16),
Height = Application.GetRealHeight(64),
+ };
+ /// <summary>
+ /// 璁剧疆鍥炬爣澧炲姞鐑敭澶у皬
+ /// </summary>
+ public Button clickSetBtn= new Button
+ {
+ X = Application.GetRealWidth(337-37),
+ Width = Application.GetMinRealAverage(28+37),
+ Height = Application.GetMinRealAverage(28+7+29),
};
/// <summary>
/// 鏈�涓婇潰鐨勯偅鍧楁柟娉�
@@ -80,6 +91,7 @@
fLayout.AddChidren(lineBtn);
fLayout.AddChidren(setBtn);
fLayout.AddChidren(clickBackBtn);
+ fLayout.AddChidren(clickSetBtn);
return fLayout;
}
#endregion
--
Gitblit v1.8.0