~wjc/HomeApp.git

blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace

Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc

WJC

2019-12-03 f8b647c263f068babb8efcc19ff4e74026a4bd28

 ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs

@@ -767,6 +767,7 @@
                                                        // devicestatus.Text = Language.StringByID(MyInternationalizationString.close);

                                                        ifclose = false;
                                                        break;
                                                    }
                                                    else if (status["Data1"].ToString() == "1")
                                                    {

			@@ -767,6 +767,7 @@
			// devicestatus.Text = Language.StringByID(MyInternationalizationString.close);

			ifclose = false;
			break;
			}
			else if (status["Data1"].ToString() == "1")
			{