From 783f19a056f29c892c4f852f1da37233951bdb95 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期四, 18 三月 2021 18:01:49 +0800
Subject: [PATCH] 2021-3-18-2

---
 HDL-ON_Android/Assets/Phone/PirIcon/custom.png           |    0 
 HDL-ON_Android/Assets/Phone/PirIcon/air.png              |    0 
 HDL-ON_Android/Assets/Phone/PirIcon/addlbuton.png        |    0 
 HDL-ON_Android/Assets/Phone/PirIcon/online.png           |    0 
 HDL-ON_Android/Assets/Phone/PirIcon/search.png           |    0 
 HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs     |    2 
 HDL_ON/DAL/Mqtt/MqttClient.cs                            |    2 
 HDL-ON_Android/Assets/Phone/PirIcon/tv.png               |    0 
 HDL-ON_Android/HDL-ON_Android.csproj                     |    6 +++
 HDL-ON_Android/Assets/Phone/PirIcon/projector.png        |    0 
 HDL-ON_Android/Assets/Phone/PirIcon/failed.png           |    0 
 HDL-ON_Android/Assets/Phone/PirIcon/Infraredtreasure.png |    0 
 HDL-ON_Android/Assets/Phone/PirIcon/fan.png              |    0 
 .vs/HDL_APP_Project/xs/UserPrefs.xml                     |   52 ++++++++++++--------------
 HDL-ON_Android/Assets/Phone/PirIcon/STB.png              |    0 
 HDL-ON_Android/Assets/Phone/PirIcon/dvd.png              |    0 
 HDL-ON_Android/Assets/Phone/PirIcon/icon1.png            |    0 
 HDL-ON_Android/Assets/Phone/PirIcon/icon2.png            |    0 
 HDL-ON_Android/Assets/Phone/PirIcon/succeed.png          |    0 
 HDL-ON_Android/Assets/Phone/PirIcon/delbuton.png         |    0 
 HDL-ON_Android/Assets/Phone/PirIcon/offline.png          |    0 
 HDL-ON_Android/Assets/Phone/PirIcon/del.png              |    0 
 HDL-ON_Android/Assets/Phone/PirIcon/next.png             |    0 
 HDL-ON_Android/Assets/Phone/PirIcon/priequipment.png     |    0 
 HDL-ON_Android/Assets/Phone/PirIcon/adddevice.png        |    0 
 HDL-ON_Android/Assets/Phone/PirIcon/dropdown.png         |    0 
 26 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index fb7cc5f..8559aa4 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,46 +1,39 @@
 锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
-  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs">
+  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs">
     <Files>
-      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs" Line="213" Column="22" />
-      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs" Line="80" Column="20" />
-      <File FileName="HDL_ON/DAL/Mqtt/MqttClient.cs" />
-      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs" />
-      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs" Line="114" Column="15" />
-      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/ReplicationView.cs" />
-      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/AddMiniRemoteControlDirection4Page.cs" Line="244" Column="103" />
-      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControl.cs" />
-      <File FileName="../HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/EverymonthPage.cs" />
-      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/DeviceSet.cs" Line="31" Column="50" />
-      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/FailView.cs" />
+      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs" Line="175" Column="59" />
+      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs" Line="72" Column="37" />
+      <File FileName="HDL_ON/DAL/Mqtt/MqttClient.cs" Line="340" Column="86" />
+      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs" Line="125" Column="65" />
+      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs" Line="242" Column="78" />
+      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/DeviceSet.cs" Line="96" Column="21" />
+      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/PirView.cs" Line="1" Column="1" />
+      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControlComplete.cs" Line="1" Column="1" />
     </Files>
     <Pads>
       <Pad Id="ProjectPad">
         <State name="__root__">
           <Node name="HDL_APP_Project" expanded="True">
             <Node name="HDL_ON" expanded="True">
-              <Node name="DAL" expanded="True" />
+              <Node name="DAL" expanded="True">
+                <Node name="Mqtt" expanded="True" />
+              </Node>
               <Node name="Entity" expanded="True" />
               <Node name="UI" expanded="True">
                 <Node name="UI2" expanded="True">
