新版本

黄学彪

2020-07-21 a41a96b555f3aabf243741352bded5f28cd0ced5

 ZigbeeApp/Shared/Common/Device.cs

old mode 100644
new mode 100755
@@ -2563,7 +2563,7 @@
        {

            if (this.dicDeviceModelIdEnum.ContainsKey(strKey) == false)

            {

                return null;

                return new DeviceNameContent();

            }

            return this.dicDeviceModelIdEnum[strKey];

        }

@@ -3178,18 +3178,18 @@
            System.IO.StreamReader streamReader = null;

            var listText = new List<string>();

            try

            {
#if iOS
                string textFile = Foundation.NSBundle.MainBundle.PathForResource("DeviceName.ini", null);
                streamReader = new System.IO.StreamReader(textFile, Encoding.UTF8);
            {

#if iOS

                string textFile = Foundation.NSBundle.MainBundle.PathForResource("DeviceName.ini", null);

                streamReader = new System.IO.StreamReader(textFile, Encoding.UTF8);

                string text;

                while ((text = streamReader.ReadLine()) != null)

                {

                    listText.Add(text.Trim());

                }

                return listText;
#endif
#if Android
                return listText;

#endif

#if Android

                var stream = Application.Activity.Assets.Open("DeviceName.ini");

                streamReader = new System.IO.StreamReader(stream, Encoding.UTF8);

                string text;

@@ -3217,10 +3217,10 @@
            }

        }



#endregion

        #endregion

    }



#region ■ 自定义设备类型_________________________

    #region ■ 自定义设备类型_________________________



    /// <summary>

    /// <para>设备的具体【设备类型】,变量名可以作为【设备类型】图片,这个值是瞎写的,没什么特殊意义</para>

@@ -3595,5 +3595,5 @@
        A干接点 = 16,

    }



#endregion

    #endregion

}