225552552525

黄学彪

2020-05-18 b0505adb3ea1ba3f1812ee1046499410c8ea57f5

225552552525

 ZigbeeApp/GateWay.Droid/Assets/Language.ini

@@ -1848,6 +1848,7 @@
16116=游客体验
16117=智能改变生活 | Enjoy smart life
16118=网络不稳定，场景列表信息缺损
16119=DATA绿色指示灯闪烁

;★★★★下面这些是接口的返回信息翻译,从18000开始★★★★

18004=指定网关已经被绑定

@@ -1917,7 +1918,7 @@
;中继器入网操作指示

21014=长按图示按键5秒以上，指示灯变绿闪烁{0}进入配网状态，绿灯熄灭则入网成功

;空调入网操作指示

21015=长按图示按键5秒以上，指示灯{0}变绿闪烁,进入配网状态{0}绿灯每5秒闪烁一次则入网成功

21015=长按编程按键5秒,DATA绿色LED闪烁,{0}频率为亮0.5秒,灭0.5秒

;pir传感器入网操作指示

21016=长按图示按键5秒以上，指示灯变绿、{0}闪烁进入配网状态。绿灯熄灭则配网成功

;温湿度传感器入网操作指示


 ZigbeeApp/GateWay.Droid/Assets/Phone/Device/AirConditioner.png

 ZigbeeApp/GateWay.Droid/Assets/Phone/Device/AirConditionerSelected.png

 ZigbeeApp/GateWay.Droid/Assets/Phone/Device/AirConditionerSelected2.png

 ZigbeeApp/GateWay.Droid/Assets/Phone/Device/AirConditionerZbGateway.png

 ZigbeeApp/GateWay.Droid/Assets/Phone/Device/AirConditionerZbGatewaySelected.png

 ZigbeeApp/GateWay.Droid/Assets/Phone/Device/AirConditionerZbGatewaySelected2.png

 ZigbeeApp/GateWay.Droid/Assets/Phone/Instruct/AirConditionerZbGateway.png

 ZigbeeApp/GateWay.Droid/Assets/Phone/RealDevice/AirConditionerZbGateway.png

 ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs

Diff too large

 ZigbeeApp/Home.Ios/Resources/Language.ini

@@ -1848,6 +1848,7 @@
16116=游客体验
16117=智能改变生活 | Enjoy smart life
16118=网络不稳定，场景列表信息缺损
16119=DATA绿色指示灯闪烁

;★★★★下面这些是接口的返回信息翻译,从18000开始★★★★

18004=指定网关已经被绑定

@@ -1917,7 +1918,7 @@
;中继器入网操作指示

21014=长按图示按键5秒以上，指示灯变绿闪烁{0}进入配网状态，绿灯熄灭则入网成功

;空调入网操作指示

21015=长按图示按键5秒以上，指示灯{0}变绿闪烁,进入配网状态{0}绿灯每5秒闪烁一次则入网成功

21015=长按编程按键5秒,DATA绿色LED闪烁,{0}频率为亮0.5秒,灭0.5秒

;pir传感器入网操作指示

21016=长按图示按键5秒以上，指示灯变绿、{0}闪烁进入配网状态。绿灯熄灭则配网成功

;温湿度传感器入网操作指示


 ZigbeeApp/Home.Ios/Resources/Phone/Device/AirConditioner.png

 ZigbeeApp/Home.Ios/Resources/Phone/Device/AirConditionerSelected.png

 ZigbeeApp/Home.Ios/Resources/Phone/Device/AirConditionerSelected2.png

 ZigbeeApp/Home.Ios/Resources/Phone/Device/AirConditionerZbGateway.png

 ZigbeeApp/Home.Ios/Resources/Phone/Device/AirConditionerZbGatewaySelected.png

 ZigbeeApp/Home.Ios/Resources/Phone/Device/AirConditionerZbGatewaySelected2.png

 ZigbeeApp/Home.Ios/Resources/Phone/Instruct/AirConditionerZbGateway.png

 ZigbeeApp/Home.Ios/Resources/Phone/RealDevice/AirConditionerZbGateway.png

 ZigbeeApp/Shared/Phone/Device/Logic/Send.cs

old mode 100755
new mode 100644
@@ -526,6 +526,21 @@
                                    accounts.Add(location);
                                }
                                break;
                            case 8:
                                {
                                    var accounts1 = new JObject();
                                    if (dictionary.ContainsKey("Option4"))
                                    {
                                        accounts1.Add("Option4", dictionary["Option4"]);
                                    }
                                    if (dictionary.ContainsKey("Option2"))
                                    {
                                        accounts1.Add("Option2", int.Parse(dictionary["Option2"]));
                                    }
                                    accounts.Add(accounts1);
                                }
                                break;

                        }

                    }

 ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs

