合并了全部的代码

黄学彪

2019-11-04 c7698e163e43cea9e7f8ee45f8e3f91c9265cca4

 ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlManualBackUpForm.cs

@@ -411,7 +411,7 @@
        {

            List<string> listAllFile = Global.FileListByHomeId();



            string strroot = UserCenterResourse.LocalRootPath;

            string strroot = Common.Config.Instance.FullPath;

            string autoPath = System.IO.Path.Combine(strroot, DirNameResourse.LocalMemoryDirectory, DirNameResourse.AutoBackupDirectory);

            foreach (string file in listAllFile)

            {

@@ -440,6 +440,18 @@
                this.ShowMassage(ShowMsgType.Error, msg);

                return false;

            }

            if (backName.Contains("##") == true)

            {

                //存在非法字符「##」

                string msg = Language.StringByID(R.MyInternationalizationString.uErrorFieldIsEsixt);

                if (msg.Contains("{0}") == true)

                {

                    msg = string.Format(msg, "##");

                }

                this.ShowMassage(ShowMsgType.Error, msg);

                return false;

            }



            return true;

        }

        #endregion