2。红外空调学码修复

wei

2021-03-26 976c266003d052c93d45f438fa8f6ccfc926b3b2

2。红外空调学码修复

 .vs/HDL_APP_Project/xs/UserPrefs.xml

@@ -1,15 +1,17 @@
<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-000404163432002E" />
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/DriverLayer/Control_Udp.cs">
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage_AddIrButton.cs">
    <Files>
      <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" Line="1" Column="1" />
      <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="21" Column="87" />
      <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs" Line="735" Column="62" />
      <File FileName="HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs" Line="95" Column="57" />
      <File FileName="HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs" Line="896" Column="84" />
      <File FileName="../../Library/Containers/com.tencent.WeWorkMac/Data/Library/Application Support/WXWork/Data/1688852687634638/Cache/File/2021-03/DeviceTemperatureHistoryForm(1).cs" Line="1015" Column="25" />
      <File FileName="HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EchartsOption_Pie.cs" Line="44" Column="25" />
      <File FileName="HDL_ON/DAL/DriverLayer/Control_Udp.cs" Line="842" Column="33" />
      <File FileName="HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EchartsOption_Pie.cs" Line="39" Column="19" />
      <File FileName="HDL_ON/DAL/DriverLayer/Control_Udp.cs" Line="740" Column="49" />
      <File FileName="HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs" Line="84" Column="56" />
      <File FileName="HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage_AddIrButton.cs" Line="146" Column="97" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs" Line="153" Column="28" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
@@ -17,33 +19,18 @@
          <Node name="HDL_APP_Project" expanded="True">
            <Node name="HDL_ON" expanded="True">
              <Node name="Common" expanded="True" />
              <Node name="DAL" expanded="True">
                <Node name="DriverLayer" expanded="True">
                  <Node name="Control_Udp.cs" selected="True" />
                </Node>
                <Node name="Server" expanded="True" />
              </Node>
              <Node name="Entity" expanded="True">
                <Node name="Enumerative" expanded="True" />
                <Node name="Function" expanded="True" />
              </Node>
              <Node name="UI" expanded="True">
                <Node name="UI1-Login" expanded="True" />
                <Node name="UI2" expanded="True">
                  <Node name="2-Classification" expanded="True" />
                  <Node name="4-PersonalCenter" expanded="True">
                    <Node name="PirDevice" expanded="True" />
                  </Node>
                  <Node name="FuntionControlView" expanded="True">
                    <Node name="Energy" expanded="True" />
                    <Node name="EnvironmentalScience" expanded="True" />
                    <Node name="1ContorlPage" expanded="True">
                      <Node name="AcControlPage_AddIrButton.cs" selected="True" />
                    </Node>
                  </Node>
                </Node>
              </Node>
            </Node>
            <Node name="HDL-ON_Android" expanded="True">
              <Node name="Assets" expanded="True" />
              <Node name="Resources" expanded="True" />
            </Node>
            <Node name="HDL-ON_iOS" expanded="True">
              <Node name="Resources" expanded="True" />
            </Node>
          </Node>
        </State>
@@ -57,6 +44,7 @@
    <String>Shared.IOS/Shared.IOS.csproj</String>
  </DisabledProjects>
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
  <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.364c4b3158493098" />
  <MonoDevelop.Ide.DebuggingService.Breakpoints>
    <BreakpointStore>
      <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/Server/HttpServerRequest.cs" relfile="HDL_ON/DAL/Server/HttpServerRequest.cs" line="2202" column="1" />

 HDL-ON_Android/Resources/Resource.designer.cs

Diff too large

 HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage_AddIrButton.cs

@@ -133,35 +133,20 @@
                buttonObj.key = "key" + control.attributes.Count.ToString();
                buttonObj.value = texts;

                PirSend.CodeStudy(new Control() { deviceId = control.deviceId,sid = control.sid }, buttonObj, (mqttData) =>
                {
                    if (mqttData != null)// && responsePackNew.Code == "0" && responsePackNew.Data.ToString() != "")
                    {
                        Method method = new Method();
                        Method.buttondata = "";
                        var mqttdate = method.MqttDate("按键", control.sid, 25);
                        if (mqttdate != null)
                        {
                            this.RemoveFromParent();
                            control.attributes.Add(new FunctionAttributes() { key = buttonObj.key, value = new System.Collections.Generic.List<string>() { buttonObj.value } });
                        }
                        else
                        {
                            replication.RemView();
                            new TipPopView().FlashingBox(Language.StringByID(StringId.tianjiashibai));
                        }
                    }
                    else
                    {
                        Method method = new Method();
                        new TipPopView().FlashingBox(Language.StringByID(StringId.tianjiashibai));
                    }

                });


                PirSend.CodeStudy(new Control() { deviceId = control.deviceId, sid = control.sid }, buttonObj, (mqttData) =>
                 {
                     if (mqttData != null)
                     {
                         control.attributes.Add(new FunctionAttributes() { key = buttonObj.key, value = new System.Collections.Generic.List<string>() { buttonObj.value } });
                         this.RemoveFromParent();
                     }
                     else
                     {
                         this.RemoveFromParent();
                         new TipPopView().FlashingBox(Language.StringByID(StringId.tianjiashibai));
                     }
                 });
            };

        }
    }
}

 HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs

@@ -73,15 +73,15 @@

            var echartsView = new FrameLayout()
            {
                Width = Application.GetRealWidth(100),
                Height = Application.GetRealWidth(100),
                Width = Application.GetRealWidth(118),
                Height = Application.GetRealWidth(118),
                X = Application.GetRealWidth(227),
                Y = Application.GetRealWidth(16),
                //Y = Application.GetRealWidth(16),
            };
            generalTableView.AddChidren(echartsView);
            MyEchartsViewOn myEchartsView = new MyEchartsViewOn() {
                Width = Application.GetRealWidth(100),
                Height = Application.GetRealWidth(100),
                Width = Application.GetRealWidth(118),
                Height = Application.GetRealWidth(118),
            };

            echartsView.AddChidren(myEchartsView);

 HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EchartsOption_Pie.cs

@@ -34,20 +34,26 @@
        /// <returns></returns>
        private string GetChartControlCommonOption()
        {
            //{0}:数据
        //{0}:数据

        //tooltip:
        //    {
        //    trigger: 'item',
        //            padding: 40,
        //            textStyle:
        //        {
        //        fontSize: 38,
        //            },
        //            show: true,
        //            trigger: 'item',
        //            position:['1%', '1%']
        //        },
#if __IOS__
            return @"{
                tooltip: {
                    trigger: 'item',
                    padding:40,
                    textStyle:{
                        fontSize :38,
                    },
                },
                series : [
                 {
                    right: '55%',
                    bottom:'55%',
                    right: '54%',
                    bottom:'54%',
                    labelLine: false,
                    type: 'pie',
                    data:[
@@ -69,14 +75,12 @@
            }";
#else
return @"{
                tooltip: {
                    trigger: 'item',
                },
                series : [
                 {
                    right: '54%',
                    bottom:'54%',
                    labelLine: false,
                    type: 'pie',
                    radius: '25%',
                    data:[
                       {0}
                     ],
@@ -94,7 +98,6 @@
                   }
                   ]
            }";

#endif
        }