Merge branch 'WJC' into wxr6

wxr

2021-06-09 46fef61e8de822dc4a9eebca530ce37f2ed014f7

Merge branch 'WJC' into wxr6

 .vs/HDL_APP_Project/xs/UserPrefs.xml

@@ -1,24 +1,26 @@
<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.6242be7109c740c6cb8999a8904b6e0ea8d45192" />
<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-001674E61438002E" />
  <MonoDevelop.Ide.Workbench>
    <Files>
      <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="8" Column="17" IsPinned="True" />
      <File FileName="HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs" Line="153" Column="59" />
      <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" />
      <File FileName="HDL_ON/UI/MainPage.cs" />
      <File FileName="HDL_ON/Common/HDLCommon.cs" />
      <File FileName="HDL_ON/DAL/Mqtt/MqttClient.cs" />
      <File FileName="HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EchartsOption_BrokenLine.cs" />
      <File FileName="HDL-ON_iOS/Info.plist" />
      <File FileName="HDL-ON_iOS/Resources/Language.ini" Line="421" Column="19" />
      <File FileName="HDL_ON/Common/R.cs" Line="118" Column="43" />
      <File FileName="HDL-ON_Android/Assets/Language.ini" Line="1928" Column="1" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
        <State name="__root__">
          <Node name="HDL_APP_Project" expanded="True">
            <Node name="HDL-ON_Android" selected="True" />
            <Node name="HDL_ON" expanded="True">
              <Node name="DAL" expanded="True">
                <Node name="Server" expanded="True" />
              </Node>
              <Node name="UI" expanded="True">
                <Node name="UI2" expanded="True">
                  <Node name="4-PersonalCenter" expanded="True">
                    <Node name="PirDevice" expanded="True">
                      <Node name="View" expanded="True">
                        <Node name="TopView.cs" selected="True" />
                      </Node>
                    </Node>
                  </Node>
                </Node>
              </Node>
            </Node>
          </Node>
        </State>
      </Pad>
@@ -31,13 +33,9 @@
    <String>Shared.IOS/Shared.IOS.csproj</String>
  </DisabledProjects>
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
  <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" />
  <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.4b65c4650918" />
  <MonoDevelop.Ide.DebuggingService.Breakpoints>
    <BreakpointStore>
      <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs" line="34" column="1" />
      <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs" line="313" column="1" />
      <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/BindingResidence/BindingResidencePage.cs" relfile="HDL_ON/UI/BindingResidence/BindingResidencePage.cs" line="121" column="1" />
    </BreakpointStore>
    <BreakpointStore />
  </MonoDevelop.Ide.DebuggingService.Breakpoints>
  <MultiItemStartupConfigurations />
</Properties>

 HDL_ON/DAL/Server/HttpUtil.cs

@@ -17,8 +17,8 @@
        /// 固定域名,正式环境
        /// 公共域名就近解析
        /// </summary>
        public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
        //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
        public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";//线上服务器
        //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//测试服务器
        /// <summary>
        /// RegionMark
        /// </summary>

 HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs

@@ -52,6 +52,9 @@
            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());

 HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/CheckView.cs

@@ -18,8 +18,8 @@
        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,

 HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/LogicTypeTitleView.cs

@@ -21,14 +21,14 @@
        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>
        /// 图标

 HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TimeHorizonView.cs

@@ -64,11 +64,12 @@
            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,
            TextAlignment = TextAlignment.CenterLeft,
            IsMoreLines=true,
        };

        /// <summary>

 HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TipPopView.cs

@@ -555,12 +555,13 @@

                    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;
                }


 HDL_ON/UI/UI2/3-Intelligence/Automation/OutdoorEnvironment.cs

@@ -157,7 +157,7 @@
            });
        }
        /// <summary>
        /// 温度,湿度弹框设置值
        /// PM2.5设置值
        /// </summary>
        /// <param name="frame">当前界面</param>
        /// <param name="stateValue">编辑之前的状态值,默认为""</param>

 HDL_ON/UI/UI2/3-Intelligence/Automation/Weather.cs

@@ -35,6 +35,7 @@
            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();

 HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs

@@ -180,6 +180,7 @@
            //测试Text
            testBtn.MouseUpEventHandler += (sender, e) =>
            {
               // testBtn.BackgroundColor = CSS.CSS_Color.viewMiddle;
                var library = libraryList[index - 1];
                var control = GetControl(spk, testBtn.TextID, library);
                //发送测试码命令
@@ -189,6 +190,10 @@
                    if_bool = true;
                }
            };
            testBtn.MouseDownEventHandler += (sender, e) =>
            {
                //testBtn.BackgroundColor = CSS.CSS_Color.textConfirmColor;
            };
            //控制失败
            failedBtn.MouseUpEventHandler += (sender, e) =>
            {

 HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMethod.cs

@@ -555,14 +555,11 @@
                        case "14005":
                            {
                                str = Language.StringByID(StringId.gatewayNotOnline);

                            }
                            break;
                        case "10807":
                            {
                                str = Language.StringByID(StringId.bunengchaoguo10);


                            }
                            break;
                        case "14002":

 HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/SetPir.cs

@@ -54,6 +54,7 @@
            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());
            //删除

 HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/FrameLayout50.cs

@@ -20,10 +20,11 @@
        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>
@@ -31,11 +32,11 @@
        /// </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,
        };


 HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/PirView.cs

@@ -82,7 +82,7 @@
        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",
@@ -95,8 +95,8 @@
        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,

 HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/ReplicationView.cs

@@ -33,11 +33,12 @@
                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);