同步 了全部的代码

黄学彪

2019-11-18 1b565ce5fc003551b2db3a624f81221ac1df46b9

同步 了全部的代码

 ZigbeeApp/Shared/Common/CommonPage.cs

@@ -57,7 +57,7 @@
        /// <summary>
        /// 版本号
        /// </summary>
        public static string CodeIDString = "1.0.19111401";
        public static string CodeIDString = "1.0.19111801";
        /// <summary>
        /// 注册来源(0:HDL On 1:Zigbee)
        /// </summary>

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayUpdateLogic.cs

@@ -986,10 +986,6 @@
        {

            HdlThreadLogic.Current.RunThread(async () =>

            {

                //当前网关的版本

                var oldVersion = HdlGatewayLogic.Current.GetGwInfoAttribute(this.upDatezbGateway, "LinuxFWVersion");

                int oldLinuxVersion = Convert.ToInt32(oldVersion);



                //先等个120秒吧，网关升级和网关完全重启需要很长时间

                int count = 12;

                for (int i = 0; i < count; i++)


 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs

@@ -68,9 +68,9 @@
        private Com.Mediatek.Elian.ElianNative hdlWiFi = null;

#endif



#endregion

        #endregion



#region ■ 一般方法___________________________

        #region ■ 一般方法___________________________



#if Android

        /// <summary>

@@ -133,6 +133,6 @@
        }

#endif



#endregion

        #endregion

    }

}


 ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs

@@ -45,6 +45,10 @@
        /// </summary>

        private string gatewayId = string.Empty;

        /// <summary>

        /// 真实网关

        /// </summary>

        private ZbGateway realGateway = null;

        /// <summary>

        /// 进度条

        /// </summary>

        private FrameLayout btnProgressBar = null;

@@ -73,6 +77,7 @@
            base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uAddDevice));

            this.gatewayId = HdlGatewayLogic.Current.GetGatewayId(GatewayResourse.NowSelectGateway);
            HdlGatewayLogic.Current.GetRealGateway(ref this.realGateway, this.gatewayId);

            //初始化中部控件
            this.InitMiddleFrame();
@@ -144,13 +149,13 @@
                        return;

                    }

                    //让网关允许入网

                    GatewayResourse.NowSelectGateway.AddNewDeviceToGateway(255);

                    this.realGateway.AddNewDeviceToGateway(255);

                    System.Threading.Thread.Sleep(1000);

                }

            });



            //添加监视设备新上报的事件

            GatewayResourse.NowSelectGateway.GwResDataAction += this.AdjustGatewayResultData;
            this.realGateway.GwResDataAction += this.AdjustGatewayResultData;
        }



        #endregion

@@ -169,7 +174,7 @@
            if (result == -1)

            {

                //停止接收

                GatewayResourse.NowSelectGateway.GwResDataAction -= this.AdjustGatewayResultData;

                this.realGateway.GwResDataAction -= this.AdjustGatewayResultData;



                Application.RunOnMainThread(() =>

                {

@@ -206,7 +211,7 @@


                //给新设备设置主键属性

                Common.LocalDevice.Current.SetNewDeviceMainKeys(device, jobject);

                device.CurrentGateWayId = HdlGatewayLogic.Current.GetGatewayId(GatewayResourse.NowSelectGateway);

                device.CurrentGateWayId = HdlGatewayLogic.Current.GetGatewayId(this.realGateway);

                //将DeviceInfo的属性设置到主属性中

                Common.LocalDevice.Current.SetDeviceInfoToMain(device, device);



@@ -261,7 +266,7 @@
                    this.waitDeviceTimeOut--;

                }

                //停止接收

                GatewayResourse.NowSelectGateway.GwResDataAction -= this.AdjustGatewayResultData;

                this.realGateway.GwResDataAction -= this.AdjustGatewayResultData;

                System.Threading.Thread.Sleep(500);



                //目前就弄一个

@@ -516,13 +521,13 @@
        {
            base.CloseForm();

            //停止接收

            GatewayResourse.NowSelectGateway.GwResDataAction -= this.AdjustGatewayResultData;

            this.realGateway.GwResDataAction -= this.AdjustGatewayResultData;



            HdlThreadLogic.Current.RunThread(() =>

            {

                System.Threading.Thread.Sleep(1200);

                //关闭入网模式

                GatewayResourse.NowSelectGateway.AddNewDeviceToGateway(0);

                this.realGateway.AddNewDeviceToGateway(0);

            });

        }




 ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs

@@ -144,17 +144,26 @@
                UnSelectedImagePath = "Item/Collection.png",
                SelectedImagePath = "Item/CollectionSelected.png"
            };
            midTopFrameLayout.AddChidren(btnCollect);
            midTopFrameLayout.AddChidren(btnCollect);

            var de = Shared.Common.Room.LoveRoomDeviceUIFilePathList.Find((obj) => obj == deviceUI.FileName);

            if (de == null)

            {

                btnCollect.IsSelected = false;

            }

            else

            {

                btnCollect.IsSelected = true;

            }
            btnCollect.MouseDownEventHandler += (sender, e) =>
            {
                btnCollect.IsSelected = !btnCollect.IsSelected;
                if (btnCollect.IsSelected)
                {
                    Shared.Common.Room.CurrentRoom.GetLoveRoom().DeleteDevice(deviceUI.FileName); //取消收藏
                    Shared.Common.Room.CurrentRoom.GetLoveRoom().AddDevice(deviceUI.FileName);//收藏
                }
                else
                {
                    Shared.Common.Room.CurrentRoom.GetLoveRoom().AddDevice(deviceUI.FileName);//收藏
                {

                    Shared.Common.Room.CurrentRoom.GetLoveRoom().DeleteDevice(deviceUI.FileName); //取消收藏
                }
            };


 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayGeneralInformationForm.cs

@@ -65,7 +65,14 @@
            rowSerial.UseClickStatu = false;

            listView.AddChidren(rowSerial);

            rowSerial.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uSerialNumber), 300);

            rowSerial.AddMostRightView(string.IsNullOrEmpty(i_gateway.getGwInfo.GWSN) == false ? i_gateway.getGwInfo.GWSN : "000000000000", 600);

            if (i_gateway.getGwInfo == null)

            {

                rowSerial.AddMostRightView("000000000000", 600);

            }

            else

            {

                rowSerial.AddMostRightView(string.IsNullOrEmpty(i_gateway.getGwInfo.GWSN) == false ? i_gateway.getGwInfo.GWSN : "000000000000", 600);

            }

            rowSerial.AddBottomLine();



            //网关ID