-                  <Node name="3-Intelligence" expanded="True">
-                    <Node name="Automation" expanded="True" />
-                    <Node name="Scene" expanded="True" />
-                  </Node>
                   <Node name="4-PersonalCenter" expanded="True">
-                    <Node name="AddDevice" expanded="True" />
                     <Node name="PirDevice" expanded="True">
                       <Node name="View" expanded="True" />
-                      <Node name="PirMain.cs" selected="True" />
+                      <Node name="Matching.cs" selected="True" />
                     </Node>
                   </Node>
-                  <Node name="FuntionControlView" expanded="True">
-                    <Node name="Music" expanded="True">
-                      <Node name="View" expanded="True" />
-                    </Node>
-                    <Node name="Video" expanded="True">
-                      <Node name="View" expanded="True" />
-                    </Node>
-                  </Node>
+                </Node>
+              </Node>
+            </Node>
+            <Node name="HDL-ON_Android" expanded="True">
+              <Node name="Assets" expanded="True">
+                <Node name="Phone" expanded="True">
+                  <Node name="PirIcon" expanded="True" />
                 </Node>
               </Node>
             </Node>
@@ -63,7 +56,10 @@
   <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
   <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.4b65c4650918" />
   <MonoDevelop.Ide.DebuggingService.Breakpoints>
-    <BreakpointStore />
+    <BreakpointStore>
+      <Breakpoint file="/Users/hdl/Desktop/wjc/HDL_APP_Project/HDL_ON/DAL/Mqtt/MqttClient.cs" relfile="HDL_ON/DAL/Mqtt/MqttClient.cs" line="337" column="1" />
+      <Breakpoint file="/Users/hdl/Desktop/wjc/HDL_APP_Project/HDL_ON/DAL/Mqtt/MqttClient.cs" relfile="HDL_ON/DAL/Mqtt/MqttClient.cs" line="330" column="1" />
+    </BreakpointStore>
   </MonoDevelop.Ide.DebuggingService.Breakpoints>
   <MultiItemStartupConfigurations />
 </Properties>
