Sfoglia il codice sorgente

经纬度相关修改

zhengkun 4 anni fa
parent
commit
b5955ea3b3

+ 8 - 26
ios/JianYuIOS/JianYuIOS/BaseClass1/PrefixHeader.pch

@@ -166,45 +166,27 @@ _Pragma("clang diagnostic pop")\
 #import "iCloud.h"
 #import "iCloudManager.h"
 
-//#define kHost @"http://web-jydev-ws.jianyu360.cn/" //王山
 
-//#define kHost @"http://web-jydev-zyh.jianyu360.cn/" //张雨涵
+//#define kHost @"https://web-zyh.jydev.jianyu360.com/" //张雨涵
 
-//#define kHost @"http://web-jydev-wcj.jianyu360.cn/" //王传近
+//#define kHost @"https://web-ws.jydev.jianyu360.com/" //王山
 
-//#define kHost @"http://web-jydev-wky.jianyu360.cn/" //王凯悦
-
-//#define kHost @"http://web-jydev-zxl.jianyu360.cn/" //张鑫磊
-
-//#define kHost @"http://web-jydev-xzh.jianyu360.cn/" //徐志恒
-
-//#define kHost @"http://web-jydev-wh.jianyu360.cn/" //王hao
-
-//#define kHost @"https://web-yf.jydev.jianyu360.com/" //杨峰
-
-//#define kHost @"http://192.168.20.235:8081/dev/docs/"
-
-
-
-
-//#define kHost @"https://anti.jydev.jianyu360.com/"   //测试http
 
 //#define kHost @"https://app-jytest.jydev.jianyu360.com/"  //测试1
 
-#define kHost @"https://app2-jytest.jydev.jianyu360.com/"  //测试2
+//#define kHost @"https://app2-jytest.jydev.jianyu360.com/"  //测试2
 
-//#define kHost @"https://app-i2.jianyu360.com/"   //新正式
+#define kHost @"https://app-i1.jianyu360.cn"   //新正式
 
-//#define kHost @"https://app-i1.zhaobiao.info/"
 
 
 //测试
-#define OCRAPPID @"TIDAXUV9"
-#define LICENCE @"p78X6jCKNuDQkIOPNl8TNLbULoxMVDkf+gQM18uC0ZARhlA5Cjzk8SuUP+p43Vhr0aH+i/Jmxc8wzdnGdnlqiLCdRYTZYvR7oMol4AP534BxF9GMgqty0x4Hjf2d8usufYq6FT04EjMk9Mudcz0AGyBJGkgLCiKDZNNrCvXC9iGu6HjKkDlKWhcLFmMimw9NjpIBSVubmbZq9LI6yCTVVpJe934uUSpRX+4aGhH3x6M7Uv+aOz232qxVldLxSWeS+16IVVI+uoGILEgpTOLbdNGjtYxAI5X3GdyR9/ZXPHUKbSwNaJWj4svMDm+unKSvshPmZ9we28IzWx0ddxn22w=="
+//#define OCRAPPID @"TIDAXUV9"
+//#define LICENCE @"p78X6jCKNuDQkIOPNl8TNLbULoxMVDkf+gQM18uC0ZARhlA5Cjzk8SuUP+p43Vhr0aH+i/Jmxc8wzdnGdnlqiLCdRYTZYvR7oMol4AP534BxF9GMgqty0x4Hjf2d8usufYq6FT04EjMk9Mudcz0AGyBJGkgLCiKDZNNrCvXC9iGu6HjKkDlKWhcLFmMimw9NjpIBSVubmbZq9LI6yCTVVpJe934uUSpRX+4aGhH3x6M7Uv+aOz232qxVldLxSWeS+16IVVI+uoGILEgpTOLbdNGjtYxAI5X3GdyR9/ZXPHUKbSwNaJWj4svMDm+unKSvshPmZ9we28IzWx0ddxn22w=="
 
 //正式
