From d125c9d226c4fee8abec002a0b330f278e97f6fc Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 17 三月 2021 10:48:38 +0800
Subject: [PATCH] 2021-3-17-4
---
HDL-ON_iOS/Resources/Phone/PirIcon/delbuton.png | 0
HDL-ON_iOS/Resources/Phone/PirIcon/online.png | 0
HDL-ON_iOS/Resources/Phone/PirIcon/tv.png | 0
HDL-ON_iOS/HDL-ON_iOS.csproj | 10 ++++++++++
HDL-ON_iOS/Resources/Phone/PirIcon/priequipment.png | 0
HDL-ON_iOS/Resources/Phone/PirIcon/custom.png | 0
HDL-ON_iOS/Resources/Phone/PirIcon/del.png | 0
HDL-ON_iOS/Resources/Phone/PirIcon/projector.png | 0
HDL-ON_iOS/Resources/Phone/PirIcon/stb.png | 0
HDL-ON_iOS/Resources/Phone/PirIcon/air.png | 0
HDL-ON_iOS/Resources/Phone/PirIcon/next.png | 0
HDL-ON_iOS/Resources/Phone/PirIcon/addlbuton.png | 0
HDL-ON_iOS/Resources/Phone/PirIcon/dvd.png | 0
HDL-ON_iOS/Resources/Phone/PirIcon/fan.png | 0
HDL-ON_iOS/Resources/Phone/PirIcon/dropdown.png | 0
HDL-ON_iOS/Resources/Phone/PirIcon/adddevice.png | 0
HDL-ON_iOS/Resources/Phone/PirIcon/Infraredtreasure.png | 0
HDL-ON_iOS/Resources/Phone/PirIcon/offline.png | 0
.vs/HDL_APP_Project/xs/UserPrefs.xml | 15 +++++++++------
HDL-ON_iOS/Resources/Phone/PirIcon/search.png | 0
20 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index c4e29cb..6f4075a 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,13 +1,13 @@
锘�<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="85" Column="46" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs" Line="81" Column="14" />
<File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs" Line="37" Column="16" />
<File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs" Line="18" Column="23" />
<File FileName="HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs" Line="142" Column="53" />
<File FileName="HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/AddMiniRemoteControlDirection4Page.cs" Line="210" Column="54" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/DeviceSet.cs" Line="7" Column="2" />
<File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControlComplete.cs" Line="212" Column="1" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs" Line="125" Column="27" />
</Files>
<Pads>
<Pad Id="ProjectPad">
@@ -17,15 +17,18 @@
<Node name="UI" expanded="True">
<Node name="UI2" expanded="True">
<Node name="4-PersonalCenter" expanded="True">
- <Node name="AddDevice" expanded="True" />
- <Node name="AddFunction" expanded="True" />
<Node name="PirDevice" expanded="True">
- <Node name="PirMain.cs" selected="True" />
+ <Node name="Matching.cs" selected="True" />
</Node>
</Node>
</Node>
</Node>
</Node>
+ <Node name="HDL-ON_iOS" expanded="True">
+ <Node name="Resources" expanded="True">
+ <Node name="Phone" expanded="True" />
+ </Node>
+ </Node>
</Node>
</State>
</Pad>
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index eb0fd00..91c010e 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -1149,6 +1149,16 @@
<BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\curtainswitch_white.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricalracks_white.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Icon\irmodule.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\1.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\2.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\3.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\4.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\failed.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\icon1.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\icon2.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\left.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\right.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\succeed.png" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
diff --git a/HDL-ON_iOS/Resources/Phone/PirIcon/Infraredtreasure.png b/HDL-ON_iOS/Resources/Phone/PirIcon/Infraredtreasure.png
old mode 100644
new mode 100755
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/PirIcon/adddevice.png b/HDL-ON_iOS/Resources/Phone/PirIcon/adddevice.png
old mode 100644
new mode 100755
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/PirIcon/addlbuton.png b/HDL-ON_iOS/Resources/Phone/PirIcon/addlbuton.png
old mode 100644
new mode 100755
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/PirIcon/air.png b/HDL-ON_iOS/Resources/Phone/PirIcon/air.png
old mode 100644
new mode 100755
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/PirIcon/custom.png b/HDL-ON_iOS/Resources/Phone/PirIcon/custom.png
old mode 100644
new mode 100755
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/PirIcon/del.png b/HDL-ON_iOS/Resources/Phone/PirIcon/del.png
old mode 100644
new mode 100755
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/PirIcon/delbuton.png b/HDL-ON_iOS/Resources/Phone/PirIcon/delbuton.png
old mode 100644
new mode 100755
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/PirIcon/dropdown.png b/HDL-ON_iOS/Resources/Phone/PirIcon/dropdown.png
old mode 100644
new mode 100755
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/PirIcon/dvd.png b/HDL-ON_iOS/Resources/Phone/PirIcon/dvd.png
old mode 100644
new mode 100755
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/PirIcon/fan.png b/HDL-ON_iOS/Resources/Phone/PirIcon/fan.png
old mode 100644
new mode 100755
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/PirIcon/next.png b/HDL-ON_iOS/Resources/Phone/PirIcon/next.png
old mode 100644
new mode 100755
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/PirIcon/offline.png b/HDL-ON_iOS/Resources/Phone/PirIcon/offline.png
old mode 100644
new mode 100755
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/PirIcon/online.png b/HDL-ON_iOS/Resources/Phone/PirIcon/online.png
old mode 100644
new mode 100755
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/PirIcon/priequipment.png b/HDL-ON_iOS/Resources/Phone/PirIcon/priequipment.png
old mode 100644
new mode 100755
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/PirIcon/projector.png b/HDL-ON_iOS/Resources/Phone/PirIcon/projector.png
old mode 100644
new mode 100755
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/PirIcon/search.png b/HDL-ON_iOS/Resources/Phone/PirIcon/search.png
old mode 100644
new mode 100755
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/PirIcon/stb.png b/HDL-ON_iOS/Resources/Phone/PirIcon/stb.png
old mode 100644
new mode 100755
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/PirIcon/tv.png b/HDL-ON_iOS/Resources/Phone/PirIcon/tv.png
old mode 100644
new mode 100755
Binary files differ
--
Gitblit v1.8.0