2021-3-24-1

陈嘉乐

2021-03-24 62a6405035f4ef3557250c9f80fe90a103da4109

2021-3-24-1

 .vs/HDL_APP_Project/xs/UserPrefs.xml

@@ -1,21 +1,14 @@
<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/4-PersonalCenter/MyQRCodePage.cs">
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs">
    <Files>
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/BrandList.cs" Line="132" Column="58" IsPinned="True" />
      <File FileName="../../Application.cs" Line="16" Column="35" IsPinned="True" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/MyQRCodePage.cs" Line="131" Column="23" IsPinned="True" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs" Line="153" Column="113" IsPinned="True" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs" Line="16" Column="13" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/AddMiniRemoteControlDirection4Page.cs" Line="237" Column="71" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs" Line="527" Column="23" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs" Line="449" Column="22" />
      <File FileName="HDL_ON/Entity/Function/Function.cs" Line="1339" Column="31" />
      <File FileName="HDL-ON_Android/Application.cs" Line="365" Column="29" />
      <File FileName="HDL_ON/Common/HDLCommon.cs" Line="253" Column="72" />
      <File FileName="HDL-ON_iOS/AppDelegate.cs" Line="356" Column="53" />
      <File FileName="HDL-ON_Android/Other/JPush/JPushReceiver.cs" Line="27" Column="22" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/Buttons.cs" Line="17" Column="21" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs" Line="153" Column="113" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/MyQRCodePage.cs" Line="19" Column="1" />
      <File FileName="HDL-ON_Android/Scan.cs" Line="14" Column="59" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs" Line="9" Column="24" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
@@ -30,20 +23,27 @@
                <Node name="Function" expanded="True" />
              </Node>
              <Node name="UI" expanded="True">
                <Node name="UI0-Public" expanded="True" />
                <Node name="UI2" expanded="True">
                  <Node name="3-Intelligence" expanded="True">
                    <Node name="Automation" expanded="True">
                      <Node name="LogicView" expanded="True" />
                    </Node>
                  </Node>
                  <Node name="4-PersonalCenter" expanded="True">
                    <Node name="PirDevice" expanded="True">
                      <Node name="View" expanded="True" />
                      <Node name="Method.cs" selected="True" />
                    </Node>
                    <Node name="MyQRCodePage.cs" selected="True" />
                  </Node>
                </Node>
              </Node>
            </Node>
            <Node name="HDL-ON_Android" expanded="True">
              <Node name="Other" expanded="True">
                <Node name="JPush" expanded="True" />
              </Node>
              <Node name="Assets" expanded="True" />
            </Node>
            <Node name="HDL-ON_iOS" expanded="True">
              <Node name="Resources" expanded="True" />
            </Node>
          </Node>
        </State>

 HDL-ON_Android/Assets/Language.ini

@@ -1387,10 +1387,14 @@
6071=修改名字
6072=确认删除
6073=取消
6074=遥控器不能超过10个？
6074=遥控器不能超过10个
6075=遥控器所属区域:
6076=编辑信息
6077=版本升级
6078=系统维护中~请稍后再试~
6079=获取数据失败




6015=在线

 HDL-ON_iOS/Resources/Language.ini

@@ -1387,10 +1387,12 @@
6071=修改名字
6072=确认删除
6073=取消
6074=遥控器不能超过10个？
6074=遥控器不能超过10个
6075=遥控器所属区域:
6076=编辑信息
6077=版本升级
6078=系统维护中~请稍后再试~
6079=获取数据失败

6015=在线
6016=离线

 HDL_ON/Common/R.cs

@@ -868,6 +868,8 @@
        public const int yaokongqiquyu = 6075;
        public const int bianjixinxi = 6076;
        public const int banbenshengji = 6077;
        public const int xitongweihuzhong = 6078;
        public const int huoqushujushibao = 6079;




 HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs

@@ -502,7 +502,7 @@
            }
            else if (text == "读取红外宝列表失败")
            {
                str = "读取红外宝列表失败"; //Language.StringByID(StringId.delFail);
                str = Language.StringByID(StringId.huoqushujushibao);
            }
            else
            {
@@ -520,19 +520,19 @@
                            break;
                        case "10807":
                            {
                                str = "红外宝下遥控器超过最大(10个)数量限制";// Language.StringByID(StringId.gatewayNotOnline);
                                str = Language.StringByID(StringId.bunengchaoguo10);


                            }
                            break;
                        case "2":
                            {
                                str = "系统维护中~请稍后再试~";
                                str = Language.StringByID(StringId.xitongweihuzhong);
                            }
                            break;
                        default:
                            {
                                str ="获取数据失败" ;// Language.StringByID(StringId.saveFail);
                                str = Language.StringByID(StringId.huoqushujushibao);
                            }
                            break;