2020-04-09-1

WJC

2020-04-09 06e83631ac1c0b04e6bce54ba952c9177e637ecc

2020-04-09-1

默认自定义推送内容

 .DS_Store

Binary files differ

 ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml

@@ -1,21 +1,27 @@
<Properties StartupConfiguration="{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}|Default">
  <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.5c86e4357d63" />
  <MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.M7BBB18B19152766" />
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/TimePage.cs">
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/Send.cs">
    <Files>
      <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" Line="186" Column="78" />
      <File FileName="Shared/Phone/Device/Logic/OneLogic.cs" Line="158" Column="48" />
      <File FileName="Shared/Phone/Device/Logic/TimePage.cs" Line="338" Column="1" />
      <File FileName="Shared/Phone/Device/Logic/OneLogic.cs" Line="306" Column="22" />
      <File FileName="Shared/Phone/Device/Logic/TimePage.cs" />
      <File FileName="Shared/Phone/Device/Logic/Method.cs" Line="695" Column="23" />
      <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="1118" Column="95" />
      <File FileName="GateWay.Droid/Assets/Language.ini" Line="522" Column="5" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
        <State name="__root__">
          <Node name="GateWay" expanded="True">
            <Node name="GateWay.Droid" expanded="True">
              <Node name="Assets" expanded="True" />
            </Node>
            <Node name="Shared" expanded="True">
              <Node name="Phone" expanded="True">
                <Node name="Device" expanded="True">
                  <Node name="Logic" expanded="True">
                    <Node name="TimePage.cs" selected="True" />
                    <Node name="Send.cs" selected="True" />
                  </Node>
                </Node>
              </Node>

 ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide

Binary files differ

 ZigbeeApp/Shared/Phone/Device/Logic/Send.cs

@@ -1113,6 +1113,14 @@
        /// <param name="logic">逻辑对象</param>
        public static void Zj(bool tag, Common.Logic logic)
        {

            if (string.IsNullOrEmpty(logic.LogicCustomPushText))
            {
                ///默认推送自定义内容
                string str = logic.LogicName + Language.StringByID(R.MyInternationalizationString.defaulttext);
                logic.LogicCustomPushText = str;
            }

            new System.Threading.Thread(() =>
            {
                if (logic.LogicId != 0)