20201222-3

wei

2020-12-22 ecc6575f250e00f290db163a27c1471028e135e2

20201222-3

 .vs/HDL_APP_Project/xs/UserPrefs.xml

@@ -1,6 +1,6 @@
<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-001844A93ED0802E" />
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/MainPage.cs">
  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.47f89eb181110cd1c1050db004cedf20a2ec9c7f" />
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs">
    <Files>
      <File FileName="HDL_ON/Entity/Function/AC.cs" Line="343" Column="14" />
      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs" Line="425" Column="124" />
@@ -11,14 +11,6 @@
      <File FileName="HDL_ON/Entity/Function/Scene.cs" Line="416" Column="1" />
      <File FileName="HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs" Line="145" Column="18" />
      <File FileName="HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs" Line="148" Column="62" />
      <File FileName="HDL_ON/Entity/Function/Function.cs" Line="194" Column="37" />
      <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="925" Column="10" />
      <File FileName="HDL_ON/UI/BindingResidence/BindingResidencePage.cs" Line="107" Column="15" />
      <File FileName="HDL_ON/Common/HDLCommon.cs" Line="315" Column="43" />
      <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" Line="184" Column="39" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs" Line="196" Column="58" />
      <File FileName="HDL_ON/Entity/DB_ResidenceData.cs" Line="124" Column="48" />
      <File FileName="HDL_ON/UI/MainPage.cs" Line="29" Column="55" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
@@ -31,13 +23,26 @@
                <Node name="Mqtt" expanded="True" />
                <Node name="Server" expanded="True" />
              </Node>
              <Node name="Entity" expanded="True" />
              <Node name="Entity" expanded="True">
                <Node name="Function" expanded="True" />
              </Node>
              <Node name="UI" expanded="True">
                <Node name="BindingResidence" expanded="True" />
                <Node name="CSS" expanded="True" />
                <Node name="UI2" expanded="True">
                  <Node name="2-Classification" expanded="True" />
                  <Node name="4-PersonalCenter" expanded="True" />
                  <Node name="FuntionControlView" expanded="True">
                    <Node name="FoolHeating" expanded="True">
                      <Node name="FloorHeatingPage.cs" selected="True" />
                    </Node>
                  </Node>
                </Node>
                <Node name="MainPage.cs" selected="True" />
              </Node>
            </Node>
            <Node name="HDL-ON_Android" expanded="True">
              <Node name="Other" expanded="True">
                <Node name="JPush" expanded="True" />
              </Node>
            </Node>
            <Node name="HDL-ON_iOS" expanded="True" />
@@ -62,7 +67,6 @@
  <MonoDevelop.Ide.DebuggingService.Breakpoints>
    <BreakpointStore>
      <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI0-Public/PublicAssmebly.cs" relfile="HDL_ON/UI/UI0-Public/PublicAssmebly.cs" line="726" column="1" />
      <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/DriverLayer/Control.cs" relfile="HDL_ON/DAL/DriverLayer/Control.cs" line="186" column="1" />
    </BreakpointStore>
  </MonoDevelop.Ide.DebuggingService.Breakpoints>
  <MultiItemStartupConfigurations />

 HDL-ON_Android/Other/JPush/JPushReceiver.cs

@@ -55,12 +55,12 @@
            if (jpushExpandData != null && jpushExpandData.messageType != null)
            {
                pushMes.messageType = jpushExpandData.messageType;
                System.Console.WriteLine("PushMes messageType : " + pushMes.messageType);
                Utlis.WriteLine("PushMes messageType : " + pushMes.messageType);
            }

            System.Console.WriteLine("PushMes title : " + pushMes.Title);
            System.Console.WriteLine("PushMes message : " + pushMes.Content);
            System.Console.WriteLine("PushMes extras : " + pushMes.Extras);
            Utlis.WriteLine("PushMes title : " + pushMes.Title);
            Utlis.WriteLine("PushMes message : " + pushMes.Content);
            Utlis.WriteLine("PushMes extras : " + pushMes.Extras);

            HDLCommon.Current.AdjustPushMessage(pushMes);
        }
@@ -158,12 +158,12 @@
                if (jpushExpandData != null && jpushExpandData.messageType != null)
                {
                    pushMes.messageType = jpushExpandData.messageType;
                    System.Console.WriteLine("PushMes messageType : " + pushMes.messageType);
                    Utlis.WriteLine("PushMes messageType : " + pushMes.messageType);
                }

                System.Console.WriteLine("PushMes title : " + pushMes.Title);
                System.Console.WriteLine("PushMes message : " + pushMes.Content);
                System.Console.WriteLine("PushMes extras : " + pushMes.Extras);
                Utlis.WriteLine("PushMes title : " + pushMes.Title);
                Utlis.WriteLine("PushMes message : " + pushMes.Content);
                Utlis.WriteLine("PushMes extras : " + pushMes.Extras);

                if (Shared.Application.Activity == null)
                {

 HDL-ON_iOS/AppDelegate.cs

@@ -329,9 +329,9 @@
                        Extras = expandData,
                        messageType = messageType
                    };
                    System.Console.WriteLine("PushMes title : " + pushMes.Title);
                    System.Console.WriteLine("PushMes message : " + pushMes.Content);
                    System.Console.WriteLine("PushMes extras : " + pushMes.Extras);
                    Utlis.WriteLine("PushMes title : " + pushMes.Title);
                    Utlis.WriteLine("PushMes message : " + pushMes.Content);
                    Utlis.WriteLine("PushMes extras : " + pushMes.Extras);

                    if (bFinishedLaunching)
                    {

 HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs

@@ -339,6 +339,7 @@
                var onoff = btn.IsSelected ? "on" : "off";
                var waitPage = new Loading();
                view.AddChidren(waitPage);
                waitPage.BackgroundColor = 0x00000000;
                waitPage.Start("");
                new System.Threading.Thread(() =>
                {
@@ -417,6 +418,7 @@
                btnOpen.IsSelected = true;
                btnClose.IsSelected = false;
                var waitPage = new Loading();
                waitPage.BackgroundColor = 0x00000000;
                view.AddChidren(waitPage);
                waitPage.Start("");
                new System.Threading.Thread(() =>