Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-11-07 a4924de3136289d10cabbf2f61a228387d44ded7

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs

@@ -493,6 +493,15 @@
            dic["Fail"] = R.MyInternationalizationString.uOperationFailed;

            //账号不存在

            dic["AccountNoExists"] = R.MyInternationalizationString.uAccountNoExists;



            //更新用户头相

            keys = "ZigbeeUsers/UpdateHeadImage";

            dicMsg[keys] = new Dictionary<string, int>();

            dic = dicMsg[keys];

            //请求参数错误

            dic["ParameterOrEmpty"] = R.MyInternationalizationString.uParameterError;

            //确认密码不一致，请重新输入

            dic["NoLogin"] = R.MyInternationalizationString.uNoLogin;

        }



        /// <summary>

@@ -523,7 +532,7 @@
                //在册的Msg

                return Language.StringByID(dicMsg[requestName][statuCode]);

            }

            return "ERROR:NOT_DEFINE_MSG!";

            return "ERROR:" + statuCode;

        }

    }

}