CrabtreeOn,印度客户定制APP,迁移2.0平台版本
JLChen
2021-01-13 8916de38960ffda9a9f9bf09ace9000f40de828d
2021-01-13 1.增加备份错误码翻译字段。
7个文件已修改
87 ■■■■■ 已修改文件
Crabtree/.vs/SmartHome/xs/UserPrefs.xml 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Crabtree/ON.Ios/Resources/Language.ini 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Crabtree/ON/Assets/Language.ini 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Crabtree/SmartHome/HDL/Common/HttpUtil/IMessageCommon.cs 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Crabtree/SmartHome/HDL/Operation/ResponseEntity/API.cs 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Crabtree/SmartHome/UI/SimpleControl/R.cs 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Crabtree/.vs/SmartHome/xs/UserPrefs.xml
@@ -1,35 +1,28 @@
<Properties StartupConfiguration="{9D9EF20B-6E65-4A65-92BF-567EBF1E1443}|Default">
  <MonoDevelop.Ide.ItemProperties.ON.Droid PreferredExecutionTarget="Android.4b65c4650918" />
  <MonoDevelop.Ide.Workbench ActiveDocument="ON/Application.cs">
<Properties StartupConfiguration="{1D83BF28-BA88-4152-BA41-D7EFE90A5437}|Default">
  <MonoDevelop.Ide.ItemProperties.ON.Droid PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
  <MonoDevelop.Ide.Workbench ActiveDocument="SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs">
    <Files>
      <File FileName="SmartHome/HDL/Operation/ResponseEntity/API.cs" Line="92" Column="34" />
      <File FileName="SmartHome/UI/SimpleControl/MqttCommon.cs" Line="831" Column="82" />
      <File FileName="SmartHome/HDL/Common/HttpUtil/HttpServerRequest.cs" Line="778" Column="60" />
      <File FileName="ON/Application.cs" Line="327" Column="28" />
      <File FileName="ON.Ios/AppDelegate.cs" Line="283" Column="20" />
      <File FileName="SmartHome/HDL/Operation/MyEnum.cs" Line="1510" Column="9" />
      <File FileName="SmartHome/HDL/Common/HttpUtil/IMessageCommon.cs" Line="16" Column="20" />
      <File FileName="SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs" Line="85" Column="54" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
        <State name="__root__">
          <Node name="SmartHome" expanded="True">
            <Node name="ON.Droid" expanded="True">
              <Node name="Application.cs" selected="True" />
            </Node>
            <Node name="ON.Ios" expanded="True" />
            <Node name="Shared" expanded="True">
              <Node name="DLL" expanded="True" />
              <Node name="HDL" expanded="True">
                <Node name="Common" expanded="True">
                  <Node name="HttpUtil" expanded="True" />
                </Node>
                <Node name="Operation" expanded="True">
                  <Node name="ResponseEntity" expanded="True" />
                </Node>
                <Node name="Operation" expanded="True" />
              </Node>
              <Node name="UI" expanded="True">
                <Node name="SimpleControl" expanded="True">
                  <Node name="Phone" expanded="True">
                    <Node name="Guide" expanded="True" />
                    <Node name="Register" expanded="True">
                      <Node name="AccountLogin.cs" selected="True" />
                    </Node>
                  </Node>
                </Node>
              </Node>
@@ -47,8 +40,8 @@
    <String>IosService/IosService.csproj</String>
    <String>DroidService/DroidService.csproj</String>
  </DisabledProjects>
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
  <MonoDevelop.Ide.ItemProperties.ON.Ios PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-00014C392121802E" />
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhoneSimulator" />
  <MonoDevelop.Ide.ItemProperties.ON.Ios PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.08FD445C-3EE8-4ED2-BF28-B42ADD0DA92C" />
  <MonoDevelop.Ide.DebuggingService.Breakpoints>
    <BreakpointStore />
  </MonoDevelop.Ide.DebuggingService.Breakpoints>
