2019.12.30

gxc

2019-12-30 0e4ad9a4de5b95f58daf1a6c5072c6a57cf223f9

 ZigbeeApp/Shared/Phone/Device/CommonForm/DeviceDetailInfo.cs

@@ -162,6 +162,8 @@
                BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
            };
            bodyFrameLayout.AddChidren(infoFL);
            var rectCornerID = HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight;
            infoFL.SetCornerWithSameRadius(Application.GetRealHeight(50), rectCornerID);

            var tipBtn = new Button
            {
@@ -223,7 +225,7 @@
                functionTypeRow.ClickBtn.MouseUpEventHandler += (sender, e) =>
                {
                    var DfunctionType = device.CommonDevice.DfunctionType;
                    

                    //功能类型的翻译名字
                    int nowSelectNo = 1;
                    string strType = string.Empty;
@@ -250,7 +252,7 @@
                                                                                               //标题:选择功能类型
                    var title = Language.StringByID(R.MyInternationalizationString.uSelectFunctionType);

                    var form = new BottomDialogSelectForm();
                    var form = new BottomItemSelectForm();
                    form.AddForm(title, listText, nowSelectNo);
                    form.FinishSelectEvent += (selectNo) =>
                    {
@@ -272,19 +274,19 @@
                    };
                };

                sharedRow = new DeviceInfoRow(723);
                sharedRow.Init();
                sharedRow.SetTipTitle($"{Language.StringByID(R.MyInternationalizationString.Share)} : ");
                sharedRow.SetTitle("2人");
                infoFL.AddChidren(sharedRow);
                //sharedRow = new DeviceInfoRow(723);
                //sharedRow.Init();
                //sharedRow.SetTipTitle($"{Language.StringByID(R.MyInternationalizationString.Share)} : ");
                //sharedRow.SetTitle("2人");
                //infoFL.AddChidren(sharedRow);
            }
            else
            {
                sharedRow = new DeviceInfoRow(585);
                sharedRow.Init();
                sharedRow.SetTipTitle($"{Language.StringByID(R.MyInternationalizationString.Share)} : ");
                sharedRow.SetTitle("2人");
                infoFL.AddChidren(sharedRow);
                //sharedRow = new DeviceInfoRow(585);
                //sharedRow.Init();
                //sharedRow.SetTipTitle($"{Language.StringByID(R.MyInternationalizationString.Share)} : ");
                //sharedRow.SetTitle("2人");
                //infoFL.AddChidren(sharedRow);
            }

            var confirmBtn = new CommonForm.CompleteButton(962, 907, 127);
@@ -405,15 +407,15 @@
                            CommonPage.Loading.Hide();
                            if (result)
                            {
                                var alertSuccess = new Alert(Language.StringByID(R.MyInternationalizationString.TIP), Language.StringByID(R.MyInternationalizationString.Success), Language.StringByID(R.MyInternationalizationString.Confrim));
                                alertSuccess.Show();
                                alertSuccess.ResultEventHandler += (senderSuccess, eSuccess) =>
                                {
                                //var alertSuccess = new Alert(Language.StringByID(R.MyInternationalizationString.TIP), Language.StringByID(R.MyInternationalizationString.Success), Language.StringByID(R.MyInternationalizationString.Confrim));
                                //alertSuccess.Show();
                                //alertSuccess.ResultEventHandler += (senderSuccess, eSuccess) =>
                                //{
                                    //改房间
                                    Shared.Common.Room.CurrentRoom.ChangedRoom(device.CommonDevice, curRoom.Id);
                                    device.CommonDevice.ReSave();
                                    RemoveFromParent();
                                };
                                //};
                            }
                            else
                            {