From 2f1b0d944bd8feb7c6dca5126a4832228ba826ce Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 04 十二月 2020 14:00:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/CJL-NEW'
---
HDL_ON/Common/R.cs | 102 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 102 insertions(+), 0 deletions(-)
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index 912705b..a1d4f33 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -427,6 +427,60 @@
public const int qqMsuicTip = 5047;
+ public const int newAutomation = 7000;
+ public const int editAutomation = 7001;
+ public const int ifCondition = 7002;
+ public const int andCondition = 7003;
+ public const int orCondition = 7004;
+ public const int isExecuted = 7005;
+ public const int theFollowingActions = 7006;
+ public const int cyclic = 7007;
+ public const int performA = 7008;
+ public const int days = 7009;
+ public const int weekly = 7010;
+ public const int monthly = 7011;
+ public const int save = 7012;
+ public const int push = 7013;
+ public const int notification = 7014;
+ public const int selectionCondition = 7015;
+ public const int time = 7016;
+ public const int selectionTimeCondition = 7017;
+ public const int hour = 7018;
+ public const int timeHorizon = 7019;
+ public const int h = 7020;
+ public const int m = 7021;
+ public const int s = 7022;
+ public const int cancelSelected = 7023;
+ public const int confirmSelected = 7024;
+ public const int timeTipText = 7025;
+ public const int startTime = 7026;
+ public const int endTime = 7027;
+ public const int funLogic = 7028;
+ public const int selectedFunCondition = 7029;
+ public const int allAreas = 7030;
+ public const int allFun = 7031;
+ public const int onLogic = 7032;
+ public const int offLogic = 7033;
+ public const int switchLogic = 7034;
+ public const int completeLogic = 7035;
+ public const int addtarget = 7036;
+ public const int monday = 7037;
+ public const int tuesday = 7038;
+ public const int wednesday = 7039;
+ public const int thursday = 7040;
+ public const int friday = 7041;
+ public const int saturday = 7042;
+ public const int sunday = 7043;
+ public const int meetTheCondition = 7044;
+ public const int setlogic = 7045;
+ public const int namelogic = 7046;
+ public const int editName = 7047;
+ public const int NameAlreadyExists = 7048;
+ public const int delAutomation = 7049;
+ public const int addSceneLogic = 7050;
+ public const int delayLogic = 7051;
+
+
#region LE鏂板
/// <summary>
/// 璇蜂娇鐢ㄦ柊鐨勬墜鏈鸿处鍙风櫥褰旳PP
@@ -564,6 +618,54 @@
/// 宸茬粡鏄渶鏂扮増鏈�
/// </summary>
public const int IsLatestVersion = 9033;
+ /// <summary>
+ /// 鎴戜滑鑳戒负浣犳彁渚涗粈涔堝府鍔╋紵
+ /// </summary>
+ public const int WhatCanWeDoForYou = 9034;
+ /// <summary>
+ /// 鍔熻兘闂
+ /// </summary>
+ public const int FunctionalQuestion = 9035;
+ /// <summary>
+ /// 鍦烘櫙闂
+ /// </summary>
+ public const int SceneQuestion = 9036;
+ /// <summary>
+ /// APP浣跨敤杈呭姪
+ /// </summary>
+ public const int AppUsageAssistance = 9037;
+ /// <summary>
+ /// 甯歌闂
+ /// </summary>
+ public const int CommonQuestion = 9038;
+ /// <summary>
+ /// 鍒嗕韩涓庡姛鑳�
+ /// </summary>
+ public const int SharingAndFunctionality = 9039;
+ /// <summary>
+ /// 鎶ヨ绫�
+ /// </summary>
+ public const int AlarmType = 9040;
+ /// <summary>
+ /// 绯荤粺淇℃伅
+ /// </summary>
+ public const int SystemMessage = 9041;
+ /// <summary>
+ /// 淇℃伅涓績
+ /// </summary>
+ public const int MessageCenter = 9042;
+ /// <summary>
+ /// 璇ヨ处鍙峰凡鍦ㄥ叾瀹冭澶囩櫥褰曘��
+ /// </summary>
+ public const int LoggedOnOtherDevices = 9043;
+ /// <summary>
+ /// 涓婁紶鎴愬姛
+ /// </summary>
+ public const int UploadSuccessfully = 9044;
+ /// <summary>
+ /// 涓婁紶澶辫触
+ /// </summary>
+ public const int UploadFailed = 9045;
#region 缃戠粶璇锋眰鍝嶅簲閿欒鎻愮ず淇℃伅
--
Gitblit v1.8.0