From 06e83631ac1c0b04e6bce54ba952c9177e637ecc Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期四, 09 四月 2020 10:42:19 +0800
Subject: [PATCH] 2020-04-09-1
---
ZigbeeApp/Shared/Phone/Device/Logic/Send.cs | 8 ++++++++
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | 14 ++++++++++----
ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide | 0
.DS_Store | 0
4 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/.DS_Store b/.DS_Store
index b7c7dea..5e19d05 100644
--- a/.DS_Store
+++ b/.DS_Store
Binary files differ
diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index 7282d8e..c0ef27e 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/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>
diff --git a/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide b/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
index fc64f06..0f758e7 100644
--- a/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
+++ b/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
Binary files differ
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
index 8c89431..6d0a404 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
+++ b/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)
--
Gitblit v1.8.0