\ No newline at end of file
diff --git a/HDL-ON_Android/Assets/Phone/PirIcon/Infraredtreasure.png b/HDL-ON_Android/Assets/Phone/PirIcon/Infraredtreasure.png
old mode 100644
new mode 100755
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/PirIcon/STB.png b/HDL-ON_Android/Assets/Phone/PirIcon/STB.png
old mode 100644
new mode 100755
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/PirIcon/adddevice.png b/HDL-ON_Android/Assets/Phone/PirIcon/adddevice.png
old mode 100644
new mode 100755
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/PirIcon/addlbuton.png b/HDL-ON_Android/Assets/Phone/PirIcon/addlbuton.png
old mode 100644
new mode 100755
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/PirIcon/air.png b/HDL-ON_Android/Assets/Phone/PirIcon/air.png
old mode 100644
new mode 100755
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/PirIcon/custom.png b/HDL-ON_Android/Assets/Phone/PirIcon/custom.png
old mode 100644
new mode 100755
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/PirIcon/del.png b/HDL-ON_Android/Assets/Phone/PirIcon/del.png
old mode 100644
new mode 100755
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/PirIcon/delbuton.png b/HDL-ON_Android/Assets/Phone/PirIcon/delbuton.png
old mode 100644
new mode 100755
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/PirIcon/dropdown.png b/HDL-ON_Android/Assets/Phone/PirIcon/dropdown.png
old mode 100644
new mode 100755
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/PirIcon/dvd.png b/HDL-ON_Android/Assets/Phone/PirIcon/dvd.png
old mode 100644
new mode 100755
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/PirIcon/failed.png b/HDL-ON_Android/Assets/Phone/PirIcon/failed.png
old mode 100644
new mode 100755
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/PirIcon/fan.png b/HDL-ON_Android/Assets/Phone/PirIcon/fan.png
old mode 100644
new mode 100755
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/PirIcon/icon1.png b/HDL-ON_Android/Assets/Phone/PirIcon/icon1.png
old mode 100644
new mode 100755
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/PirIcon/icon2.png b/HDL-ON_Android/Assets/Phone/PirIcon/icon2.png
old mode 100644
new mode 100755
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/PirIcon/next.png b/HDL-ON_Android/Assets/Phone/PirIcon/next.png
old mode 100644
new mode 100755
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/PirIcon/offline.png b/HDL-ON_Android/Assets/Phone/PirIcon/offline.png
old mode 100644
new mode 100755
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/PirIcon/online.png b/HDL-ON_Android/Assets/Phone/PirIcon/online.png
old mode 100644
new mode 100755
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/PirIcon/priequipment.png b/HDL-ON_Android/Assets/Phone/PirIcon/priequipment.png
old mode 100644
new mode 100755
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/PirIcon/projector.png b/HDL-ON_Android/Assets/Phone/PirIcon/projector.png
old mode 100644
new mode 100755
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/PirIcon/search.png b/HDL-ON_Android/Assets/Phone/PirIcon/search.png
old mode 100644
new mode 100755
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/PirIcon/succeed.png b/HDL-ON_Android/Assets/Phone/PirIcon/succeed.png
old mode 100644
new mode 100755
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/PirIcon/tv.png b/HDL-ON_Android/Assets/Phone/PirIcon/tv.png
old mode 100644
new mode 100755
Binary files differ
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 536dd6d..23e8c37 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -933,6 +933,12 @@
     <AndroidAsset Include="Assets\Phone\VideoIcon\menjin.png" />
     <AndroidAsset Include="Assets\Phone\VideoIcon\phone.png" />
     <AndroidAsset Include="Assets\Phone\VideoIcon\weiqiangji.png" />
+    <AndroidAsset Include="Assets\Phone\PirIcon\1.png" />
+    <AndroidAsset Include="Assets\Phone\PirIcon\2.png" />
+    <AndroidAsset Include="Assets\Phone\PirIcon\3.png" />
+    <AndroidAsset Include="Assets\Phone\PirIcon\4.png" />
+    <AndroidAsset Include="Assets\Phone\PirIcon\left.png" />
+    <AndroidAsset Include="Assets\Phone\PirIcon\right.png" />
   </ItemGroup>
   <ItemGroup>
     <AndroidNativeLibrary Include="libs\armeabi-v7a\libelianjni.so" />
diff --git a/HDL_ON/DAL/Mqtt/MqttClient.cs b/HDL_ON/DAL/Mqtt/MqttClient.cs
index 0acf399..4a58025 100644
--- a/HDL_ON/DAL/Mqtt/MqttClient.cs
+++ b/HDL_ON/DAL/Mqtt/MqttClient.cs
@@ -337,7 +337,7 @@
                                 {
                                     var bytes = Securitys.EncryptionService.AesDecryptPayload(e.ApplicationMessage.Payload, tuyaEncryptKey);
                                     var revString = Encoding.UTF8.GetString(bytes);
-                                    UI.UI2.PersonalCenter.PirDevice.Method.controldata = revString;
+                                    UI.UI2.PersonalCenter.PirDevice.Method.buttondata = revString;
                                 }
                                 #region 鏁版嵁鏇存柊鎺ㄩ�佷富棰�
                                 //appHomeRefresh锛氫綇瀹呮暟鎹埛鏂伴�氱煡
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs
index 154bdff..d0d13eb 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs
@@ -180,7 +180,7 @@
             //娴嬭瘯Text
             testBtn.MouseUpEventHandler += (sender, e) =>
             {
-                var library = libraryList[index];
+                var library = libraryList[index-1];
                 var control = GetControl(spk, testBtn.TextID, library);
                 //鍙戦�佹祴璇曠爜鍛戒护
                 CodeTest(control);

--
Gitblit v1.8.0