|
@@ -1035,6 +1035,17 @@ namespace MOKA_Factory_Tools
|
|
}
|
|
}
|
|
#endregion
|
|
#endregion
|
|
|
|
|
|
|
|
+ #region 预绑定抄写是否上报离线数据;
|
|
|
|
+ if (jObject["ReportOfflineData"] != null)
|
|
|
|
+ {
|
|
|
|
+ functionSetting1.ReportOfflineData = jObject["ReportOfflineData"].Value<bool>();
|
|
|
|
+ }
|
|
|
|
+ else
|
|
|
|
+ {
|
|
|
|
+ SaveJsonConfig("ReportOfflineData", functionSetting1.ReportOfflineData);
|
|
|
|
+ }
|
|
|
|
+ #endregion
|
|
|
|
+
|
|
foreach (var ss in jObject["Channel"]) //遍历Channel
|
|
foreach (var ss in jObject["Channel"]) //遍历Channel
|
|
{
|
|
{
|
|
Dictionary<string, string> ChannelValues = JsonConvert.DeserializeObject<Dictionary<string, string>>(ss.ToString());
|
|
Dictionary<string, string> ChannelValues = JsonConvert.DeserializeObject<Dictionary<string, string>>(ss.ToString());
|
|
@@ -1945,6 +1956,10 @@ namespace MOKA_Factory_Tools
|
|
{
|
|
{
|
|
if (content.Contains("@"))
|
|
if (content.Contains("@"))
|
|
{
|
|
{
|
|
|
|
+ // 不上报离线数据;
|
|
|
|
+ if (!functionSetting1.ReportOfflineData)
|
|
|
|
+ continue;
|
|
|
|
+
|
|
string[] data = content.Split('@');
|
|
string[] data = content.Split('@');
|
|
if (V2Method.ReportOfflineData(url, data[1], data[0], LocalDB, ErrorDB, true, id))
|
|
if (V2Method.ReportOfflineData(url, data[1], data[0], LocalDB, ErrorDB, true, id))
|
|
{
|
|
{
|