优化调整定位经纬度

ccharlesren · ccharlesren · commit 8df0be6aa222 · 2021-03-04T16:52:31.000+08:00
Tapd: http://tapd.oa.com/NEW_IOT/prong/stories/view/1020393192859911107?url_cache_key=a0791f381590f6254135cb9abb1f42a7&action_entry_type=stories Change-Id: I7f4381847fb29893d6395b3c79690dd9acc4ea9d
diff --git a/Source/LinkApp/Classes/Module/Home/Controller/TIoTHomeViewController.m b/Source/LinkApp/Classes/Module/Home/Controller/TIoTHomeViewController.m
@@ -609,7 +609,22 @@ - (void)getFamilyInfoAddressWithFamilyID:(NSString *)currentFamilyId {
         
         NSString *addressString = responseObject[@"Data"][@"Address"]?:@"";
         
-        [self getFamilyLocationWith:addressString];
+        NSDictionary *dic =  [NSString jsonToObject:addressString?:@""];
+        if (dic != nil) {
+            double lat = [dic[@"latitude"] doubleValue];
+            double lng = [dic[@"longitude"] doubleValue];
+            
+            self.latitude = lat;
+            self.longitude = lng;
+            
+            //请求天气数据
+            [self requestWeatherData];
+            
+        }else {
+            [self getFamilyLocationWith:addressString];
+        }
+        
+        
         
     } failure:^(NSString *reason, NSError *error, NSDictionary *dic) {
         
diff --git a/Source/LinkApp/Classes/Module/Map/Controller/TIoTMapVC.h b/Source/LinkApp/Classes/Module/Map/Controller/TIoTMapVC.h
@@ -9,7 +9,7 @@
 #import "TIoTBaseMapViewController.h"
 
 NS_ASSUME_NONNULL_BEGIN
-typedef void(^TIoTMapAddrssParseBlock)(NSString *address);
+typedef void(^TIoTMapAddrssParseBlock)(NSString *address, NSString *addressJson);
 
 @interface TIoTMapVC : TIoTBaseMapViewController
 @property (nonatomic, strong) NSString *addressString;
diff --git a/Source/LinkApp/Classes/Module/Map/Controller/TIoTMapVC.m b/Source/LinkApp/Classes/Module/Map/Controller/TIoTMapVC.m
@@ -102,26 +102,44 @@ - (void)setupPointAnnotation {
 }
 
 - (void)setupHavedLocation {
-    TIoTAppConfigModel *model = [TIoTAppConfig loadLocalConfigList];
-    
-    NSString *urlString = [NSString stringWithFormat:@"%@%@&key=%@",MapSDKAddressParseURL,self.addressString?:@"",model.TencentMapSDKValue];
     
-    NSString *urlEncoded = [urlString stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLFragmentAllowedCharacterSet]];
-    [[TIoTRequestObject shared] get:urlEncoded isNormalRequest:YES success:^(id responseObject) {
-        TIoTAddressParseModel *addressModel = [TIoTAddressParseModel yy_modelWithJSON:responseObject[@"result"]];
+    NSDictionary *addJsonDic =  [NSString jsonToObject:self.addressString?:@""];
+    if (addJsonDic != nil) {
+        double lat = [addJsonDic[@"latitude"] doubleValue];
+        double lng = [addJsonDic[@"longitude"] doubleValue];
         
-        CLLocationCoordinate2D addressLocation = CLLocationCoordinate2DMake(addressModel.location.lat,addressModel.location.lng);
+        CLLocationCoordinate2D addressLocation = CLLocationCoordinate2DMake(lat,lng);
         
         //定位大头针
         [self.mapView setCenterCoordinate:addressLocation];
         
         //刷新地点列表
         [self resetRequestPragma];
         [self requestLocationList:addressLocation];
+    }else {
+        TIoTAppConfigModel *model = [TIoTAppConfig loadLocalConfigList];
         
-    } failure:^(NSString *reason, NSError *error, NSDictionary *dic) {
+        NSString *urlString = [NSString stringWithFormat:@"%@%@&key=%@",MapSDKAddressParseURL,self.addressString?:@"",model.TencentMapSDKValue];
         
-    }];
+        NSString *urlEncoded = [urlString stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLFragmentAllowedCharacterSet]];
+        [[TIoTRequestObject shared] get:urlEncoded isNormalRequest:YES success:^(id responseObject) {
+            TIoTAddressParseModel *addressModel = [TIoTAddressParseModel yy_modelWithJSON:responseObject[@"result"]];
+            
+            CLLocationCoordinate2D addressLocation = CLLocationCoordinate2DMake(addressModel.location.lat,addressModel.location.lng);
+            
+            //定位大头针
+            [self.mapView setCenterCoordinate:addressLocation];
+            
+            //刷新地点列表
+            [self resetRequestPragma];
+            [self requestLocationList:addressLocation];
+            
+        } failure:^(NSString *reason, NSError *error, NSDictionary *dic) {
+            
+        }];
+    }
+    
+    
 }
 
 - (void)setupBottomView {
@@ -615,8 +633,14 @@ - (TIoTIntelligentBottomActionView *)bottomActionView  {
             if (weakSelf.addressBlcok) {
                 if (weakSelf.selectedIndex>=0) {
                     TIoTPoisModel *cellModel = weakSelf.searchResultArray[weakSelf.selectedIndex];
-                    NSString *addressString = [NSString stringWithFormat:@"%@%@%@%@",cellModel.ad_info.province?:@"",cellModel.ad_info.city?:@"",cellModel.ad_info.district?:@"",cellModel.address?:@""];
-                    weakSelf.addressBlcok(addressString);
+                    NSString *addressString = cellModel.title?:@"";
+                    NSString *addressDetail = [NSString stringWithFormat:@"%@%@%@%@",cellModel.ad_info.province?:@"",cellModel.ad_info.city?:@"",cellModel.ad_info.district?:@"",cellModel.address?:@""];
+                    NSString *lat = [NSString stringWithFormat:@"%f",cellModel.location.lat];
+                    NSString *lng = [NSString stringWithFormat:@"%f",cellModel.location.lng];
+                    NSDictionary *addressDic = @{@"address":addressDetail,@"latitude":lat,@"longitude":lng,@"city":cellModel.ad_info.city?:@"",@"name":cellModel.ad_info.name?:@"",@"title":addressString};
+                    
+                    NSString *addressJson = [addressDic yy_modelToJSONString];
+                    weakSelf.addressBlcok(addressString, addressJson);
                 }
             }
             [weakSelf.navigationController popViewControllerAnimated:YES];
diff --git a/Source/LinkApp/Classes/Module/Mine/Controller/Family/TIoTAddFamilyVC.m b/Source/LinkApp/Classes/Module/Mine/Controller/Family/TIoTAddFamilyVC.m
@@ -116,9 +116,10 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
         NSMutableDictionary *addressDictionary = self.dataArray[indexPath.row];
         mapVC.addressString = addressDictionary[@"value"];
         __weak typeof(self)weakSelf = self;
-        mapVC.addressBlcok = ^(NSString * _Nonnull address) {
+        mapVC.addressBlcok = ^(NSString * _Nonnull address, NSString * _Nonnull addressJson) {
             NSMutableDictionary *addressDic = weakSelf.dataArray[indexPath.row];
             [addressDic setValue:address forKey:@"value"];
+            [addressDic setValue:addressJson forKey:@"addressJson"];
             [weakSelf.dataArray replaceObjectAtIndex:indexPath.row withObject:addressDic];
             TIoTAddFamilyCell *cell = [tableView cellForRowAtIndexPath:indexPath];
             cell.contentLabel.text = address;
@@ -145,7 +146,7 @@ - (UITableView *)tableView {
 - (NSMutableArray *)dataArray {
     if (!_dataArray) {
         _dataArray = [NSMutableArray arrayWithArray:@[[NSMutableDictionary dictionaryWithDictionary:@{@"title":NSLocalizedString(@"family_name", @"家庭名称"),@"value":@"",@"placeHold":NSLocalizedString(@"fill_family_name", @"请输入家庭名称")}],
-                                                      [NSMutableDictionary dictionaryWithDictionary:@{@"title":NSLocalizedString(@"family_address", @"家庭位置"),@"value":@"",@"placeHold":NSLocalizedString(@"setting_family_address", @"设置位置")}]]];
+                                                      [NSMutableDictionary dictionaryWithDictionary:@{@"title":NSLocalizedString(@"family_address", @"家庭位置"),@"value":@"",@"placeHold":NSLocalizedString(@"setting_family_address", @"设置位置"),@"addressJson":@""}]]];
     }
     return _dataArray;
 }
diff --git a/Source/LinkApp/Classes/Module/Mine/Controller/Family/TIoTFamilyInfoVC.m b/Source/LinkApp/Classes/Module/Mine/Controller/Family/TIoTFamilyInfoVC.m
@@ -65,7 +65,11 @@ - (void)getFamilyInfo {
         NSMutableDictionary *addressDic = self.dataArr[0][2];
         NSString *addressString = responseObject[@"Data"][@"Address"]?:@"";
         if (![NSString isNullOrNilWithObject:addressString]) {
-            [addressDic setValue:responseObject[@"Data"][@"Address"] forKey:@"name"];
+            
+            NSDictionary *addDic = [NSString jsonToObject:addressString];
+            
+            [addressDic setValue:addDic[@"title"]?:@"" forKey:@"name"];
+            [addressDic setValue:addressString forKey:@"addresJson"];
         }
         //刷新
         [self.coll reloadData];
@@ -125,16 +129,28 @@ - (void)leaveFamily
     }];
 }
 
-- (void)modifyFamily:(NSString *)name adddress:(NSString *)address
+- (void)modifyFamily:(NSString *)name addressTitle:(NSString *)title isModifyAddrss:(BOOL)modifyAdd addJson:(NSString *)addJson
 {
-    NSDictionary *param = @{@"FamilyId":self.familyInfo[@"FamilyId"],@"Name":name,@"Address":address};
+    NSDictionary *param = nil;
+    
+    if (modifyAdd == NO) {
+        param = @{@"FamilyId":self.familyInfo[@"FamilyId"],@"Name":name};
+    }else {
+        param = @{@"FamilyId":self.familyInfo[@"FamilyId"],@"Name":name,@"Address":addJson};
+    }
+    
     [[TIoTRequestObject shared] post:AppModifyFamily Param:param success:^(id responseObject) {
         
         [HXYNotice addUpdateFamilyListPost];
         
         NSMutableDictionary *dic = self.dataArr[0][0];
         [dic setValue:name forKey:@"name"];
-        [self.coll reloadItemsAtIndexPaths:@[[NSIndexPath indexPathForItem:0 inSection:0]]];
+        
+        NSMutableDictionary *tempDic = self.dataArr[0][2];
+        [tempDic setValue:title forKey:@"name"];
+        [tempDic setValue:addJson forKey:@"addresJson"];
+        
+        [self.coll reloadData];
     } failure:^(NSString *reason, NSError *error,NSDictionary *dic) {
         
     }];
@@ -291,7 +307,7 @@ - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPa
                     modifyNameVC.modifyNameBlock = ^(NSString * _Nonnull name) {
                         NSMutableDictionary *addressDic = self.dataArr[0][2];
                         if (name.length > 0) {
-                            [self modifyFamily:name adddress:addressDic[@"name"]?:@""];
+                            [self modifyFamily:name addressTitle:addressDic[@"name"] isModifyAddrss:NO addJson:@""];
                         }
                         
                     };
@@ -313,14 +329,14 @@ - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPa
                 NSMutableDictionary *addressDictionary = self.dataArr[0][2];
                 TIoTMapVC *mapVC = [[TIoTMapVC alloc]init];
                 mapVC.title = NSLocalizedString(@"choose_location", @"地图选点");
-                mapVC.addressString = addressDictionary[@"name"];
-                mapVC.addressBlcok = ^(NSString * _Nonnull address) {
+                mapVC.addressString = addressDictionary[@"addresJson"];
+                mapVC.addressBlcok = ^(NSString * _Nonnull address, NSString * _Nonnull addressJson) {
                     NSMutableDictionary *addressDic = self.dataArr[0][2];
                     [addressDic setValue:address forKey:@"name"];
                     [self.coll reloadItemsAtIndexPaths:@[indexPath]];
                     
                     NSMutableDictionary *nameDic = self.dataArr[0][0];
-                    [self modifyFamily:nameDic[@"name"]?:@"" adddress:address?:@""];
+                    [self modifyFamily:nameDic[@"name"]?:@"" addressTitle:address isModifyAddrss:YES addJson:addressJson?:@""];
                     
                 };
                 [self.navigationController pushViewController:mapVC animated:YES];
@@ -400,7 +416,7 @@ - (NSMutableArray *)dataArr
         NSMutableArray *firstSection = [NSMutableArray array];
         [firstSection addObject:[NSMutableDictionary dictionaryWithDictionary:@{@"title":NSLocalizedString(@"family_name", @"家庭名称"),@"name":self.familyInfo[@"FamilyName"],@"Role":self.familyInfo[@"Role"]?:@""}]];
         [firstSection addObject:[NSMutableDictionary dictionaryWithDictionary:@{@"title":NSLocalizedString(@"room_manager", @"房间管理"),@"name":@"",@"RoomCount":@"",@"Role":@"1"}]];
-        [firstSection addObject:[NSMutableDictionary dictionaryWithDictionary:@{@"title":NSLocalizedString(@"family_location", @"家庭位置"),@"name":NSLocalizedString(@"setting_family_address", @"设置位置")}]];
+        [firstSection addObject:[NSMutableDictionary dictionaryWithDictionary:@{@"title":NSLocalizedString(@"family_location", @"家庭位置"),@"name":NSLocalizedString(@"setting_family_address", @"设置位置"),@"addresJson":@""}]];
          
         if ([self.familyInfo[@"Role"] integerValue] == 1) {
             [firstSection addObject:[NSMutableDictionary dictionaryWithDictionary:@{@"title":NSLocalizedString(@"invite_family_member", @"邀请家庭成员"),@"name":@""}]];
diff --git a/Source/LinkApp/Supporting Files/app-config.json b/Source/LinkApp/Supporting Files/app-config.json
@@ -6,6 +6,6 @@
     "XgAccessKey": "IA2MA3SNYWF5",
     "XgUSAAccessId": "1630001536",
     "XgUSAAccessKey": "ISH1Z2BMPTAB",
-    "TencentMapSDKValue": "",
+    "TencentMapSDKValue": "ZV6BZ-3ATCP-5BZDE-VFIJI-I7NO6-TIBAG",
     "HEweatherKey": ""
 }

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,6 @@`
`6`	`6`	`"XgAccessKey": "IA2MA3SNYWF5",`
`7`	`7`	`"XgUSAAccessId": "1630001536",`
`8`	`8`	`"XgUSAAccessKey": "ISH1Z2BMPTAB",`
`9`		`- "TencentMapSDKValue": "",`
	`9`	`+ "TencentMapSDKValue": "ZV6BZ-3ATCP-5BZDE-VFIJI-I7NO6-TIBAG",`
`10`	`10`	`"HEweatherKey": ""`
`11`	`11`	`}`