2021-01-05 1.更新

JLChen

2021-01-05 f500e14c0a994487070380c50c85e0929cbc8e63

 Crabtree/SmartHome/UI/SimpleControl/CommonPage.cs

@@ -26,7 +26,7 @@
                        //127.0.0.1
                        if (ip == "0.0.0.0") {
                            try {
                                ip = System.Net.Dns.GetHostEntry ("homeautomation.havells.com").AddressList [0].ToString ();
                                ip = System.Net.Dns.GetHostEntry ("smarth-api.havells.com").AddressList [0].ToString ();
                            } catch { }
                        }
                        return new System.Net.IPEndPoint (System.Net.IPAddress.Parse (ip), 9999);
@@ -348,12 +348,14 @@
                                    UserDeviceToLight.UpdataEnergy (usefullBytes [0], updateFlag, usefullBytes [2] * 256 + usefullBytes [3]);
                                    UserRoom.UpdataEnergy (usefullBytes [0], common.Type + "_" + updateFlag, usefullBytes [2] * 256 + usefullBytes [3]);
                                    break;
                                } else if (usefullBytes [0] == 11) {
                                    UserDeviceToSocket.UpdataEnergy (usefullBytes [0], updateFlag, usefullBytes [2] * 256 * 256 * 256 + usefullBytes [3] * 256 * 256 + usefullBytes [4] * 256 + usefullBytes [5]);
                                    UserDeviceToLight.UpdataEnergy (usefullBytes [0], updateFlag, usefullBytes [2] * 256 * 256 * 256 + usefullBytes [3] * 256 * 256 + usefullBytes [4] * 256 + usefullBytes [5]);
                                    UserRoom.UpdataEnergy (usefullBytes [0], common.Type + "_" + updateFlag, usefullBytes [2] * 256 * 256 * 256 + usefullBytes [3] * 256 * 256 + usefullBytes [4] * 256 + usefullBytes [5]);
                                    break;
                                }
                                //2020-07-01 客户提出隐藏kwh
                                //else if (usefullBytes [0] == 11) {
                                //    UserDeviceToSocket.UpdataEnergy (usefullBytes [0], updateFlag, usefullBytes [2] * 256 * 256 * 256 + usefullBytes [3] * 256 * 256 + usefullBytes [4] * 256 + usefullBytes [5]);
                                //    UserDeviceToLight.UpdataEnergy (usefullBytes [0], updateFlag, usefullBytes [2] * 256 * 256 * 256 + usefullBytes [3] * 256 * 256 + usefullBytes [4] * 256 + usefullBytes [5]);
                                //    UserRoom.UpdataEnergy (usefullBytes [0], common.Type + "_" + updateFlag, usefullBytes [2] * 256 * 256 * 256 + usefullBytes [3] * 256 * 256 + usefullBytes [4] * 256 + usefullBytes [5]);
                                //    break;
                                //}
                            }


@@ -1241,7 +1243,7 @@
                            common.isMixBox = true;
                        } else {
                            Application.RunOnMainThread (() => {
                                MainPage.Loading.Start ("Search for device:" + devcieTempName);
                                //MainPage.Loading.Start ("Search for device:" + devcieTempName);
                                ++searchTotal;
                                GuideSettingGateway.InitSearchDeviceList (common);
                                for (int k = 1; k <= common.LoopCount; k++) {
@@ -1274,6 +1276,14 @@
                        //} else if (deviceType1.ToString ().Contains ("Switch")) {
                        //    devcieLoopName = "Relay SW" + usefullBytes [2].ToString ();
                        //}

                        //2020-07-03 如果是红外模块类型，备注为空的话，默认为TV名字
                        if (deviceType1 == DeviceType.InfraredMode) {
                            devcieLoopName = "TV " + usefullBytes [2].ToString ();
                        } else if (deviceType1 == DeviceType.ACInfrared) {
                            //2020-08-28 如果是红外空调类型，备注为空的话，默认为AC名字
                            devcieLoopName = "AC " + usefullBytes [2].ToString ();
                        }
                        byte [] ddd = CommonPage.MyEncodingGB2312.GetBytes (devcieLoopName);
                        byte [] newddd = new byte [20];
                        Array.Copy (ddd, 0, newddd, 0, 20 < ddd.Length ? 20 : ddd.Length);