old mode 100755
new mode 100644
@@ -725,6 +725,7 @@
            actionsInfo.Add("PassData", "055704010113");//默认门锁常关

            Dictionary<string, string> accounts = new Dictionary<string, string>();
            accounts.Add("Type", "8");
            accounts.Add("Option4", common.DeviceAddr.ToString());//用于判断识别是哪个门锁;
            accounts.Add("Option2", common.DeviceEpoint.ToString());


 ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs

old mode 100755
new mode 100644
@@ -163,7 +163,8 @@
                actionsInfo.Add("DeviceAddr", Send.CurrentDoorLock.DeviceAddr);
                actionsInfo.Add("Epoint", "200");
                actionsInfo.Add("PassData", "055704010113");//默认门锁常关

                Dictionary<string, string> accounts = new Dictionary<string, string>();

                Dictionary<string, string> accounts = new Dictionary<string, string>();
                accounts.Add("Type", "8");

                accounts.Add("Option4", Send.CurrentDoorLock.DeviceAddr.ToString());//用于判断识别是哪个门锁;

                accounts.Add("Option2", Send.CurrentDoorLock.DeviceEpoint.ToString());
                //new一个新逻辑对象；

 ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs

@@ -37,10 +37,6 @@
                //使用上一次登陆的账号

                account = Common.Config.Instance.Account;

            }

            if (Config.Instance.IsLogin == true)

            {

                return;

            }

            CommonPage.Instance.IsDrawerLockMode = true;

            this.Tag = "Login";




 ZigbeeApp/Shared/Phone/UserCenter/Abount/AbountForm.cs

