From 223875b14fa1f87be66620c9903e5183f9b19c43 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 27 八月 2021 17:01:08 +0800
Subject: [PATCH] 2021-08-27 1.更新Android库，修改裁剪图片方案，支持大图裁剪

---
 HDL_ON/Entity/Function/Scene.cs |   55 +++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/HDL_ON/Entity/Function/Scene.cs b/HDL_ON/Entity/Function/Scene.cs
index ded2b0c..fa6176f 100644
--- a/HDL_ON/Entity/Function/Scene.cs
+++ b/HDL_ON/Entity/Function/Scene.cs
@@ -67,7 +67,7 @@
         /// </summary>
         public string delay = "0";
         /// <summary>
-        /// 鍦烘櫙鐨勬渶濂戒竴娆℃墽琛屾椂闂�
+        /// 鍦烘櫙鐨勬渶鍚庝竴娆℃墽琛屾椂闂�
         /// </summary>
         public string LastExecutionTime = "";
 
@@ -77,17 +77,24 @@
         public string group = "1";
         /// <summary>
         /// 鍦烘櫙绫诲瀷
+        /// 0:鏅��
+        /// 1:鐢靛奖
+        /// 2:璋冨厜
         /// </summary>
         public SceneType sceneType = SceneType.OrdinaryScenes;
         /// <summary>
         /// 鏀惰棌鏍囪
         /// </summary>
         public bool collect = false;
+        /// <summary>
+        /// 鏄惁鍏佽鍒犻櫎
+        /// </summary>
+        public bool can_delete = true;
 
         /// <summary>
         /// 鍒涘缓璇ュ満鏅殑鐢ㄦ埛ID
         /// </summary>
-        public string userId = "";
+        public string userId = UserInfo.Current.ID;
 
         ///// <summary>
         ///// 鍦烘櫙鑳屾櫙
@@ -348,7 +355,18 @@
         {
             var delayInt = 0;
             int.TryParse(delay,out delayInt);
-            string text = (delayInt / 60)+Language.StringByID(StringId.m)+(delayInt % 60)+Language.StringByID(StringId.s);
+            if(delayInt == 0)
+            {
+                return Language.StringByID(StringId.NoDelay);
+            }
+            string text = "";
+            if (delayInt > 60)
+            {
+                text = (delayInt / 60) + Language.StringByID(StringId.m) + (delayInt % 60) + Language.StringByID(StringId.s);
+            }else
+            {
+                text = delayInt + Language.StringByID(StringId.s);
+            }
             return text;
             switch (delay)
             {
@@ -434,7 +452,9 @@
                 if (sfs.key == FunctionAttributeKey.OnOff)
                 {
                     if (sfs.value == "off")
+                    {
                         return Language.StringByID(StringId.Close);
+                    }
                 }
             }
             sceneFunctionInfo += Language.StringByID(StringId.Open) + " ";
@@ -529,10 +549,15 @@
         /// <summary>
         /// 灞炴�у�煎崟浣�
         /// </summary>
-        public string GetUintString()
+        public string GetUintString(string inputKey = "")
         {
             var us = "";
-            switch (key)
+            var swithchString = key;
+            if(!string.IsNullOrEmpty(inputKey))
+            {
+                swithchString = inputKey;
+            }
+            switch (swithchString)
             {
                 case FunctionAttributeKey.SetTemp:
                 case FunctionAttributeKey.RoomTemp:
@@ -551,26 +576,31 @@
         /// 鑾峰彇鎸囧畾灞炴�х殑鏄剧ず鏂囨湰
         /// 涓嫳鏂囨樉绀�
         /// </summary>
-        public string GetValueText()
+        public string GetValueText(string temp = "")
         {
+            string catchString = value;
+            if(temp!= "")
+            {
+                catchString = temp;
+            }
             string text = "";
             switch (key)
             {
                 case FunctionAttributeKey.OnOff:
-                    text = value == "on" ? Language.StringByID(StringId.On) : Language.StringByID(StringId.OFF);
+                    text = catchString == "on" ? Language.StringByID(StringId.On) : Language.StringByID(StringId.OFF);
                     break;
                 case FunctionAttributeKey.SetTemp:
                 case FunctionAttributeKey.RoomTemp:
                 case FunctionAttributeKey.Brightness:
                 case FunctionAttributeKey.Percent:
-                    if (value == "")
+                    if (catchString == "")
                     {
-                        value = "0";
+                        catchString = "0";
                     }
-                    text = value;
+                    text = catchString;
                     break;
                 case FunctionAttributeKey.Mode:
-                    switch (value)
+                    switch (catchString)
                     {
                         //----绌鸿皟
                         case "auto":
@@ -589,6 +619,7 @@
                             text = Language.StringByID(StringId.AirSupply);
                             break;
                         //-----鍦扮儹
+                        // 1:鏅��,2:鐧藉ぉ,3:澶滄櫄,4:绂诲紑,5:鏃堕棿
                         case "day":
                             text = Language.StringByID(StringId.Day);
                             break;
@@ -607,7 +638,7 @@
                     }
                     break;
                 case FunctionAttributeKey.FanSpeed:
-                    switch (value)
+                    switch (catchString)
                     {
                         case "high":
                             text = Language.StringByID(StringId.HighWindSpeed);

--
Gitblit v1.8.0