2020-01-12 1.优化修改。

JLChen

2020-01-12 ac2ee45fadc64fe840bbba6264df3ca4622adb15

 Crabtree/SmartHome/HDL/Operation/UserConfig.cs

@@ -156,7 +156,11 @@
                CheckIfNeedGetMasterAccountToken ();
            }
            get {
                if (currentRegion == null) {
                    currentRegion = new RegionInfoRes ();
                }
                return currentRegion;

            }

        }
@@ -213,23 +217,52 @@
                if (CheckHomeGateways ()) {
                    currentRegion.HomeGateways [0].GatewayUniqueId = value;
                } else {
                    if (currentRegion != null && currentRegion.HomeGateways == null) {
                    //2020-01-11 
                    if (currentRegion != null) {
                        var mHomeGateways = new HomeGateways () { GatewayUniqueId = value };
                        List<HomeGateways> HomeGateways = new List<HomeGateways> ();
                        HomeGateways.Add (mHomeGateways);
                        currentRegion.HomeGateways = HomeGateways;
                        var mList = new List<HomeGateways> ();
                        mList.Add (mHomeGateways);
                        currentRegion.HomeGateways = mList;
                    }
                }
            }

        }
        

        /// <summary>
        /// 更新设置当前住宅网关
        /// 2020-01-11 
        /// </summary>
        /// <param name="mGatewayDataList"></param>
        public void SetNowHomeGateways (List<GatewayRes> mGatewayDataList) {
            try {
                if (currentRegion != null) {
                    if (mGatewayDataList != null && mGatewayDataList.Count > 0) {
                        var mMacList = new List<HomeGateways> ();
                        foreach (var mGatewayRes in mGatewayDataList) {
                            var mac = new HomeGateways ();
                            mac.GatewayUniqueId = mGatewayRes.GatewayUniqueId;
                            mMacList.Add (mac);
                        }
                        currentRegion.HomeGateways = mMacList;
                    }
                }
            } catch {

            }
        }



        public List<string> RometoUserInfoKeys = new List<string> ();

        public string MasterAccountToken = "";
        public string MasterAccountRequestBaseUrl = "";

        /// <summary>
        /// 是否获取中
        /// 2020-01-11 
        /// </summary>
        bool bGetting = false;
        //public static List<string> LocalFiles = IO.FileUtils.ReadFiles ();
        /// <summary>
        /// 获取控制分享项目(住宅)请求信息
@@ -238,18 +271,19 @@
        /// <param name="mSharedHid"></param>
        public void CheckIfNeedGetMasterAccountToken ()
        {
            if (bGetting) return;

            //2020-01-08 判断是否分享过来的住宅
            if (CurrentRegion != null && CurrentRegion.IsOthreShare) {
            if (currentRegion != null && currentRegion.IsOthreShare) {
                //MainPage.IsAdministrator = UserConfig.Instance.CurrentRegion.IsOthreShare;
                //请求主账号token
                System.Threading.Tasks.Task.Run (() => {
                    try {
                        //var mMainAccountId = UserConfig.Instance.CurrentRegion.MainUserDistributedMark;
                        //var mSharedHid = UserConfig.Instance.CurrentRegion.Id;
                        bGetting = true;
                        var requestObj = new GetSharedHomeApiControlObj () {
                            LoginAccessToken = MainPage.LoginUser.LoginTokenString,
                            MainAccountId = UserConfig.Instance.CurrentRegion.MainUserDistributedMark,
                            SharedHid = UserConfig.Instance.CurrentRegion.Id,
                            MainAccountId = currentRegion.MainUserDistributedMark,
                            SharedHid = currentRegion.Id,

                        };
                        var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject (requestObj);
@@ -263,6 +297,8 @@
                        }
                    } catch {

                    } finally {
                        bGetting = false;
                    }
                });
            }