2020-03-30-1

WJC

2020-03-30 4e25d344065ffd9248a254ec9d11f0bb4bbbdb5e

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

@@ -26,6 +26,7 @@
        {

            #region  最上面的布局代码
            UserView.HomePage.Instance.ScrollEnabled = false;//锁住左滑
            TopView view = new TopView();
            this.AddChidren(view.TopRowView());
            if (Common.Logic.CurrentLogic.LogicId != 0)
@@ -38,7 +39,7 @@
            }
            view.clickBtn.MouseDownEventHandler += (sender, e) =>
            {
                
                //UserView.HomePage.Instance.ScrollEnabled = true;//恢复左滑
                RemoveFromParent();
            };
            #endregion
@@ -202,6 +203,8 @@
                {
                    SelectedDeviceView selecteddevice = new SelectedDeviceView();
                    selecteddevice.Show(middle);
                    selecteddevice.stateRow.AddRightView(selecteddevice.edit);
                    selecteddevice.stateRow.AddRightView(selecteddevice.del);
                    var Type = int.Parse(ListConditions[i]["Type"]);
                    var conditions = ListConditions[i];
                    switch (Type)
@@ -212,7 +215,7 @@
                            {
                                var deviceinof = Method.GetCommonDevice(conditions["MacAddr"], conditions["Epoint"]);
                                selecteddevice.deviceNameBtn.Visible = true;
                                selecteddevice.deviceNameBtn.Text = deviceinof.DeviceEpointName;
                                selecteddevice.deviceNameBtn.Text = LocalDevice.Current.GetDeviceEpointName(deviceinof);
                                selecteddevice.regionNameBtn.Visible = true;
                                Method.RoomNmae(selecteddevice.regionNameBtn, deviceinof);
                                selecteddevice.iconBtn.UnSelectedImagePath ="ZigeeLogic/sensor13.png";
@@ -342,6 +345,8 @@

                    SelectedDeviceView actiondevice = new SelectedDeviceView();
                    actiondevice.Show(middle);
                    actiondevice.stateRow.AddRightView(actiondevice.edit);
                    actiondevice.stateRow.AddRightView(actiondevice.del);
                    var linkType = int.Parse(ListActions[i]["LinkType"].ToString());
                    var actions = ListActions[i];

@@ -351,7 +356,7 @@
                            {
                                var deviceinof = Method.GetCommonDevice(actions["DeviceAddr"].ToString(), actions["Epoint"].ToString());
                                actiondevice.deviceNameBtn.Visible = true;
                                actiondevice.deviceNameBtn.Text = deviceinof.DeviceEpointName;
                                actiondevice.deviceNameBtn.Text = LocalDevice.Current.GetDeviceEpointName(deviceinof);
                                actiondevice.regionNameBtn.Visible = true;
                                Method.RoomNmae(actiondevice.regionNameBtn, deviceinof);
                                switch (deviceinof.Type)