From 43b0d5870d528f23ecd6aeceb6cfd4325188b46f Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期四, 01 七月 2021 15:50:43 +0800 Subject: [PATCH] Revert "1" --- HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs | 446 ++++++++++++++++++++++++++++++++----------------------- 1 files changed, 260 insertions(+), 186 deletions(-) diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs index 8d56021..d40c649 100644 --- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs +++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs @@ -1,10 +1,11 @@ 锘縰sing System; using System.Collections.Generic; +using HDL_ON.Entity; using Shared; namespace HDL_ON.UI.UI2.Intelligence.Automation { - + public class LogicMethod { /// <summary> @@ -22,6 +23,47 @@ { MainPage.BasePageView.RemoveViewByTag("Logic"); } + + /// <summary> Converts an array of bytes into a formatted string of hex digits (ex: E4 CA B2)</summary> + /// <param name="data"> The array of bytes to be translated into a string of hex digits. </param> + /// <returns> Returns a well formatted string of hex digits with spacing. </returns> + static string byteArrayToHexString(byte[] data) + { + System.Text.StringBuilder sb = new System.Text.StringBuilder(); + foreach (byte b in data) + { + sb.Append(Convert.ToString(b, 16).PadLeft(2, '0')); + } + + return sb.ToString().ToUpper(); + } + + /** + * int杞琤yte[] + * 璇ユ柟娉曞皢涓�涓猧nt绫诲瀷鐨勬暟鎹浆鎹负byte[]褰㈠紡锛屽洜涓篿nt涓�32bit锛岃�宐yte涓�8bit鎵�浠ュ湪杩涜绫诲瀷杞崲鏃讹紝鐭ヤ細鑾峰彇浣�8浣嶏紝 + * 涓㈠純楂�24浣嶃�傞�氳繃浣嶇Щ鐨勬柟寮忥紝灏�32bit鐨勬暟鎹浆鎹㈡垚4涓�8bit鐨勬暟鎹�傛敞鎰� &0xff锛屽湪杩欏綋涓紝&0xff绠�鍗曠悊瑙d负涓�鎶婂壀鍒�锛� + * 灏嗘兂瑕佽幏鍙栫殑8浣嶆暟鎹埅鍙栧嚭鏉ャ�� + * @param i 涓�涓猧nt鏁板瓧 + * @return byte[] + */ + public static byte[] int2ByteArray(int i) + { + byte[] result = new byte[4]; + result[0] = (byte)((i >> 24) & 0xFF); + result[1] = (byte)((i >> 16) & 0xFF); + result[2] = (byte)((i >> 8) & 0xFF); + result[3] = (byte)(i & 0xFF); + return result; + } + /// <summary> + /// 鑾峰彇鏃堕棿鎴� + /// </summary> + /// <returns></returns> + static int getTimeStamp() + { + TimeSpan ts = DateTime.UtcNow - new DateTime(1970, 1, 1, 0, 0, 0, 0); + return (int)ts.TotalSeconds; + } /// <summary> /// 鐢熸垚閫昏緫sid鏂规硶 /// </summary> @@ -34,38 +76,28 @@ DateTime dt = DateTime.Now; DateTime startTime = TimeZoneInfo.ConvertTimeToUtc(new DateTime(2020, 1, 1)); long m = (long)((dt - startTime).TotalMilliseconds / 10); - string sTimeSpan = "00000000"; - - byte[] arry = new byte[4]; - arry[0] = (byte)(m & 0xFF); - arry[1] = (byte)((m & 0xFF00) >> 8); - arry[2] = (byte)((m & 0xFF0000) >> 16); - arry[3] = (byte)((m >> 24) & 0xFF); - sTimeSpan = arry[0].ToString("X2") + arry[1].ToString("X2") + arry[2].ToString("X2") + arry[3].ToString("X2"); + string sTimeSpan = byteArrayToHexString(int2ByteArray(getTimeStamp())); - if (sTimeSpan.Length > 8) - { - sTimeSpan = sTimeSpan.Substring(0, 8); - } - else - { - sTimeSpan = "00000000"; - } logicId = sOidBeginsWith + sTimeSpan; - logicId += "0A"; - logicId += "0A01"; - //0A01 鐗╂ā鍨嬩负閫昏緫锛� 0001 琛ㄧず 1 鍙烽�昏緫鍔熻兘 - int iTopLogicId = 1; + logicId += "15"; + logicId += "1501"; + //1501 鐗╂ā鍨嬩负閫昏緫锛� 0001 琛ㄧず 1 鍙烽�昏緫鍔熻兘 + int maxId = 1; - Random random = new Random(); - iTopLogicId = random.Next(0, 255); - iTopLogicId += random.Next(0, 255); - logicId += iTopLogicId.ToString("X4");//閫昏緫鍙� 涓や釜byte - logicId += "1100"; + for (int i = 0; i < Logic.LogicList.Count; i++) + { + string s = Logic.LogicList[i].sid.Substring(20, 4); + int iThisSceneId = Convert.ToInt16(s, 16); + if (iThisSceneId > maxId) + maxId = iThisSceneId; + } + + logicId += (maxId + 1).ToString("X4");//閫昏緫鍙� 涓や釜byte + logicId += "0000"; } catch { @@ -93,28 +125,33 @@ /// 鑾峰彇缃戝叧鎴块棿鍒楄〃 /// </summary> /// <returns></returns> - public static List<HDL_ON.Entity.Room> GetGatewayRoomList() + public static List<HDL_ON.Entity.Room> GetGatewayRoomList() { - return HDL_ON.Entity.DB_ResidenceData.rooms; + return HDL_ON.Entity.SpatialInfo.CurrentSpatial.RoomList; } /// <summary> /// 鑾峰彇缃戝叧鎴块棿鍒楄〃 /// </summary> /// <returns></returns> - public static List<HDL_ON.Entity.Room> GetGatewayRoomList(string name) + public static List<HDL_ON.Entity.Room> GetGatewayRoomList(string name) { - List<Entity.Room> roomList = new List<Entity.Room>(); Entity.Room room1 = new Entity.Room(); - room1.name = name;//榛樿涓�涓埧闂村悕涓�:鍏ㄩ儴鍖哄煙 - room1.sid = "鍏ㄩ儴鍖哄煙";//榛樿sid鐢ㄨ瘑鍒鎴块棿 + room1.roomName = name;//鑷畾涔夐粯璁や竴涓埧闂村悕涓�:6688 + room1.roomId = "6688";//鑷畾涔夐粯璁d鐢ㄨ瘑鍒鎴块棿 roomList.Add(room1);//榛樿娣诲姞鍒版埧闂村垪琛ㄩ噷 var roomLists = GetGatewayRoomList(); - foreach (var room in roomLists) + for (int i = 0; i < roomLists.Count; i++) { + var room = roomLists[i]; + var devlist = GetRoomDevice(room); + if (devlist.Count == 0) + { + //杩囨护鎺夋病鏈夎澶囩殑鎴块棿; + continue; + } roomList.Add(room); } - return roomList; } /// <summary> @@ -123,81 +160,7 @@ /// <returns></returns> public static List<HDL_ON.Entity.Function> GetGatewayDeviceList() { - List<HDL_ON.Entity.Function> list = new List<Entity.Function>(); - for (int i=0;i<10;i++) { - HDL_ON.Entity.Function function = new Entity.Function(); - switch (i) { - case 0: { - function.sid = "1234560001212121020182"; - function.name ="鐏厜"; - list.Add(function); - } - break; - case 1: { - - function.sid = "1234560001212121030182"; - function.name = "绐楀笜"; - list.Add(function); - } break; - case 2: { - function.sid = "1234560001212121040182"; - function.name = "绌鸿皟"; - list.Add(function); - } break; - case 3: - { - function.sid = "1234560001212121010282"; - function.name = "RGBW"; - list.Add(function); - } - break; - case 4: - { - - function.sid = "1234560001212121010382"; - function.name = "CCT鐏�"; - list.Add(function); - } - break; - case 5: - { - function.sid = "1234560001212121010482"; - function.name = "寮�鍚堝笜"; - list.Add(function); - } - break; - case 6: - { - function.sid = "1234560001212121010582"; - function.name = "鍗峰笜"; - list.Add(function); - } - break; - case 7: - { - function.sid = "1234560001212121040282"; - function.name = "鍦扮儹"; - list.Add(function); - } - break; - case 8: - { - function.sid = "1234560001212121020282"; - function.name = "璋冨叧"; - list.Add(function); - } - break; - case 9: - { - function.sid = "1234560001212121020482"; - function.name = "RGB"; - list.Add(function); - } - break; - } - } - return list; - //return HDL_ON.Entity.DB_ResidenceData.functionList.GetAllFunction(); + return Entity.FunctionList.List.GetDeviceFunctionList(); } /// <summary> /// 鑾峰彇缃戝叧鍦烘櫙鍒楄〃 @@ -205,7 +168,7 @@ /// <returns></returns> public static List<HDL_ON.Entity.Scene> GetSceneList() { - return HDL_ON.Entity.DB_ResidenceData.functionList.scenes; + return HDL_ON.Entity.FunctionList.List.scenes; } /// <summary> /// 鑾峰彇鎴块棿鐨勮澶囧垪琛� @@ -216,18 +179,24 @@ { List<HDL_ON.Entity.Function> deviceLists = new List<Entity.Function>(); List<HDL_ON.Entity.Function> lists = GetGatewayDeviceList(); - foreach (var dev in lists) + if (room.roomId == "6688") { - if (dev.roomIds.Find((id) => id == room.sid) != null) + //榛樿涓�涓埧闂村悕锛�6688 + //鏄剧ず缃戝叧鍏ㄩ儴璁惧 + deviceLists = lists; + } + else + { + for (int i = 0; i < lists.Count; i++) { - deviceLists.Add(dev); - } - if (room.sid == "鍏ㄩ儴鍖哄煙") - { - //鎴块棿鍚嶄负鍏ㄩ儴鍖哄煙鏃讹紝鏄剧ず缃戝叧鍏ㄩ儴璁惧 - deviceLists = lists; - } + var dev = lists[i]; + if (dev.roomIds.Find((id) => id == room.roomId) != null) + { + //娣诲姞灞炰簬杩欎釜鎴块棿鐨勮澶�; + deviceLists.Add(dev); + } + } } return deviceLists; } @@ -238,10 +207,11 @@ /// <returns></returns> public static HDL_ON.Entity.Function GetDevice(string sid) { - HDL_ON.Entity.Function device = new Entity.Function() { name= "Unknown",sid="璁惧涓嶅瓨鍦�"}; + HDL_ON.Entity.Function device = new Entity.Function() { name = "Unknown" }; List<HDL_ON.Entity.Function> deviceLists = GetGatewayDeviceList(); - foreach (var dev in deviceLists) + for (int i = 0; i < deviceLists.Count; i++) { + var dev = deviceLists[i]; if (dev.sid == sid) { device = dev; @@ -258,10 +228,11 @@ /// <returns></returns> public static HDL_ON.Entity.Scene GetSecne(string sid) { - HDL_ON.Entity.Scene scene = new Entity.Scene() { name = "Unknown", sid = "鍦烘櫙涓嶅瓨鍦�" }; + HDL_ON.Entity.Scene scene = new Entity.Scene() { name = "Unknown" }; List<HDL_ON.Entity.Scene> sceneLists = GetSceneList(); - foreach (var sce in sceneLists) + for (int i = 0; i < sceneLists.Count; i++) { + var sce = sceneLists[i]; if (sce.sid == sid) { scene = sce; @@ -279,52 +250,67 @@ { string roomName = ""; List<HDL_ON.Entity.Room> roomLists = GetGatewayRoomList(); - - foreach (var dev in device.roomIds) + for (int i = 0; i < device.roomIds.Count; i++) { - var room = roomLists.Find((c) => c.sid == dev); + var dev = device.roomIds[i]; + var room = roomLists.Find((c) => c.roomId == dev); if (room != null) { - roomName += room.floorName + "." + room.name + ","; + roomName += room.floorName + "." + room.roomName + ","; } } return roomName.TrimEnd(','); } + #region 鍔ㄤ竴鏀瑰洓 /// <summary> /// 鑾峰彇璁惧绫诲瀷鍥炬爣 /// </summary> /// <param name="functionType">璁惧绫诲瀷</param> /// <returns></returns> - public static string GetIconPath(FunctionType functionType) + public static string GetIconPath(string functionType) { string strPath = ""; switch (functionType) { - case FunctionType.Relay: - case FunctionType.RGB: - case FunctionType.RGBW: - case FunctionType.CCT: - case FunctionType.Dimmer: + case SPK.LightSwitch: + case SPK.LightRGB: + case SPK.LightRGBW: + case SPK.LightCCT: + case SPK.LightDimming: { strPath = "LogicIcon/lightloguc.png"; } break; - case FunctionType.Curtain: - case FunctionType.RollerCurtain: - case FunctionType.TrietexCurtain: + case SPK.CurtainSwitch: + case SPK.CurtainRoller: + case SPK.CurtainTrietex: { strPath = "LogicIcon/curtainlogic.png"; } break; - case FunctionType.AC: + case SPK.AcStandard: { strPath = "LogicIcon/airconditionerlogic.png"; } break; - case FunctionType.FloorHeating: + case SPK.FloorHeatStandard: { strPath = "LogicIcon/heatlogic.png"; + } + break; + case SPK.SensorSmoke: + case SPK.SensorWater: + case SPK.SensorGas: + case SPK.SensorDryContact: + case SPK.SensorShanLan: + case SPK.SensorDuiShe: + case SPK.SensorPir: + case SPK.SensorDoorWindow: + case SPK.SensoruUtrasonic: + case SPK.SenesorMegahealth: + { + strPath = "LogicIcon/sensor.png"; } break; @@ -336,31 +322,55 @@ /// </summary> /// <param name="deviceList">璁惧鍒楄〃</param> /// <returns></returns> - public static List<string> GetDeviceTypeList(List<HDL_ON.Entity.Function> deviceList) + public static List<string> GetDeviceTypeList(List<HDL_ON.Entity.Function> deviceList) { - List<string> deviceStrTypeList = new List<string>(); + List<string> deviceStrTypeList = new List<string>(); deviceStrTypeList.Clear(); - var lightjosn = deviceList.Find((device) => device.functionType == FunctionType.Relay || device.functionType == FunctionType.Dimmer|| device.functionType == FunctionType.CCT || device.functionType == FunctionType.RGB|| device.functionType == FunctionType.RGBW); + var lightjosn = deviceList.Find((device) => + device.spk == SPK.LightSwitch + || device.spk == SPK.LightDimming + || device.spk == SPK.LightCCT + || device.spk == SPK.LightRGB + || device.spk == SPK.LightRGBW); if (lightjosn != null) { deviceStrTypeList.Add(Language.StringByID(StringId.Lights)); } - var curtainjosn = deviceList.Find((device) => device.functionType ==FunctionType.Curtain|| device.functionType == FunctionType.TrietexCurtain|| device.functionType == FunctionType.RollerCurtain); + var curtainjosn = deviceList.Find((device) => + device.spk == SPK.CurtainSwitch + || device.spk == SPK.CurtainTrietex + || device.spk == SPK.CurtainRoller); if (curtainjosn != null) { deviceStrTypeList.Add(Language.StringByID(StringId.Curtain)); } - var ac = deviceList.Find((device) => device.functionType == FunctionType.AC); + var ac = deviceList.Find((device) => device.spk == SPK.AcStandard); if (ac != null) { deviceStrTypeList.Add(Language.StringByID(StringId.AC)); } - var floorHeating = deviceList.Find((device) => device.functionType == FunctionType.FloorHeating); - if (ac != null) + var floorHeating = deviceList.Find((device) => device.spk == SPK.FloorHeatStandard); + if (floorHeating != null) { deviceStrTypeList.Add(Language.StringByID(StringId.FloorHeating)); + } + var sensor = deviceList.Find((device) => + device.spk == SPK.SensorWater + || device.spk == SPK.SensorGas + || device.spk == SPK.SensorSmoke + || device.spk == SPK.SensorDryContact + || device.spk == SPK.SensorShanLan + || device.spk == SPK.SensorDuiShe + || device.spk == SPK.SensorPir + || device.spk == SPK.SensorDoorWindow + || device.spk == SPK.SensoruUtrasonic + || device.spk == SPK.SenesorMegahealth + ); + if (sensor != null) + { + deviceStrTypeList.Add(Language.StringByID(StringId.Sensor)); } return deviceStrTypeList; @@ -370,30 +380,44 @@ /// </summary> /// <param name="deviceType">璁惧绫诲瀷(鐏厜绫伙紝绐楀笜绫汇��)</param> /// <returns></returns> - public static List<FunctionType> GetDeviceTypeFunctionList(string deviceType) + public static List<string> GetDeviceTypeFunctionList(string deviceType) { - List<FunctionType> functionTypeList = new List<FunctionType>(); + List<string> functionTypeList = new List<string>(); if (deviceType == Language.StringByID(StringId.Lights)) { - functionTypeList.Add(FunctionType.Relay); - functionTypeList.Add(FunctionType.Dimmer); - functionTypeList.Add(FunctionType.RGB); - functionTypeList.Add(FunctionType.RGBW); - functionTypeList.Add(FunctionType.CCT); + functionTypeList.Add(SPK.LightSwitch); + functionTypeList.Add(SPK.LightDimming); + functionTypeList.Add(SPK.LightRGB); + functionTypeList.Add(SPK.LightRGBW); + functionTypeList.Add(SPK.LightCCT); } else if (deviceType == Language.StringByID(StringId.Curtain)) { - functionTypeList.Add(FunctionType.Curtain); - functionTypeList.Add(FunctionType.RollerCurtain); - functionTypeList.Add(FunctionType.TrietexCurtain); + functionTypeList.Add(SPK.CurtainSwitch); + functionTypeList.Add(SPK.CurtainRoller); + functionTypeList.Add(SPK.CurtainTrietex); } else if (deviceType == Language.StringByID(StringId.AC)) { - functionTypeList.Add(FunctionType.AC); + functionTypeList.Add(SPK.AcStandard); } else if (deviceType == Language.StringByID(StringId.FloorHeating)) { - functionTypeList.Add(FunctionType.FloorHeating); + functionTypeList.Add(SPK.FloorHeatStandard); + } + else if (deviceType == Language.StringByID(StringId.Sensor)) + { + functionTypeList.Add(SPK.SensorSmoke); + functionTypeList.Add(SPK.SensorWater); + functionTypeList.Add(SPK.SensorGas); + functionTypeList.Add(SPK.SensorDryContact); + functionTypeList.Add(SPK.SensorShanLan); + functionTypeList.Add(SPK.SensorDuiShe); + functionTypeList.Add(SPK.SensorPir); + functionTypeList.Add(SPK.SensorDoorWindow); + functionTypeList.Add(SPK.SensoruUtrasonic); + functionTypeList.Add(SPK.SenesorMegahealth); + } return functionTypeList; @@ -402,57 +426,73 @@ /// 鏉′欢/鐩爣鏀寔璁惧 /// </summary> /// <returns></returns> - public static List<FunctionType> GetSupportEquipment(string if_type) + public static List<string> GetSupportEquipment(string if_type) { - List<FunctionType> deviceTypeList = new List<FunctionType>(); - switch (if_type) { - case condition_if: { - deviceTypeList.Add(FunctionType.Relay); - deviceTypeList.Add(FunctionType.RGB); - deviceTypeList.Add(FunctionType.RGBW); - deviceTypeList.Add(FunctionType.Dimmer); - deviceTypeList.Add(FunctionType.CCT); - deviceTypeList.Add(FunctionType.Curtain); - deviceTypeList.Add(FunctionType.RollerCurtain); - deviceTypeList.Add(FunctionType.TrietexCurtain); - deviceTypeList.Add(FunctionType.AC); - deviceTypeList.Add(FunctionType.FloorHeating); + List<string> deviceTypeList = new List<string>(); + switch (if_type) + { + case condition_if: + { + deviceTypeList.Add(SPK.LightSwitch); + deviceTypeList.Add(SPK.LightRGB); + deviceTypeList.Add(SPK.LightRGBW); + deviceTypeList.Add(SPK.LightDimming); + deviceTypeList.Add(SPK.LightCCT); + deviceTypeList.Add(SPK.CurtainSwitch); + deviceTypeList.Add(SPK.CurtainRoller); + deviceTypeList.Add(SPK.CurtainTrietex); + deviceTypeList.Add(SPK.AcStandard); + deviceTypeList.Add(SPK.FloorHeatStandard); + deviceTypeList.Add(SPK.SensorSmoke); + deviceTypeList.Add(SPK.SensorWater); + deviceTypeList.Add(SPK.SensorGas); + deviceTypeList.Add(SPK.SensorDryContact); + deviceTypeList.Add(SPK.SensorShanLan); + deviceTypeList.Add(SPK.SensorDuiShe); + deviceTypeList.Add(SPK.SensorPir); + deviceTypeList.Add(SPK.SensorDoorWindow); + deviceTypeList.Add(SPK.SensoruUtrasonic); + deviceTypeList.Add(SPK.SenesorMegahealth); } break; case target_if: { - deviceTypeList.Add(FunctionType.Relay); - deviceTypeList.Add(FunctionType.RGB); - deviceTypeList.Add(FunctionType.RGBW); - deviceTypeList.Add(FunctionType.Dimmer); - deviceTypeList.Add(FunctionType.CCT); - deviceTypeList.Add(FunctionType.Curtain); - deviceTypeList.Add(FunctionType.RollerCurtain); - deviceTypeList.Add(FunctionType.TrietexCurtain); - deviceTypeList.Add(FunctionType.AC); - deviceTypeList.Add(FunctionType.FloorHeating); + deviceTypeList.Add(SPK.LightSwitch); + deviceTypeList.Add(SPK.LightRGB); + deviceTypeList.Add(SPK.LightRGBW); + deviceTypeList.Add(SPK.LightDimming); + deviceTypeList.Add(SPK.LightCCT); + deviceTypeList.Add(SPK.CurtainSwitch); + deviceTypeList.Add(SPK.CurtainRoller); + deviceTypeList.Add(SPK.CurtainTrietex); + deviceTypeList.Add(SPK.AcStandard); + deviceTypeList.Add(SPK.FloorHeatStandard); } break; } return deviceTypeList; } + #endregion /// <summary> /// 鏄剧ず鐨勮澶囧垪琛� /// </summary> /// <param name="functionType">婧愭暟鎹垪琛�1</param> /// <param name="deviceList">婧愭暟鎹垪琛�2</param> /// <returns></returns> - public static List<Entity.Function> GetShowDeviceList(List<FunctionType> functionType, List<HDL_ON.Entity.Function> deviceList) + public static List<Entity.Function> GetShowDeviceList(List<string> functionType, List<HDL_ON.Entity.Function> deviceList) { List<HDL_ON.Entity.Function> devList = new List<Entity.Function>(); - foreach (var dev in deviceList) + for (int i = 0; i < deviceList.Count; i++) { - if (functionType.Contains(dev.functionType)) + var dev = deviceList[i]; + //杩囨护鎺変笉闇�瑕佹樉绀虹殑璁惧 + if (functionType.Contains(dev.spk)) { - ///杩囨护鎺変笉闇�瑕佹樉绀虹殑璁惧 devList.Add(dev); } + } + return devList; } /// <summary> @@ -463,12 +503,46 @@ /// <returns></returns> public static List<Entity.Function> GetFunctionDeviceList(Entity.Room room, string str) { - List<FunctionType> functionTypeList = GetSupportEquipment(str); + List<string> functionTypeList = GetSupportEquipment(str); //杩斿洖鎴块棿璁惧鍒楄〃 var roomDeviceList = GetRoomDevice(room); //杩斿洖鏈�缁堟敮鎸佹樉绀哄嚭鏉ョ殑璁惧鍒楄〃 var list = GetShowDeviceList(functionTypeList, roomDeviceList); return list; } + /// <summary> + /// 缃戝叧ID(鑾峰彇鍢変箰缃戝叧ID) + /// </summary> + public static string GatewayId + { + get + { + if (Entity.DB_ResidenceData.Instance.HomeGateway == null) + { + return DriverLayer.Control.Ins.GatewayId; + } + return Entity.DB_ResidenceData.Instance.HomeGateway.gatewayId; + } + } + /// <summary> + /// 浣忓畢ID + /// </summary> + public static string HomeId + { + get + { + return Entity.DB_ResidenceData.Instance.CurrentRegion.id; + } + } + /// <summary> + /// 鏄惁涓哄叾浠栦富鐢ㄦ埛鍒嗕韩杩囨潵鐨勪綇瀹� + /// </summary> + public static bool IsOthreShare + { + get + { + return Entity.DB_ResidenceData.Instance.CurrentRegion.isOtherShare; + } + } } } -- Gitblit v1.8.0