old mode 100644
new mode 100755
@@ -204,29 +204,29 @@
        {

#if iOS

            try

            {
                var versionResult = await RequestHttpsiOSAppVersionAsync();
                if (versionResult == null || versionResult.Results == null)
                {
                    return false;
                }
                var results = Newtonsoft.Json.Linq.JArray.Parse(versionResult.Results.ToString());
                if (results[0] == null)
                {
                    return false;
                }
                var newVersion = results[0]["version"]?.ToString();
                var updateContent = results[0]["releaseNotes"]?.ToString();
                if (newVersion.CompareTo(CommonPage.CodeIDString) > 0)
                {
                    return true;
                }
                return false;
            }
            catch
            {
                return false;
            }

            {

                    var versionResult = await RequestHttpsiOSAppVersionAsync();

                    if (versionResult == null || versionResult.Results == null)

                    {

                        return false;

                    }

                    var results = Newtonsoft.Json.Linq.JArray.Parse(versionResult.Results.ToString());

                    if (results[0] == null)

                    {

                        return false;

                    }

                    var newVersion = results[0]["version"]?.ToString();

                    var updateContent = results[0]["releaseNotes"]?.ToString();

                    if (newVersion.CompareTo(CommonPage.CodeIDString) > 0)

                    {

                        return true;

                    }

                    return false;

                }

                catch

                {

                   return false;

                }



#elif Android

            try


 ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AirConditionerZbGatewayDirectionForm.cs

@@ -30,23 +30,22 @@
        {

            //图片

            var framePic = new FrameLayout();

            framePic.Width = this.GetPictrueRealSize(893);

            framePic.Height = this.GetPictrueRealSize(852);

            framePic.Width = this.GetPictrueRealSize(842);

            framePic.Height = this.GetPictrueRealSize(764);

            framePic.Gravity = Gravity.CenterHorizontal;

            framePic.Y = Application.GetRealHeight(75);

            framePic.Y = Application.GetRealHeight(78);

            bodyFrameLayout.AddChidren(framePic);

            var btnPic = new PicViewControl(framePic.Width, framePic.Height, false);

            btnPic.UnSelectedImagePath = "Instruct/AirConditionerZbGateway.png";

            framePic.AddChidren(btnPic);



            //绿色指示灯闪烁

            var btnGreanLinght = new NormalViewControl(this.GetPictrueRealSize(475), this.GetPictrueRealSize(45), false);

            btnGreanLinght.X = this.GetPictrueRealSize(415);

            btnGreanLinght.Y = this.GetPictrueRealSize(272);

            //DATA绿色指示灯闪烁

            var btnGreanLinght = new NormalViewControl(this.GetPictrueRealSize(512), this.GetPictrueRealSize(45), false);

            btnGreanLinght.Y = this.GetPictrueRealSize(352);

            btnGreanLinght.TextAlignment = TextAlignment.Center;

            btnGreanLinght.TextColor = UserCenterColor.Current.TextGrayColor3;

            btnGreanLinght.TextSize = 10;

            btnGreanLinght.TextID = R.MyInternationalizationString.uGreanPilotLampLinght;

            btnGreanLinght.TextID = R.MyInternationalizationString.uDataGreanPilotLampLinght;

            framePic.AddChidren(btnGreanLinght);



            //长按5秒

@@ -55,17 +54,16 @@
            {

                textMsg = string.Format(textMsg, "5");

            }

            var btnSecond = new NormalViewControl(this.GetPictrueRealSize(360), this.GetPictrueRealSize(45), false);

            btnSecond.X = this.GetPictrueRealSize(573);

            btnSecond.Y = this.GetPictrueRealSize(718);

            var btnSecond = new NormalViewControl(this.GetPictrueRealSize(167), this.GetPictrueRealSize(45), false);

            btnSecond.Y = this.GetPictrueRealSize(629);

            btnSecond.TextColor = UserCenterColor.Current.TextGrayColor3;

            btnSecond.TextSize = 10;

            btnSecond.Text = textMsg;

            btnSecond.TextAlignment = TextAlignment.Center;

            framePic.AddChidren(btnSecond);



            //长按图示按键5秒以上，指示灯

            //变绿闪烁,进入配网状态

            //绿灯每5秒闪烁一次则入网成功

            //长按编程按键5秒,DATA绿色LED闪烁,

            //频率为亮0.5秒,灭0.5秒

            string[] msgArry = Language.StringByID(R.MyInternationalizationString.uAddAirConditionerZbGatewayMsg).Split(new string[] { "{0}" }, StringSplitOptions.RemoveEmptyEntries);



            var msg1 = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(60), false);

@@ -83,15 +81,6 @@
            msg2.TextColor = UserCenterColor.Current.TextGrayColor3;

            msg2.TextAlignment = TextAlignment.Center;

            bodyFrameLayout.AddChidren(msg2);

            var msg3 = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(60), false);

            msg3.Y = msg2.Bottom;

            if (msgArry.Length > 2)

            {

                msg3.Text = msgArry[2];

            }

            msg3.TextColor = UserCenterColor.Current.TextGrayColor3;

            msg3.TextAlignment = TextAlignment.Center;

            bodyFrameLayout.AddChidren(msg3);

        }



        #endregion


 ZigbeeApp/Shared/Phone/UserView/HomePage.cs

@@ -76,6 +76,22 @@
                            CommonPage.Loading.Hide();

                        });

                    }

                    else

                    {

                        //设定一个时间

                        Config.Instance.LoginDateTime = new DateTime(1970, 1, 1);

                        Config.Instance.Save();



                        UserCenter.HdlThreadLogic.Current.RunMain(() =>

                        {

                            CommonPage.Loading.Hide();

                            CommonPage.Instance.RemoveViewByTag("Login");

                            //登录弹出登录界面

                            var accountLogin = new Login.AccountLoginForm { };

                            Shared.Common.CommonPage.Instance.AddChidren(accountLogin);

                            accountLogin.ShowForm();

                        });

                    }

                });
            }
            else

 ZigbeeApp/Shared/R.cs

@@ -5777,6 +5777,10 @@
        /// 网络不稳定，场景列表信息缺损
        /// </summary>
        public const int uNetworkUnStableAndSceneInfoIsNotFull = 16118;
        /// <summary>

        /// DATA绿色指示灯闪烁

        /// </summary>

        public const int uDataGreanPilotLampLinght = 16119;





        //★★★★下面这些是接口的返回信息翻译,从18000开始★★★★

@@ -5977,7 +5981,7 @@
        /// </summary>

        public const int uAddRepeaterZigbeeMsg = 21014;

        /// <summary>

        /// 空调 -> 长按图示按键5秒以上，指示灯{0}变绿闪烁,进入配网状态{0}绿灯每5秒闪烁一次则入网成功

        /// 空调 -> 长按编程按键5秒,DATA绿色LED闪烁,{0}频率为亮0.5秒,灭0.5秒

        /// </summary>

        public const int uAddAirConditionerZbGatewayMsg = 21015;

        /// <summary>