From bff8993501334c4f3c5f902216fe03253be747f8 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 15 四月 2020 16:59:01 +0800
Subject: [PATCH] 合并新代码
---
ZigbeeApp20200414/Shared/Phone/UserCenter/Device/Direction/AddDeviceTypeListForm.cs | 50 +++++++++++++++++++++++++-------------------------
1 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/ZigbeeApp20200414/Shared/Phone/UserCenter/Device/Direction/AddDeviceTypeListForm.cs b/ZigbeeApp20200414/Shared/Phone/UserCenter/Device/Direction/AddDeviceTypeListForm.cs
index f478b5c..c8e359d 100755
--- a/ZigbeeApp20200414/Shared/Phone/UserCenter/Device/Direction/AddDeviceTypeListForm.cs
+++ b/ZigbeeApp20200414/Shared/Phone/UserCenter/Device/Direction/AddDeviceTypeListForm.cs
@@ -53,132 +53,132 @@
bodyFrameLayout.AddChidren(listView);
//2鎸夐敭瑙︽懜闈㈡澘
- var objectText = Language.StringByID(R.MyInternationalizationString.uDeviceModelId202);
+ var objectText = Language.StringByID(R.MyInternationalizationString.uDeviceDirectionName1);
var unSelectPic = "Device/ButtonPanelTwo.png";
var arry = objectText.Split(new string[] { "(" }, StringSplitOptions.RemoveEmptyEntries);
objectText = arry[0].Trim();
this.AddMenuRow(objectText, unSelectPic, "PanelTwoButtonDirectionForm");
//3鎸夐敭瑙︽懜闈㈡澘
- objectText = Language.StringByID(R.MyInternationalizationString.uDeviceModelId201);
+ objectText = Language.StringByID(R.MyInternationalizationString.uDeviceDirectionName2);
arry = objectText.Split(new string[] { "(" }, StringSplitOptions.RemoveEmptyEntries);
objectText = arry[0].Trim();
unSelectPic = "Device/ButtonPanelThree.png";
this.AddMenuRow(objectText, unSelectPic, "PanelThreeButtonDirectionForm");
//4鎸夐敭瑙︽懜闈㈡澘
- objectText = Language.StringByID(R.MyInternationalizationString.uDeviceModelId200);
+ objectText = Language.StringByID(R.MyInternationalizationString.uDeviceDirectionName3);
arry = objectText.Split(new string[] { "(" }, StringSplitOptions.RemoveEmptyEntries);
objectText = arry[0].Trim();
unSelectPic = "Device/ButtonPanelFour.png";
this.AddMenuRow(objectText, unSelectPic, "PanelFourButtonDirectionForm");
//鏂规偊鍗曞紑鍙屾帶闈㈡澘
- objectText = Language.StringByID(R.MyInternationalizationString.uDeviceModelId240);
+ objectText = Language.StringByID(R.MyInternationalizationString.uDeviceDirectionName4);
unSelectPic = "Device/ButtonPanelFangyueTwo.png";
this.AddMenuRow(objectText, unSelectPic, "PanelFangyueTwoButtonDirectionForm");
//鏂规偊鍙屽紑鍥涙帶闈㈡澘
- objectText = Language.StringByID(R.MyInternationalizationString.uDeviceModelId241);
+ objectText = Language.StringByID(R.MyInternationalizationString.uDeviceDirectionName5);
unSelectPic = "Device/ButtonPanelFangyueFour.png";
this.AddMenuRow(objectText, unSelectPic, "PanelFangyueFourButtonDirectionForm");
//鏂规偊鍥涘紑鍏帶闈㈡澘
- objectText = Language.StringByID(R.MyInternationalizationString.uDeviceModelId242);
+ objectText = Language.StringByID(R.MyInternationalizationString.uDeviceDirectionName6);
unSelectPic = "Device/ButtonPanelFangyueEight.png";
this.AddMenuRow(objectText, unSelectPic, "PanelFangyueEightButtonDirectionForm");
//鏂规偊鏂伴灏忔ā鍧�,鍥剧墖鍜�3璺户鐢靛櫒灏忔ā鍧楃浉鍚�
- objectText = Language.StringByID(R.MyInternationalizationString.DeviceModelId2310);
+ objectText = Language.StringByID(R.MyInternationalizationString.uDeviceDirectionName7);
unSelectPic = "Device/RelayThreeLoad.png";
this.AddMenuRow(objectText, unSelectPic, "PanelFangyueFreshAirModulDirectionForm");
//鏂规偊鏂伴闈㈡澘
- objectText = Language.StringByID(R.MyInternationalizationString.uDeviceModelId250);
+ objectText = Language.StringByID(R.MyInternationalizationString.uDeviceDirectionName8);
unSelectPic = "Device/ButtonPanelFangyueFreshAir.png";
this.AddMenuRow(objectText, unSelectPic, "PanelFangyueFreshAirDirectionForm");
//鏂规偊鐜闈㈡澘
- objectText = Language.StringByID(R.MyInternationalizationString.uDeviceModelId253);
+ objectText = Language.StringByID(R.MyInternationalizationString.uDeviceDirectionName9);
unSelectPic = "Device/ButtonPanelFangyueEnvironment.png";
this.AddMenuRow(objectText, unSelectPic, "PanelFangyueEnvironmentDirectionForm");
//绐楀笜闈㈡澘
- objectText = "绐楀笜闈㈡澘";
+ objectText = Language.StringByID(R.MyInternationalizationString.uDeviceDirectionName10);
unSelectPic = "Device/ButtonPanelCurtain.png";
this.AddMenuRow(objectText, unSelectPic, "PanelCurtainDirectionForm");
//3璺户鐢靛櫒灏忔ā鍧�
- objectText = Language.StringByID(R.MyInternationalizationString.uDeviceModelId2300);
+ objectText = Language.StringByID(R.MyInternationalizationString.uDeviceDirectionName11);
unSelectPic = "Device/RelayThreeLoad.png";
this.AddMenuRow(objectText, unSelectPic, "RelayThreeLoadDirectionForm");
//1璺皟鍏夊櫒灏忔ā鍧�
- objectText = Language.StringByID(R.MyInternationalizationString.uDeviceModelId2500);
+ objectText = Language.StringByID(R.MyInternationalizationString.uDeviceDirectionName12);
unSelectPic = "Device/DimmableLightOneLoad.png";
this.AddMenuRow(objectText, unSelectPic, "DimmableLightOneLoadDirectionForm");
//Zigbee鏅鸿兘寮�鍚堝笜鐢垫満
- objectText = Language.StringByID(R.MyInternationalizationString.uDeviceModelId100);
+ objectText = Language.StringByID(R.MyInternationalizationString.uDeviceDirectionName13);
unSelectPic = "Device/CurtainAutoOpen.png";
this.AddMenuRow(objectText, unSelectPic, "CurtainAutoOpenDirectionForm");
//Zigbee鏅鸿兘绠＄姸鐢垫満
- objectText = Language.StringByID(R.MyInternationalizationString.uDeviceModelId101);
+ objectText = Language.StringByID(R.MyInternationalizationString.uDeviceDirectionName14);
unSelectPic = "Device/CurtainSiphonate.png";
this.AddMenuRow(objectText, unSelectPic, "CurtainSiphonateDirectionForm");
//绌鸿皟
- objectText = Language.StringByID(R.MyInternationalizationString.uDeviceModelId3600);
+ objectText = Language.StringByID(R.MyInternationalizationString.uDeviceDirectionName15);
unSelectPic = "Device/AirConditionerZbGateway.png";
this.AddMenuRow(objectText, unSelectPic, "AirConditionerZbGatewayDirectionForm");
//鏅鸿兘闂ㄩ攣
- objectText = Language.StringByID(R.MyInternationalizationString.uDeviceBelongId2800);
+ objectText = Language.StringByID(R.MyInternationalizationString.uDeviceDirectionName16);
unSelectPic = "Device/IntelligentLocksH06C.png";
this.AddMenuRow(objectText, unSelectPic, "IntelligentLocksH06cDirectionForm");
//PIR浼犳劅鍣�
- objectText = Language.StringByID(R.MyInternationalizationString.uDeviceModelId1200);
+ objectText = Language.StringByID(R.MyInternationalizationString.uDeviceDirectionName17);
unSelectPic = "Device/SensorPir.png";
this.AddMenuRow(objectText, unSelectPic, "SensorPirDirectionForm");
//绾㈠浼犳劅鍣�
- objectText = Language.StringByID(R.MyInternationalizationString.uDeviceModelId1303);
+ objectText = Language.StringByID(R.MyInternationalizationString.uDeviceDirectionName18);
unSelectPic = "Device/SensorInfrared.png";
this.AddMenuRow(objectText, unSelectPic, "SensorInfraredDirectionForm");
//鐕冩皵浼犳劅鍣�
- objectText = Language.StringByID(R.MyInternationalizationString.uDeviceModelId1300);
+ objectText = Language.StringByID(R.MyInternationalizationString.uDeviceDirectionName19);
unSelectPic = "Device/SensorCarbonMonoxide.png";
this.AddMenuRow(objectText, unSelectPic, "SensorCarbonMonoxideDirectionForm");
//鐑熼浘浼犳劅鍣�
- objectText = Language.StringByID(R.MyInternationalizationString.uDeviceModelId1302);
+ objectText = Language.StringByID(R.MyInternationalizationString.uDeviceDirectionName20);
unSelectPic = "Device/SensorFire.png";
this.AddMenuRow(objectText, unSelectPic, "SensorFireDirectionForm");
//姘存蹈浼犳劅鍣�
- objectText = Language.StringByID(R.MyInternationalizationString.uDeviceModelId1304);
+ objectText = Language.StringByID(R.MyInternationalizationString.uDeviceDirectionName21);
unSelectPic = "Device/SensorWater.png";
this.AddMenuRow(objectText, unSelectPic, "SensorWaterDirectionForm");
//闂ㄧ獥浼犳劅鍣�
- objectText = Language.StringByID(R.MyInternationalizationString.uDeviceModelId1301);
+ objectText = Language.StringByID(R.MyInternationalizationString.uDeviceDirectionName22);
unSelectPic = "Device/SensorDoorWindow.png";
this.AddMenuRow(objectText, unSelectPic, "SensorDoorWindowDirectionForm");
//娓╂箍搴︿紶鎰熷櫒
- objectText = Language.StringByID(R.MyInternationalizationString.uDeviceBelongId10);
+ objectText = Language.StringByID(R.MyInternationalizationString.uDeviceDirectionName23);
unSelectPic = "Device/SensorTemperatureHumidity.png";
this.AddMenuRow(objectText, unSelectPic, "SensorTemperatureHumidityForm");
//涓户鍣�
- objectText = Language.StringByID(R.MyInternationalizationString.uDeviceModelId3900);
+ objectText = Language.StringByID(R.MyInternationalizationString.uDeviceDirectionName24);
unSelectPic = "Device/RepeaterZigbee.png";
this.AddMenuRow(objectText, unSelectPic, "RepeaterZigbeeDirectionForm");
//绌烘皵寮�鍏�
- objectText = Language.StringByID(R.MyInternationalizationString.uDeviceModelId4100);
+ objectText = Language.StringByID(R.MyInternationalizationString.uDeviceDirectionName25);
unSelectPic = "Device/AirSwitchCloudContr.png";
this.AddMenuRow(objectText, unSelectPic, "AirSwitchCloudContrDirectionForm");
--
Gitblit v1.8.0