-//#define OCRAPPID @"IDA24rmI"
-//#define LICENCE @"p78X6jCKNuDQkIOPNl8TNLbULoxMVDkf+gQM18uC0ZARhlA5Cjzk8SuUP+p43Vhr0aH+i/Jmxc8wzdnGdnlqiLCdRYTZYvR7oMol4AP534BxF9GMgqty0x4Hjf2d8usufYq6FT04EjMk9Mudcz0AGyBJGkgLCiKDZNNrCvXC9iG2cYczbyncMrpud8GaWP/O2BhbWuWeoCpqhfOM16agoAHKepGWdhhkZTDOaVPKUMmbaQ8I2dFlk9IfOrmqc1UFO+mni7bJ90T8NjjyOPbcKYtJPFwVjyGzTse9klfXuHgNealpJfvXrTnS85BNZcxYxVh+U3H58Bel+LRnFIVUag=="
+#define OCRAPPID @"IDA24rmI"
+#define LICENCE @"p78X6jCKNuDQkIOPNl8TNLbULoxMVDkf+gQM18uC0ZARhlA5Cjzk8SuUP+p43Vhr0aH+i/Jmxc8wzdnGdnlqiLCdRYTZYvR7oMol4AP534BxF9GMgqty0x4Hjf2d8usufYq6FT04EjMk9Mudcz0AGyBJGkgLCiKDZNNrCvXC9iG2cYczbyncMrpud8GaWP/O2BhbWuWeoCpqhfOM16agoAHKepGWdhhkZTDOaVPKUMmbaQ8I2dFlk9IfOrmqc1UFO+mni7bJ90T8NjjyOPbcKYtJPFwVjyGzTse9klfXuHgNealpJfvXrTnS85BNZcxYxVh+U3H58Bel+LRnFIVUag=="
 
 
 

+ 32 - 1
ios/JianYuIOS/JianYuIOS/Classes(模块)/JYNewSearchViewController.m

@@ -30,6 +30,7 @@
 
 @property(nonatomic,strong)CLLocationManager *locaationManager;
 @property(nonatomic,strong)NSString *placeAdr;
+@property(nonatomic,strong)NSString *placeLli;
 @property(nonatomic,assign)BOOL isLocation;
 
 
@@ -85,7 +86,7 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
     return _clipboardView;
 }
 
-//进
+//进 
 - (UIProgressView *)progressView
 {
     if (_progressView == nil) {
@@ -422,6 +423,10 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
             NSDictionary *dict = @{@"type":@"string",
                                    @"value":[self jsGetLocation:paramdict]};
             completionHandler([self convertToJsonData:dict]);
+        }else if (type && [type isEqualToString:@"getLLitude"]) {
+            NSDictionary *dict = @{@"type":@"string",
+                                   @"value":[self jsGetLLitude:paramdict]};
+            completionHandler([self convertToJsonData:dict]);
         }else if (type && [type isEqualToString:@"readRight"]) {
             NSDictionary *dict = @{@"type":@"string",
                                    @"value":[self jsReadRight:paramdict]};
@@ -538,6 +543,7 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
     // Do any additional setup after loading the view.
     NSLog(@"首页初始化");
     self.placeAdr = [NSString new];
+    self.placeLli = [NSString new];
     self.view.backgroundColor = [UIColor whiteColor];
 
 
@@ -1144,6 +1150,28 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
     return self.placeAdr;
 }
 
+-(NSString *)jsGetLLitude:(NSDictionary *)dict {
+    NSLog(@"------开始调用获取经纬度:%@",self.placeLli);
+    if (!self.isLocation) {
+        if ([self checkLocationServiceIsEnabled]) {
+            [self createCLManager];
+            self.isLocation = YES; //只请求一次
+        }else{
+            NSLog(@"定位不可用");
+            self.isLocation = NO;
+        }
+    }
+    NSLog(@"即将返回经纬度信息-%@",self.placeLli);
+    if ([@"" isNotNULL:self.placeLli]&&self.placeLli.length>0&&[self.placeLli isKindOfClass:[NSString class]]) {
+        
+    }else {
+        self.placeLli = @"";
+    }
+    return self.placeLli;
+}
+
+
+
 
 -(void)jsChooseTab:(NSDictionary *)dict {
     NSInteger indexTab = [dict[@"indexTab"] integerValue];
@@ -1753,6 +1781,9 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
     if (newLocation.horizontalAccuracy < 0) {
         return;
     }
+    self.placeLli = [NSString stringWithFormat:@"%f_%f",newLocation.coordinate.longitude,newLocation.coordinate.latitude];
+    NSLog(@"回调经纬度:%@",self.placeLli);
+    
     CLGeocoder *geocoder = [[CLGeocoder alloc] init];
     [geocoder reverseGeocodeLocation:newLocation completionHandler:^(NSArray *placemarks, NSError *error) {
         for (CLPlacemark *placeMark in placemarks) {