Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-11-07 a4924de3136289d10cabbf2f61a228387d44ded7

 ZigbeeApp/Shared/Phone/Device/Account/PhoneZone.cs

old mode 100755
new mode 100644
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using Shared.Common;
using Shared.Phone.UserCenter;

namespace Shared.Phone.Device.Account
{
@@ -131,6 +132,8 @@
            };
            AddChidren(phoneZoneDialog);

            var form = new AreaCodeSelectForm();


            phoneZoneSelectedShowView = new FrameLayout()
            {
                Height = Application.GetRealHeight(1342),