From 9a4b76398009cf76c508d61f7e48fb6f5cb7ac2d Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 21 七月 2020 09:46:53 +0800
Subject: [PATCH] 请合并最新多功能面板代码
---
ZigbeeApp/Shared/Common/CommonPage.cs | 2 +-
ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/MutilfunctionPanelMethod.cs | 15 +++++++++++++++
ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml | 2 +-
3 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml b/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml
index b4d7268..5bc9b2a 100644
--- a/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml
+++ b/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
锘�<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.hdl.home" android:versionCode="0120072004" android:installLocation="auto" android:versionName="1.1.0120072004">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.hdl.home" android:versionCode="0120072005" android:installLocation="auto" android:versionName="1.1.0120072005">
<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="26" />
<permission android:name="com.hdl.home.permission.JPUSH_MESSAGE" android:protectionLevel="signature" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
diff --git a/ZigbeeApp/Shared/Common/CommonPage.cs b/ZigbeeApp/Shared/Common/CommonPage.cs
index b9c9163..03b243a 100644
--- a/ZigbeeApp/Shared/Common/CommonPage.cs
+++ b/ZigbeeApp/Shared/Common/CommonPage.cs
@@ -42,7 +42,7 @@
/// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string CodeIDString = "1.1.0120072004";
+ public static string CodeIDString = "1.1.0120072005";
/// <summary>
/// 娉ㄥ唽鏉ユ簮(0:HDL On 1:Zigbee)
/// </summary>
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/MutilfunctionPanelMethod.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/MutilfunctionPanelMethod.cs
index 1412e6a..7e5db3d 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/MutilfunctionPanelMethod.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/MutilfunctionPanelMethod.cs
@@ -48,6 +48,21 @@
var tempList = new List<BindListAllInfo>();
int count1 = 0;
int count2 = 0;
+
+ switch (curBindType)
+ {
+ case 1:
+ curSwitchCount = 0;
+ break;
+ case 2:
+ curSocketCount = 0;
+ break;
+ case 3:
+ curLightFromRelayCount = 0;
+ curLightCount = 0;
+ break;
+ }
+
foreach (var key in bindTargetsFromMutilfunctionPanelList.Keys)
{
var bList = bindTargetsFromMutilfunctionPanelList[key];
--
Gitblit v1.8.0