From 6fa9d69da922c8049f5acfcbb9ce9fd26811024c Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 16 四月 2020 17:10:57 +0800
Subject: [PATCH] 请合并代码
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/DirectoryFileNameResourse.cs | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/DirectoryFileNameResourse.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/DirectoryFileNameResourse.cs
index 22c1a1d..aef49cd 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/DirectoryFileNameResourse.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/DirectoryFileNameResourse.cs
@@ -87,6 +87,10 @@
/// </summary>
public const string AccountOptionFile = "d33690329dfdf2e5dcce0280893b95a0db47b5be13b46aa0";
/// <summary>
+ /// 淇濆瓨浣忓畢閰嶇疆鐨勩�愭枃浠躲��
+ /// </summary>
+ public const string ResidenceOptionFile = "b79583bed6909a52849eaea268449aee15f29d3bdf8b5ca3";
+ /// <summary>
/// 淇濆瓨浣忓畢椤哄簭鐨勩�愭枃浠躲��
/// </summary>
public const string ResidenceSortFile = "b79583bed6909a524e81e2461474f8dcc7a45bf99cecee93";
@@ -122,6 +126,10 @@
/// 妫�娴嬪紩瀵肩殑銆愭枃浠躲��
/// </summary>
public const string GuideFile = "cad1afb384fb482de753fc37ebe84f9e";
+ /// <summary>
+ /// 鎵撳紑Gbs鐨勫垽鏂�愭枃浠躲��(涓存椂)
+ /// </summary>
+ public const string OpenGbsFile = "cd8f75492cb65ef0951442460336db62";
/// <summary>
/// 鏄剧ず鍔熻兘鑿滃崟鐨勩�愭爣璇嗘枃浠躲��,涓嶅姞瀵�
@@ -132,6 +140,10 @@
/// </summary>
public const string DetailedLogFile = "DetailedLogFile";
/// <summary>
+ /// 鏄剧ず璁惧鍘嗗彶鐗堟湰鐨勩�愭爣璇嗘枃浠躲��,涓嶅姞瀵�
+ /// </summary>
+ public const string DeviceHistoryFile = "DeviceHistoryFile";
+ /// <summary>
/// 鍔熻兘澶囦唤鐨勫悕瀛� 杩欎釜涓滆タ涓嶅姞瀵�
/// </summary>
public const string OptionBackupName = "##Option##";
--
Gitblit v1.8.0