Merge branch 'WJC' into wxr6
| | |
| | | { |
| | | urlHead = OnAppConfig.Instance.RequestHttpsHost; |
| | | } |
| | | |
| | | string requestFullUrl = urlHead + apiPath; |
| | | |
| | | |
| | |
| | | viewLayout.AddChidren(addInputTextView.FLayoutView(46, 12)); |
| | | ///满足以下条件的View |
| | | LogicView.LogicTypeTitleView titleCondition = new LogicView.LogicTypeTitleView(); |
| | | titleCondition.btnText.Width = Application.GetRealWidth(300); |
| | | titleCondition.btnText.Height = Application.GetRealHeight(28); |
| | | titleCondition.btnText.IsMoreLines = true; |
| | | titleCondition.frameLayout.SetCornerWithSameRadius(Application.GetRealHeight(12), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight); |
| | | titleCondition.btnText.TextID = StringId.andCondition; |
| | | viewLayout.AddChidren(titleCondition.FLayoutView()); |
| | |
| | | public Button btnText = new Button |
| | | { |
| | | TextSize = TextSize.text16, |
| | | Width = Application.GetRealWidth(300), |
| | | Height = Application.GetRealHeight(20), |
| | | Width = Application.GetRealWidth(280), |
| | | Height = Application.GetRealHeight(32),//20 |
| | | TextColor = CSS.CSS_Color.textColor, |
| | | X = Application.GetRealWidth(20), |
| | | Gravity = Gravity.CenterVertical, |
| | |
| | | public Button btnText = new Button |
| | | { |
| | | TextSize = LogicView.TextSize.text14, |
| | | Width = Application.GetRealWidth(270), |
| | | Height = Application.GetRealHeight(20), |
| | | Width = Application.GetRealWidth(280),//270 |
| | | Height = Application.GetRealHeight(28),//20 |
| | | TextColor = CSS.CSS_Color.textColor, |
| | | //TextAlignment = TextAlignment.CenterLeft, |
| | | //Y = Application.GetRealHeight(12), |
| | | X = Application.GetRealWidth(12), |
| | | Gravity = Gravity.CenterVertical, |
| | | // IsMoreLines = true, |
| | | IsMoreLines = true, |
| | | }; |
| | | /// <summary> |
| | | /// 图标 |
| | |
| | | TextID = StringId.timeTipText, |
| | | TextSize = TextSize.text12, |
| | | TextColor = CSS.CSS_Color.textRedColor, |
| | | Width = Application.GetRealWidth(340-20), |
| | | Height = Application.GetRealHeight(17), |
| | | Width = Application.GetRealWidth(340 - 20-20), |
| | | Height = Application.GetRealHeight(24),//17 |
| | | X = Application.GetRealWidth(20), |
| | | Y = Application.GetRealHeight(58), |
| | | TextAlignment=TextAlignment.CenterLeft, |
| | | IsMoreLines=true, |
| | | }; |
| | | |
| | | /// <summary> |
| | |
| | | |
| | | btnTip.X = Application.GetRealWidth(53); |
| | | btnTip.Y = editBjView.Bottom + Application.GetRealHeight(12); |
| | | btnTip.Width = Application.GetRealWidth(200); |
| | | btnTip.Height = Application.GetRealHeight(17); |
| | | btnTip.Width = Application.GetRealWidth(157);//200 |
| | | btnTip.Height = Application.GetRealHeight(24);//17 |
| | | btnTip.Text = errorId_IsNullOrEmpty; |
| | | btnTip.TextColor = CSS_Color.textRedColor; |
| | | btnTip.TextSize = TextSize.text12; |
| | | btnTip.TextAlignment = TextAlignment.CenterLeft; |
| | | btnTip.IsMoreLines = true; |
| | | return; |
| | | } |
| | | |
| | |
| | | }); |
| | | } |
| | | /// <summary> |
| | | /// 温度,湿度弹框设置值 |
| | | /// PM2.5设置值 |
| | | /// </summary> |
| | | /// <param name="frame">当前界面</param> |
| | | /// <param name="stateValue">编辑之前的状态值,默认为""</param> |
| | |
| | | airqualityView.btnLine.X = Application.GetRealWidth(16); |
| | | airqualityView.btnLine.Width = Application.GetRealWidth(375 - 16 - 16); |
| | | airqualityView.btnText.TextID =StringId.shuwaigongneng; |
| | | airqualityView.btnText.Width = Application.GetRealWidth(280); |
| | | viewLayout.AddChidren(airqualityView.FLayoutView()); |
| | | //天气变化(城市天气) |
| | | LogicView.SelectTypeView weatherView = new LogicView.SelectTypeView(); |
| | |
| | | //测试Text |
| | | testBtn.MouseUpEventHandler += (sender, e) => |
| | | { |
| | | // testBtn.BackgroundColor = CSS.CSS_Color.viewMiddle; |
| | | var library = libraryList[index - 1]; |
| | | var control = GetControl(spk, testBtn.TextID, library); |
| | | //发送测试码命令 |
| | |
| | | if_bool = true; |
| | | } |
| | | }; |
| | | testBtn.MouseDownEventHandler += (sender, e) => |
| | | { |
| | | //testBtn.BackgroundColor = CSS.CSS_Color.textConfirmColor; |
| | | }; |
| | | //控制失败 |
| | | failedBtn.MouseUpEventHandler += (sender, e) => |
| | | { |
| | |
| | | case "14005": |
| | | { |
| | | str = Language.StringByID(StringId.gatewayNotOnline); |
| | | |
| | | } |
| | | break; |
| | | case "10807": |
| | | { |
| | | str = Language.StringByID(StringId.bunengchaoguo10); |
| | | |
| | | |
| | | } |
| | | break; |
| | | case "14002": |
| | |
| | | FrameLayout50 banbenhaoFLayout = new FrameLayout50(); |
| | | banbenhaoFLayout.btnNextIcon.Visible = false; |
| | | banbenhaoFLayout.btnText.Text = Language.StringByID(StringId.banbenhao) + ":"+ versions.version; |
| | | banbenhaoFLayout.btnText.Width = Application.GetRealWidth(280); |
| | | banbenhaoFLayout.frameLayout.Y = editNameFLayout.frameLayout.Bottom;// banbenshengjiFL.frameLayout.Bottom; |
| | | viewLayout.AddChidren(banbenhaoFLayout.FLayoutView()); |
| | | //删除 |
| | |
| | | public Button btnText = new Button |
| | | { |
| | | TextSize = TextSize.Text16, |
| | | Width = Application.GetRealWidth(150), |
| | | Height = Application.GetRealHeight(22), |
| | | Width = Application.GetRealWidth(150+20), |
| | | Height = Application.GetRealHeight(32),//22 |
| | | TextColor = CSS.CSS_Color.textColor, |
| | | X = Application.GetRealWidth(16), |
| | | IsMoreLines=true, |
| | | }; |
| | | |
| | | /// <summary> |
| | |
| | | /// </summary> |
| | | public Button btnEditText = new Button |
| | | { |
| | | Width = Application.GetRealWidth(357 - 52 - 150 - 16), |
| | | Width = Application.GetRealWidth(357 - 52 - 150 - 30-16), |
| | | Height = Application.GetRealHeight(20), |
| | | TextSize = TextSize.Text14, |
| | | TextColor = CSS.CSS_Color.textCancelColor, |
| | | X = Application.GetRealWidth(150 + 16), |
| | | X = Application.GetRealWidth(150+30+16), |
| | | TextAlignment = TextAlignment.CenterRight, |
| | | }; |
| | | |
| | |
| | | public Button stateIconBtn = new Button |
| | | { |
| | | Y = Application.GetRealHeight(23), |
| | | X = Application.GetRealWidth(291), |
| | | X = Application.GetRealWidth(291-5), |
| | | Width = Application.GetRealWidth(8), |
| | | Height = Application.GetRealWidth(8), |
| | | UnSelectedImagePath ="PirIcon/offline.png", |
| | |
| | | public Button stateTextBtn = new Button |
| | | { |
| | | Y = Application.GetRealHeight(18), |
| | | X = Application.GetRealWidth(303), |
| | | Width = Application.GetRealWidth(30), |
| | | X = Application.GetRealWidth(303-5), |
| | | Width = Application.GetRealWidth(30+5), |
| | | Height = Application.GetRealHeight(17), |
| | | TextID = StringId.zaixianhwb, |
| | | TextAlignment = TextAlignment.CenterLeft, |
| | |
| | | Y = Application.GetRealHeight(24), |
| | | X = Application.GetRealWidth(10), |
| | | Width = Application.GetRealWidth(375 - 20), |
| | | Height = Application.GetRealHeight(20), |
| | | Height = Application.GetRealHeight(28),// |
| | | TextSize = TextSize.text14, |
| | | TextColor = CSS.CSS_Color.textColor, |
| | | TextAlignment = TextAlignment.Center, |
| | | TextID = StringId.duizhunanxiaanniu, |
| | | IsMoreLines=true, |
| | | }; |
| | | frameLayout.AddChidren(textBtn); |
| | | |