Crabtree/ON.Ios/Resources/Language.ini
@@ -1104,7 +1104,8 @@
20053=Gateway searched successfully, enable local connection.
20054=Gateway cannot be searched locally.
20055=Added successfully
20056=The backup folder does not exist.
20057=The backup file does not exist.
[Chinese]
1=你好
Crabtree/ON/Assets/Language.ini
@@ -1104,7 +1104,8 @@
20053=Gateway searched successfully, enable local connection.
20054=Gateway cannot be searched locally.
20055=Added successfully
20056=The backup folder does not exist.
20057=The backup file does not exist.
[Chinese]
1=你好
Crabtree/SmartHome/HDL/Common/HttpUtil/IMessageCommon.cs
@@ -175,6 +175,18 @@
            //自动化已存在
            stateCodeDic ["14502"] = MyInternationalizationString.AutomationAlreadyExists;
            //-------------------备份模块-------------------
            //备注名称已经存在,请更换后重试!文件夹名称已经存在
            stateCodeDic ["10601"] = SimpleControl.R.MyInternationalizationString.FileNamehasExisted;
            //备份文件夹不存在
            stateCodeDic ["10602"] = SimpleControl.R.MyInternationalizationString.FolderNoExist;
            //备份文件不存在
            stateCodeDic ["10603"] = SimpleControl.R.MyInternationalizationString.FileNoExist;
            //备份失败
            stateCodeDic ["10607"] = SimpleControl.R.MyInternationalizationString.FailedToBackupFile;
            //*********设备*********
            //设备目标重复
            stateCodeDic ["10801"] = MyInternationalizationString.DuplicateDeviceTarget;
Crabtree/SmartHome/HDL/Operation/ResponseEntity/API.cs
@@ -250,18 +250,18 @@
        #endregion
        #region EmqMqtt 部分
        //***************************EmqMqtt 部分********************************
        public static string API_EmqMqtt = "/EmqMqtt/";
        //public static string API_EmqMqtt = "/EmqMqtt/";
        /// <summary>
        ///  5.03 获取分享者Mqtt远程控制信息(Emq版本)
        /// </summary>
        public static string ShareMemberConnMqttInfo = API_EmqMqtt + "ShareMemberConnMqttInfo";
        ///// <summary>
        /////  5.03 获取分享者Mqtt远程控制信息(Emq版本)
        ///// </summary>
        //public static string ShareMemberConnMqttInfo = API_EmqMqtt + "ShareMemberConnMqttInfo";
        /// <summary>
        /// 客户端获取连接云端Mqtt信息
        /// Connection
        /// </summary>
        public static string GetConnMqttInfo = API_EmqMqtt + "GetConnMqttInfo";
        ///// <summary>
        ///// 客户端获取连接云端Mqtt信息
        ///// Connection
        ///// </summary>
        //public static string GetConnMqttInfo = API_EmqMqtt + "GetConnMqttInfo";
        #endregion
Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs
@@ -79,10 +79,10 @@
            //etAccount.Text = "721343314@qq.com";
            //etAccount.Text = "crabtreel12019@gmail.com";
            //etAccount.Text = "2791308028@qq.com";
            //etAccount.Text = "551775569@qq.com";
            etAccount.Text = "551775569@qq.com";
            //etAccount.Text = "18824864143";
            etAccount.Text = "cjl@hdlchina.com.cn";
            //etAccount.Text = "cjl@hdlchina.com.cn";
#endif
            accountView.AddChidren (etAccount);
@@ -135,8 +135,8 @@
                Text = password,
            };
#if DEBUG
            etPasswrod.Text = "123456";
            //etPasswrod.Text = "123456-Aa";
            //etPasswrod.Text = "123456";
            etPasswrod.Text = "123456-Aa";
#endif
            passwrodView.AddChidren (etPasswrod);
Crabtree/SmartHome/UI/SimpleControl/R.cs
@@ -1179,8 +1179,14 @@
        /// 添加成功
        /// </summary>
        public const int AddedSuccessfully = 20055;
        /// <summary>
        /// 备份文件夹不存在
        /// </summary>
        public const int FolderNoExist = 20056;
        /// <summary>
        /// 文件不存在
        /// </summary>
        public const int FileNoExist = 20057;