From e3687f944bf64f1430bf1345daf5502e5a47326e Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 25 十二月 2020 09:32:16 +0800
Subject: [PATCH] 20201225-2
---
HDL-ON_Android/Properties/AndroidManifest.xml | 2 +-
.vs/HDL_APP_Project/xs/UserPrefs.xml | 35 +++--------------------------------
HDL_ON/DAL/Mqtt/MqttClient.cs | 4 +---
3 files changed, 5 insertions(+), 36 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 0408ca0..de37053 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -2,26 +2,9 @@
<MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-000404163432002E" />
<MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs">
<Files>
- <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePage.cs" Line="117" Column="14" />
- <File FileName="HDL_ON/UI/UI2/UserPage.cs" Line="11" Column="1" />
- <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs" Line="1" Column="1" />
- <File FileName="HDL_ON/Common/ApiUtlis.cs" Line="62" Column="33" />
- <File FileName="HDL_ON/UI/UI2/2-Classification/RoomPage.cs" Line="98" Column="45" />
- <File FileName="HDL_ON/UI/UI2/2-Classification/RoomPageBLL.cs" Line="15" Column="1" />
- <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs" Line="278" Column="57" />
- <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs" Line="53" Column="12" />
- <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs" Line="1" Column="1" />
- <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionPageBLL.cs" Line="13" Column="56" />
- <File FileName="HDL_ON/UI/UI0-Public/PublicAssmebly.cs" Line="523" Column="54" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs" Line="1" Column="1" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs" Line="100" Column="27" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicView.cs" Line="1" Column="1" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Music/View/TopView.cs" Line="68" Column="56" />
- <File FileName="HDL_ON/UI/MainPage.cs" Line="29" Column="55" />
- <File FileName="HDL-ON_iOS/Info.plist" />
- <File FileName="HDL_ON/Entity/Function/Light.cs" Line="180" Column="1" />
- <File FileName="HDL_ON/DAL/Mqtt/MqttClient.cs" Line="231" Column="1" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs" Line="21" Column="1" />
+ <File FileName="HDL_ON/DAL/Mqtt/MqttClient.cs" Line="608" Column="13" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPage.cs" Line="214" Column="63" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs" Line="1" Column="1" />
</Files>
<Pads>
<Pad Id="ProjectPad">
@@ -32,22 +15,11 @@
<Node name="DAL" expanded="True">
<Node name="Mqtt" expanded="True" />
</Node>
- <Node name="Entity" 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="3-Intelligence" expanded="True">
- <Node name="Scene" expanded="True" />
- </Node>
- <Node name="4-PersonalCenter" expanded="True" />
<Node name="FuntionControlView" expanded="True">
<Node name="Light" expanded="True">
<Node name="ColorTureLampPageBLL.cs" selected="True" />
- </Node>
- <Node name="Music" expanded="True">
- <Node name="View" expanded="True" />
</Node>
</Node>
</Node>
@@ -73,7 +45,6 @@
<BreakpointStore>
<Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs" relfile="HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs" line="315" column="1" />
<Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs" line="90" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs" line="21" column="1" />
</BreakpointStore>
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
diff --git a/HDL-ON_Android/Properties/AndroidManifest.xml b/HDL-ON_Android/Properties/AndroidManifest.xml
index dc8c50a..c66f3bf 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:versionCode="202012245" android:versionName="1.0.202012245" package="com.hdl.onpro">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202012251" android:versionName="1.0.202012251" package="com.hdl.onpro">
<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="26" />
<!-- 瀹氫綅鏉冮檺-->
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
diff --git a/HDL_ON/DAL/Mqtt/MqttClient.cs b/HDL_ON/DAL/Mqtt/MqttClient.cs
index 1629706..f61aa02 100644
--- a/HDL_ON/DAL/Mqtt/MqttClient.cs
+++ b/HDL_ON/DAL/Mqtt/MqttClient.cs
@@ -196,6 +196,7 @@
var result = await RemoteMqttClient.SubscribeAsync(new MqttTopicFilter[] { topicFilterBusGateWayToClient, topicFilterPush2, topicAlinkStatus });
if (result.Items[0].ResultCode == MQTTnet.Client.Subscribing.MqttClientSubscribeResultCode.GrantedQoS0)
{
+ Control.Ins.GatewayOnline = true;
isSubscribeSuccess = true;
Utlis.WriteLine("璁㈤槄鎴愬姛锛�");
@@ -327,7 +328,6 @@
{
RemoteMqttClient.UseConnectedHandler(async (e) =>
{
- Control.Ins.GatewayOnline = true;
IfNeedReadAllDeviceStatus = true;
Utlis.WriteLine($"============>Mqtt杩滅▼杩炴帴鎴愬姛");
SendPushSignOut();
@@ -605,8 +605,6 @@
/// <returns></returns>
public static async Task MqttRemoteSend(byte[] message, int optionType = 0)
{
- //return;
-
try
{
string topicName;
--
Gitblit v1.8.0