合并了IOS的代码

hxb

2022-08-30 25429f085093d89d543a0b90e30d0d62d1b7dac9

 ZigbeeApp/Shared/Common/SendDataToServer.cs

old mode 100755
new mode 100644
@@ -185,6 +185,10 @@
        public class LoginObj
        {
            /// <summary>
            /// RequestVersion
            /// </summary>
            public string RequestVersion = CommonPage.RequestVersion;
            /// <summary>
            /// 用户账户
            /// </summary>
            public string Account;
@@ -193,15 +197,10 @@
            /// </summary>
            public string Password;
            /// <summary>
            /// 登录来源,主要是为了区分此次登录是来源OnApp还是Zigbee App
            /// 默认值: null
            /// 登录来源,0:Zigbee
            /// </summary>
            public string Source;
            /// <summary>
            /// Company 公司编号(0:HDL短信验证码 1:短信控制 2:酒店控制 3:忘记密码 100:安捷嘉 101:想天 102:安百纳 103:首城珑玺)
            /// 默认值: 0
            /// </summary>
            public int Company;
            public string RequestSource = "0";

        }
        #endregion

@@ -226,8 +225,8 @@
            ///第三方用户唯一标识
            /// </summary>
            public string OpenID;
            /// <summary>

            /// 用户昵称

            /// <summary>
            /// 用户昵称
            /// </summary>
            public string UserName;
        }
@@ -576,6 +575,10 @@
            /// 请填入设备的类型，只能为【iphone】和【android】
            /// </summary>
            public string DeviceType;
            /// <summary>
            /// 3：Evoyo Home
            /// </summary>
            public int Software = 3;
        }
        #endregion

@@ -596,5 +599,80 @@
        }
        #endregion


        /// <summary>
        /// 极光推送消息
        /// </summary>
        [System.Serializable]
        public class JPushMessageInfo
        {
            /// <summary>
            /// 住宅ID
            /// </summary>
            public string HomeId;
            /// <summary>
            /// 推送标题
            /// </summary>
            public string Title;
            /// <summary>
            /// 推送内容
            /// </summary>
            public string Content;
            /// <summary>
            /// 推送附加数据
            /// </summary>
            public string Extras;
            /// <summary>
            /// 信息类型
            /// </summary>
            public string messageType = "";
            /// <summary>
            /// 扩展数据内容
            /// </summary>
            public string expantContent = "";
            /// <summary>
            /// spk标志，值为door.gate时表示自研
            /// </summary>
            public string spk = "";
            /// <summary>
            /// sip账号
            /// </summary>
            public string sipAccount;

        }

        /// <summary>
        /// 极光推送消息
        /// </summary>
        [System.Serializable]
        public class JPushExpandData
        {
            /// <summary>
            /// 附加内容
            /// </summary>
            public string expandData;

        }

        /// <summary>
        /// 极光推送消息
        /// </summary>
        [System.Serializable]
        public class ExpandData
        {
            /// <summary>
            /// 住宅ID
            /// </summary>
            public string homeId;
            /// <summary>
            /// 附加内容
            /// </summary>
            public string expantContent;
            /// <summary>
            ///  信息类型
            /// </summary>
            public string messageType;
        }

    }
}