From ec8c4e511c84c33bc6475834c29f774c4c4af74d Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 05 八月 2020 16:22:40 +0800
Subject: [PATCH] 2020-08-05-1
---
HDL_ON/UI/UI2/.DS_Store | 0
HDL-ON_Android/Properties/AndroidManifest.xml | 2 +-
HDL_ON/UI/UI2/FuntionControlView/.DS_Store | 0
.vs/HDL_APP_Project/xs/sqlite3/storage.ide-shm | 0
.vs/HDL_APP_Project/xs/sqlite3/storage.ide | 0
.vs/HDL_APP_Project/xs/UserPrefs.xml | 22 ++++++++++++++--------
HDL_ON/UI/UI2/FuntionControlView/Music/SendMethod.cs | 14 ++++++++++----
.vs/HDL_APP_Project/xs/sqlite3/storage.ide-wal | 0
8 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 773ff27..30ce846 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,6 +1,9 @@
锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
<MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.D4411691-F5B8-40F4-97C1-964F33115DBC" />
- <MonoDevelop.Ide.Workbench>
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/FuntionControlView/Music/SendMethod.cs">
+ <Files>
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Music/SendMethod.cs" Line="152" Column="10" />
+ </Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
@@ -8,24 +11,27 @@
<Node name="HDL_ON" expanded="True">
<Node name="UI" expanded="True">
<Node name="UI2" expanded="True">
- <Node name="FuntionControlView" expanded="True" />
+ <Node name="4-PersonalCenter" expanded="True" />
+ <Node name="FuntionControlView" expanded="True">
+ <Node name="Music" expanded="True">
+ <Node name="SendMethod.cs" selected="True" />
+ </Node>
+ </Node>
</Node>
</Node>
</Node>
+ <Node name="HDL-ON_Android" expanded="True">
+ <Node name="Properties" expanded="True" />
+ </Node>
<Node name="HDL-ON_iOS" expanded="True" />
</Node>
- </State>
- </Pad>
- <Pad Id="MonoDevelop.Debugger.WatchPad">
- <State>
- <Value>DB_ResidenceData.residenceData.functionList.functions[18].functionCategory</Value>
</State>
</Pad>
</Pads>
</MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.DebuggingService.PinnedWatches />
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
- <MonoDevelop.Ide.ItemProperties.HDL-ON__Android AndroidDesignerPreferredTheme="AppTheme" PreferredExecutionTarget="Android.5c86e4357d63" />
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__Android AndroidDesignerPreferredTheme="AppTheme" PreferredExecutionTarget="Android.822QECU5228FU" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore />
</MonoDevelop.Ide.DebuggingService.Breakpoints>
diff --git a/.vs/HDL_APP_Project/xs/sqlite3/storage.ide b/.vs/HDL_APP_Project/xs/sqlite3/storage.ide
index 803cd08..77fa01a 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..93d232e
--- /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..0562c13
--- /dev/null
+++ b/.vs/HDL_APP_Project/xs/sqlite3/storage.ide-wal
Binary files differ
diff --git a/HDL-ON_Android/Properties/AndroidManifest.xml b/HDL-ON_Android/Properties/AndroidManifest.xml
index d66b289..2745575 100644
--- a/HDL-ON_Android/Properties/AndroidManifest.xml
+++ b/HDL-ON_Android/Properties/AndroidManifest.xml
@@ -2,10 +2,10 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202003031" android:versionName="1.0.1.202003031" package="com.hdl.onpro">
<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="26" />
<application android:allowBackup="true" android:icon="@drawable/Icon" android:roundIcon="@mipmap/ic_launcher_round" android:label="HDL ON +"></application>
- <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<application android:allowBackup="true" android:icon="@drawable/Icon" android:networkSecurityConfig="@xml/network_security_config" android:largeHeap="true" android:label="ON鈦�">
<provider android:name="android.support.v4.content.FileProvider" android:authorities="com.hdl.on.fileProvider" android:grantUriPermissions="true" android:exported="false">
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths" />
</provider>
</application>
+ <!--鎾斁鏈湴闊充箰鏉冮檺-->鈥� <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
</manifest>
\ No newline at end of file
diff --git a/HDL_ON/UI/UI2/.DS_Store b/HDL_ON/UI/UI2/.DS_Store
new file mode 100644
index 0000000..6ae8178
--- /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
index 735b473..10ca149 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/.DS_Store
+++ b/HDL_ON/UI/UI2/FuntionControlView/.DS_Store
Binary files differ
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/SendMethod.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/SendMethod.cs
index 084b6b3..655f9a7 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/SendMethod.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/SendMethod.cs
@@ -218,13 +218,19 @@
}
finally
{
- #region 鏇存柊鍏朵粬鐣岄潰闊充箰鐘舵��
+ #region 鏇存柊鍏朵粬鐣岄潰闊充箰鐘舵��
Application.RunOnMainThread(() =>
{
+ //绉�妗″姞鐨�
a31MusicModel.on_off = a31MusicModel.A31PlayStatus.status == "play" ? "on" : "off";
- Console.WriteLine($"music 88ikgugjghgjkgkjhgkjhgkg {a31MusicModel.on_off}");
+ Console.WriteLine($"music : {a31MusicModel.sid} : {a31MusicModel.on_off}");
//HomePage.
HomePage.UpdataFunctionStates(a31MusicModel);
+ foreach (var e in A31MusicModel.A31MusicModelList)
+ {
+ //if()
+ RoomPage.UpdataStates(a31MusicModel);
+ }
});
#endregion
}
@@ -786,9 +792,9 @@
byte[] recevieBytes = webClient.UploadData(new Uri("http://" + ip + ":" + port + "/upnp/control/PlayQueue1"), "POST", System.Text.Encoding.UTF8.GetBytes(listInfo));
var s = System.Text.Encoding.UTF8.GetString(recevieBytes, 0, recevieBytes.Length);
}
- catch
+ catch(Exception e)
{
-
+ var d = e.Message;
}
}
--
Gitblit v1.8.0