Merge branch 'develop'

# Conflicts:
#	.DS_Store
This commit is contained in:
一只会编程的狮子 2019-05-15 20:26:51 +08:00
commit f8056dbea2
617 changed files with 25959 additions and 9374 deletions

File diff suppressed because one or more lines are too long

BIN
Ifish/.DS_Store vendored

Binary file not shown.

View File

@ -8,8 +8,8 @@
#import <UIKit/UIKit.h>
//#import <RongIMKit/RongIMKit.h>
#import "Contact.h"//重新调整监控画面
//#import <GWP2P/GWP2P.h>
#define ap_address "192.168.1.1"
#define NET_WORK_CHANGE @"NET_WORK_CHANGE"
#import "Reachability.h"

View File

@ -41,9 +41,8 @@
#import "TalkingData.h"
#define TalkingDataAPPID @"351E6F7956CEF7FB6AABAEB64EF9BF18"
#define BMKMAP_APPKEY @"wYcF3YXqeepKfzruExLPn0eS"
#import <BaiduMapAPI_Map/BMKMapComponent.h>
//#import <BaiduMapAPI_Map/BMKMapComponent.h>
#import "Socketsingleton.h"
#import "CenterViewController.h"
#import <UMCommunitySDK/UMCommunitySDK.h>
#import <UMCommunitySDK/UMComSession.h>
#import <UMSocialCore/UMSocialCore.h>
@ -90,7 +89,7 @@ NSString *NTESNotificationLogout = @"NTESNotificationLogout";
//
#import <AlibcTradeSDK/AlibcTradeSDK.h>
#import "IfishADTimerViewController.h"
@interface AppDelegate ()<BMKGeneralDelegate,NIMLoginManagerDelegate>
@interface AppDelegate ()<NIMLoginManagerDelegate>
@property(nonatomic,strong)ICSDrawerController*ics;
@property(nonatomic)NSString*downloadAddress;
@ -238,13 +237,13 @@ NSString *NTESNotificationLogout = @"NTESNotificationLogout";
/**
*
*/
BMKMapManager*mapManager=[[BMKMapManager alloc]init];
BOOL ret=[mapManager start:BMKMAP_APPKEY generalDelegate:self];
if (!ret) {
NSLog(@"manager start failed!");
}
// BMKMapManager*mapManager=[[BMKMapManager alloc]init];
// BOOL ret=[mapManager start:BMKMAP_APPKEY generalDelegate:self];
// if (!ret) {
// NSLog(@"manager start failed!");
// }
//
//
/**
*
*/

Binary file not shown.

View File

@ -0,0 +1,6 @@
{
"info" : {
"version" : 1,
"author" : "xcode"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 44 KiB

View File

@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "501534908285_.pic.jpg",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

View File

@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "graybtn_big.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

View File

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

View File

@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "greenbtn_big.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

View File

Before

Width:  |  Height:  |  Size: 4.7 KiB

After

Width:  |  Height:  |  Size: 4.7 KiB

View File

@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "加热系统.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 224 KiB

View File

@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "容积图标.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 34 KiB

View File

@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "开关按钮.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 36 KiB

View File

@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "换水图标.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 36 KiB

View File

@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "摄像头.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 158 KiB

View File

@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "敬请期待.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 359 KiB

View File

@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "水族控制系统.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 157 KiB

View File

@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "流量标.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 33 KiB

View File

@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "温度图标.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 35 KiB

View File

@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "确定.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

View File

@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "箭头.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 33 KiB

View File

@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "虚线.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

View File

@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "请设置加热温度.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 55 KiB

View File

@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "请设置预警温度.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 48 KiB

View File

@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "走势图标.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 34 KiB

View File

@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "走势图背景.jpg",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 898 KiB

View File

@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "长宽.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 42 KiB

View File

@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "deletebtn_bg@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB

View File

@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "surebtn_bg.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB

View File

@ -0,0 +1,6 @@
{
"info" : {
"version" : 1,
"author" : "xcode"
}
}

View File

@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "dengguang_normal@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 36 KiB

View File

@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "dengguang_selected@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 34 KiB

View File

@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "huli_noraml@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 38 KiB

View File

@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "huli_selected@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB

View File

@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "jiare_normal@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

View File

@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "jiare_selected@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

View File

@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "right@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

View File

@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "shajun_normal@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 35 KiB

View File

@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "shajun_selected@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB

View File

@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "xuanduo_bg@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 MiB

View File

@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "xunhuan_noraml.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 38 KiB

View File

@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "xunhuan_selected@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

View File

@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "zaolang_normal@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 33 KiB

View File

@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "zaolang_selectd@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB

View File

@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "zengyang_noraml.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 34 KiB

View File

@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "zengyang_selected@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

View File

@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "走势图.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 35 KiB

Binary file not shown.

Binary file not shown.

View File

@ -1,13 +0,0 @@
//
// BaseComponent.h
// BaseComponent
//
// Created by baidu on 14-3-17.
// Copyright (c) 2014年 baidu. All rights reserved.
//
#import "BMKGeneralDelegate.h"
#import "BMKMapManager.h"
#import "BMKTypes.h"
#import "BMKUserLocation.h"
#import "BMKVersion.h"

View File

@ -1,24 +0,0 @@
//
// BMKGeneralDelegate.h
// BMapKit
//
// Copyright 2011 Baidu Inc. All rights reserved.
//
#import <Foundation/Foundation.h>
///通知Delegate
@protocol BMKGeneralDelegate <NSObject>
@optional
/**
*
*@param iError
*/
- (void)onGetNetworkState:(int)iError;
/**
*
*@param iError : 0BMKPermissionCheckResultCode
*/
- (void)onGetPermissionState:(int)iError;
@end

View File

@ -1,76 +0,0 @@
/*
* BMKMapManager.h
* BMapKit
*
* Copyright 2011 Baidu Inc. All rights reserved.
*
*/
#import "BMKGeneralDelegate.h"
#import <UIKit/UIKit.h>
#import "BMKTypes.h"
enum EN_PERMISSION_STATUS
{
E_PERMISSION_OK = 0, // 授权验证通过
E_PERMISSION_SERVER_ERROR = -200, //服务端数据错误,无法解析服务端返回数据
E_PERMISSION_NETWORK_ERROR = -300, //无法建立与服务端的连接
};
//地图模块枚举
typedef enum {
BMKMapModuleTile = 0, //瓦片图模块
}BMKMapModule;
///主引擎类
@interface BMKMapManager : NSObject
/**
*SDK所有接口均支持百度坐标BD09LLGCJ02使.
*BD09LLBMK_COORDTYPE_BD09LL.
*使GCJ02坐标CoordinateType为BMK_COORDTYPE_COMMON.
*/
+ (BOOL)setCoordinateTypeUsedInBaiduMapSDK:(BMK_COORD_TYPE) coorType;
/**
*SDK当前使用的经纬度类型
*@return
*/
+ (BMK_COORD_TYPE)getCoordinateTypeUsedInBaiduMapSDK;
/**
*loglog
*debug时release时建议关闭
*@param enable
*@param mapModule
*/
+ (void)logEnable:(BOOL) enable module:(BMKMapModule) mapModule;
/**
*
*@param key key
*@param delegate
*/
-(BOOL)start:(NSString*)key generalDelegate:(id<BMKGeneralDelegate>)delegate;
/**
*线,
*/
-(int)getTotalSendFlaxLength;
/**
*线,
*/
-(int)getTotalRecvFlaxLength;
/**
*
*/
-(BOOL)stop;
@end

View File

@ -1,184 +0,0 @@
//
// BMKType.h
// MapPlatform
//
// Created by BaiduMapAPI on 13-3-26.
// Copyright (c) 2013年 baidu. All rights reserved.
//
#import <CoreGraphics/CoreGraphics.h>
#import <CoreLocation/CoreLocation.h>
#import <UIKit/UIKit.h>
typedef enum
{
BMK_COORDTYPE_GPS = 0, ///GPS设备采集的原始GPS坐标WGS-84
BMK_COORDTYPE_COMMON, ///GCJ坐标google地图、soso地图、aliyun地图、mapabc地图和amap地图所用坐标
BMK_COORDTYPE_BD09LL, ///bd09ll 百度经纬度坐标
} BMK_COORD_TYPE;
enum {
BMKMapTypeNone = 0, ///< 空白地图
BMKMapTypeStandard = 1, ///< 标准地图
BMKMapTypeSatellite = 2, ///< 卫星地图
};
typedef NSUInteger BMKMapType;
typedef enum {
BMKErrorOk = 0, ///< 正确,无错误
BMKErrorConnect = 2, ///< 网络连接错误
BMKErrorData = 3, ///< 数据错误
BMKErrorRouteAddr = 4, ///<起点或终点选择(有歧义)
BMKErrorResultNotFound = 100, ///< 搜索结果未找到
BMKErrorLocationFailed = 200, ///< 定位失败
BMKErrorPermissionCheckFailure = 300, ///< 百度地图API授权Key验证失败
BMKErrorParse = 310 ///< 数据解析失败
}BMKErrorCode;
//鉴权结果状态码
typedef enum {
E_PERMISSIONCHECK_CONNECT_ERROR = -300,//链接服务器错误
E_PERMISSIONCHECK_DATA_ERROR = -200,//服务返回数据异常
E_PERMISSIONCHECK_OK = 0, // 授权验证通过
E_PERMISSIONCHECK_KEY_ERROR = 101, //ak不存在
E_PERMISSIONCHECK_MCODE_ERROR = 102, //mcode签名值不正确
E_PERMISSIONCHECK_UID_KEY_ERROR = 200, // APP不存在AK有误请检查再重试
E_PERMISSIONCHECK_KEY_FORBIDEN= 201, // APP被用户自己禁用请在控制台解禁
/*
*
*http://developer.baidu.com/map/index.php?title=lbscloud/api/appendix
*/
}BMKPermissionCheckResultCode;
//检索结果状态码
typedef enum{
BMK_SEARCH_NO_ERROR = 0,///<检索结果正常返回
BMK_SEARCH_AMBIGUOUS_KEYWORD,///<检索词有岐义
BMK_SEARCH_AMBIGUOUS_ROURE_ADDR,///<检索地址有岐义
BMK_SEARCH_NOT_SUPPORT_BUS,///<该城市不支持公交搜索
BMK_SEARCH_NOT_SUPPORT_BUS_2CITY,///<不支持跨城市公交
BMK_SEARCH_RESULT_NOT_FOUND,///<没有找到检索结果
BMK_SEARCH_ST_EN_TOO_NEAR,///<起终点太近
BMK_SEARCH_KEY_ERROR,///<key错误
BMK_SEARCH_NETWOKR_ERROR,///网络连接错误
BMK_SEARCH_NETWOKR_TIMEOUT,///网络连接超时
BMK_SEARCH_PERMISSION_UNFINISHED,///还未完成鉴权,请在鉴权通过后重试
BMK_SEARCH_INDOOR_ID_ERROR,///室内图ID错误
BMK_SEARCH_FLOOR_ERROR,///室内图检索楼层错误
BMK_SEARCH_INDOOR_ROUTE_NO_IN_BUILDING,///起终点不在支持室内路线的室内图内
BMK_SEARCH_INDOOR_ROUTE_NO_IN_SAME_BUILDING,///起终点不在同一个室内
BMK_SEARCH_PARAMETER_ERROR,///参数错误
}BMKSearchErrorCode;
//调起百度地图结果状态码
typedef enum{
BMK_OPEN_NO_ERROR = 0,///<正常
BMK_OPEN_WEB_MAP,///打开的是web地图
BMK_OPEN_OPTION_NULL,///<传入的参数为空
BMK_OPEN_NOT_SUPPORT,///<没有安装百度地图,或者版本太低
BMK_OPEN_POI_DETAIL_UID_NULL,///<poi详情 poiUid为空
BMK_OPEN_POI_NEARBY_KEYWORD_NULL,///<poi周边 keyWord为空
BMK_OPEN_ROUTE_START_ERROR,///<路线起点有误
BMK_OPEN_ROUTE_END_ERROR,///<路线终点有误
BMK_OPEN_PANORAMA_UID_ERROR,///<调起全景 poiUid不正确
BMK_OPEN_PANORAMA_ABSENT,///<调起全景 此处不支持全景
BMK_OPEN_PERMISSION_UNFINISHED,///还未完成鉴权,请在鉴权通过后重试
BMK_OPEN_KEY_ERROR,///<app key错误
BMK_OPEN_NETWOKR_ERROR,///网络连接错误
}BMKOpenErrorCode;
///表示一个经纬度范围
typedef struct {
CLLocationDegrees latitudeDelta; ///< 纬度范围
CLLocationDegrees longitudeDelta; ///< 经度范围
} BMKCoordinateSpan;
///表示一个经纬度区域
typedef struct {
CLLocationCoordinate2D northEast; ///< 东北角点经纬度坐标
CLLocationCoordinate2D southWest; ///< 西南角点经纬度坐标
} BMKCoordinateBounds;
///表示一个经纬度区域
typedef struct {
CLLocationCoordinate2D center; ///< 中心点经纬度坐标
BMKCoordinateSpan span; ///< 经纬度范围
} BMKCoordinateRegion;
///表示一个经纬度坐标点
typedef struct {
int latitudeE6; ///< 纬度乘以1e6之后的值
int longitudeE6; ///< 经度乘以1e6之后的值
} BMKGeoPoint;
///地理坐标点,用直角地理坐标表示
typedef struct {
double x; ///< 横坐标
double y; ///< 纵坐标
} BMKMapPoint;
///矩形大小,用直角地理坐标表示
typedef struct {
double width; ///< 宽度
double height; ///< 高度
} BMKMapSize;
///矩形,用直角地理坐标表示
typedef struct {
BMKMapPoint origin; ///< 屏幕左上点对应的直角地理坐标
BMKMapSize size; ///< 坐标范围
} BMKMapRect;
///地图缩放比例
typedef CGFloat BMKZoomScale;
/// 经过投影后的世界范围大小,与经纬度(-85180投影后的坐标值对应
UIKIT_EXTERN const BMKMapSize BMKMapSizeWorld;
/// 经过投影后的世界矩形范围
UIKIT_EXTERN const BMKMapRect BMKMapRectWorld;
/// 空的直角坐标矩形
UIKIT_EXTERN const BMKMapRect BMKMapRectNull;
///线路检索节点信息,一个路线检索节点可以通过经纬度坐标或城市名加地名确定
@interface BMKPlanNode : NSObject{
NSString* _cityName;
NSString* _name;
CLLocationCoordinate2D _pt;
}
///节点所在城市
@property (nonatomic, strong) NSString* cityName;
///节点所在城市ID
@property (nonatomic, assign) NSInteger cityID;
///节点名称
@property (nonatomic, strong) NSString* name;
///节点坐标
@property (nonatomic) CLLocationCoordinate2D pt;
@end
///室内路线检索节点信息
@interface BMKIndoorPlanNode : NSObject
///节点所在楼层
@property (nonatomic, retain) NSString* floor;
///节点坐标
@property (nonatomic) CLLocationCoordinate2D pt;
@end
///此类表示地址结果的层次化信息
@interface BMKAddressComponent : NSObject
/// 街道号码
@property (nonatomic, strong) NSString* streetNumber;
/// 街道名称
@property (nonatomic, strong) NSString* streetName;
/// 区县名称
@property (nonatomic, strong) NSString* district;
/// 城市名称
@property (nonatomic, strong) NSString* city;
/// 省份名称
@property (nonatomic, strong) NSString* province;
/// 国家
@property (nonatomic, strong) NSString* country;
/// 国家代码
@property (nonatomic, strong) NSString* countryCode;
@end

View File

@ -1,30 +0,0 @@
//
// BMKUserLocation.h
// BaseComponent
//
// Created by Baidu on 3/26/14.
// Copyright (c) 2014 baidu. All rights reserved.
//
#import <CoreLocation/CLLocation.h>
#import <Foundation/Foundation.h>
#import "BMKBaseComponent.h"
@class CLLocation;
@class CLHeading;
@interface BMKUserLocation : NSObject
/// 位置更新状态如果正在更新位置信息则该值为YES
@property (readonly, nonatomic, getter=isUpdating) BOOL updating;
/// 位置信息尚未定位成功则该值为nil
@property (readonly, nonatomic,strong) CLLocation *location;
/// heading信息尚未定位成功则该值为nil
@property (readonly, nonatomic, strong) CLHeading *heading;
/// 定位标注点要显示的标题信息
@property (strong, nonatomic) NSString *title;
/// 定位标注点要显示的子标题信息.
@property (strong, nonatomic) NSString *subtitle;
@end

View File

@ -1,66 +0,0 @@
--------------------------------------------------------------------------------------
iOS 地图 SDK v3.3.0是适用于iOS系统移动设备的矢量地图开发包
--------------------------------------------------------------------------------------
地图SDK功能介绍全功能开发包
地图:提供地图展示和地图操作功能;
POI检索支持周边检索、区域检索和城市内兴趣点检索
地理编码:提供经纬度和地址信息相互转化的功能接口;
线路规划:支持公交、驾车、步行三种方式的线路规划;
覆盖物图层支持在地图上添加覆盖物标注、几何图形、热力图、地形图图层等展示更丰富的LBS信息
定位:获取当前位置信息,并在地图上展示(支持普通、跟随、罗盘三种模式);
离线地图:使用离线地图可节省用户流量,提供更好的地图展示效果;
调启百度地图利用SDK接口直接在本地打开百度地图客户端或WebApp实现地图功能
周边雷达利用周边雷达功能开发者可在App内低成本、快速实现查找周边使用相同App的用户位置的功能
LBS云检索支持查询存储在LBS云内的自有数据
特色功能提供短串分享、Place详情检索、热力图等特色功能帮助开发者搭建功能更加强大的应用
--------------------------------------------------------------------------------------
自v3.2.0起百度地图iOS SDK全面支持HTTPS需要广大开发者导入第三方openssl静态库libssl.a和libcrypto.a存放于thirdlib目录下
新 版 提 示 】
【 注 意 】
1、自v3.2.0起百度地图iOS SDK全面支持HTTPS需要广大开发者导入第三方openssl静态库libssl.a和libcrypto.a存放于thirdlib目录下
添加方法:在 TARGETS->Build Phases-> Link Binary With Libaries中点击“+”按钮在弹出的窗口中点击“Add Other”按钮选择libssl.a和libcrypto.a添加到工程中 。
2、支持CocoaPods导入
pod setup //更新CocoPods的本地库
pod search BaiduMapKit //下载最新地图SDK
【 新 增 】
[ 基 础 地 图 ]
3D地图下增加显示天空效果无需设置
[ 工 具 ]
1全面支持GCJ02坐标输入/输出,全局设置方法如下:
[BMKMapManager setCoordinateTypeUsedInBaiduMapSDK:BMK_COORDTYPE_COMMON];//默认为BD09LL坐标且此方法仅在国内生效国外均为WGS84坐标
2. 新增调启步行AR导航接口openBaiduMapwalkARNavigation
[ LBS云]
云检索中keywords 改为非必填项
【 优 化 】
优化个性化地图元素分类
【 修 复 】
少部分地铁线及室内图无法显示问题v3.2.0引入的问题)。 未下载全国离线基础包时,离线状态下全国(球)地图显示异常。

View File

@ -1,10 +0,0 @@
//
// BMKLocationComponent.h
// LocationComponent
//
// Created by Baidu on 3/31/14.
// Copyright (c) 2014 baidu. All rights reserved.
//
#import "BMKLocationService.h"
#import "BMKLocationVersion.h"

View File

@ -1,110 +0,0 @@
//
// BMKLocationService.h
// LocationComponent
//
// Created by Baidu on 3/28/14.
// Copyright (c) 2014 baidu. All rights reserved.
//
#import <Foundation/Foundation.h>
#import <BaiduMapAPI_Base/BMKUserLocation.h>
@class CLLocation;
/// 定位服务Delegate,调用startUserLocationService定位成功后用此Delegate来获取定位数据
@protocol BMKLocationServiceDelegate <NSObject>
@optional
/**
*
*/
- (void)willStartLocatingUser;
/**
*
*/
- (void)didStopLocatingUser;
/**
*
*@param userLocation
*/
- (void)didUpdateUserHeading:(BMKUserLocation *)userLocation;
/**
*
*@param userLocation
*/
- (void)didUpdateBMKUserLocation:(BMKUserLocation *)userLocation;
/**
*
*@param error
*/
- (void)didFailToLocateUserWithError:(NSError *)error;
@end
@interface BMKLocationService : NSObject
/// 当前用户位置,返回坐标类型为当前设置的坐标类型
@property (nonatomic, readonly) BMKUserLocation *userLocation;
/// 定位服务Delegate,调用startUserLocationService定位成功后用此Delegate来获取定位数据
@property (nonatomic, weak) id<BMKLocationServiceDelegate> delegate;
/**
*
*info.plist文件中添加(使NSLocationWhenInUseUsageDescription)
*NSLocationWhenInUseUsageDescription 使GPS的描述
*NSLocationAlwaysUsageDescription GPS的描述
*/
-(void)startUserLocationService;
/**
*
*/
-(void)stopUserLocationService;
#pragma mark - 定位参数具体含义可参考CLLocationManager相关属性的注释
/// 设定定位的最小更新距离。默认为kCLDistanceFilterNone
@property(nonatomic, assign) CLLocationDistance distanceFilter;
/// 设定定位精度。默认为kCLLocationAccuracyBest。
@property(nonatomic, assign) CLLocationAccuracy desiredAccuracy;
/// 设定最小更新角度。默认为1度设定为kCLHeadingFilterNone会提示任何角度改变。
@property(nonatomic, assign) CLLocationDegrees headingFilter;
/// 指定定位是否会被系统自动暂停。默认为YES。只在iOS 6.0之后起作用。
@property(nonatomic, assign) BOOL pausesLocationUpdatesAutomatically;
///指定定位是否允许后台定位更新。默认为NO。只在iOS 9.0之后起作用。设为YES时Info.plist中 UIBackgroundModes 必须包含 "location"
@property(nonatomic, assign) BOOL allowsBackgroundLocationUpdates;
#pragma mark - 废弃接口
/**
* 2.9.0使distanceFilter属性替换
*
*
*()kCLDistanceFilterNone
*/
+ (void)setLocationDistanceFilter:(CLLocationDistance) distanceFilter __deprecated_msg("废弃方法空实现使用distanceFilter属性替换");
/**
* 2.9.0使distanceFilter属性替换
*
* ()
*/
+ (CLLocationDistance)getCurrentLocationDistanceFilter __deprecated_msg("废弃方法空实现使用distanceFilter属性替换");
/**
* 2.9.0使desiredAccuracy属性替换
*
*
*kCLLocationAccuracyBest
*/
+ (void)setLocationDesiredAccuracy:(CLLocationAccuracy) desiredAccuracy __deprecated_msg("废弃方法空实现使用desiredAccuracy属性替换");
/**
* 2.9.0使desiredAccuracy属性替换
*
*
*/
+ (CLLocationAccuracy)getCurrentLocationDesiredAccuracy __deprecated_msg("废弃方法空实现使用desiredAccuracy属性替换");
@end

View File

@ -1,32 +0,0 @@
//
// BMKLocationVersion.h
// LocationComponent
//
// Created by wzy on 15/9/9.
// Copyright © 2015年 baidu. All rights reserved.
//
#ifndef BMKLocationVersion_h
#define BMKLocationVersion_h
#import <UIKit/UIKit.h>
/**
*
*location组件的版本和base组件的版本必须一致使
*/
/**
*API location组件
*location组件版本 : 3.3.0
*return API location组件
*/
UIKIT_EXTERN NSString* BMKGetMapApiLocationComponentVersion();
/**
*location组件的版本号是否和base组件的版本号一致
*return YES
*/
UIKIT_EXTERN BOOL BMKCheckLocationComponentIsLegal();
#endif /* BMKLocationVersion_h */

View File

@ -1,67 +0,0 @@
定位功能:获取当前位置信息;
--------------------------------------------------------------------------------------
iOS 地图 SDK v3.3.0是适用于iOS系统移动设备的矢量地图开发包
--------------------------------------------------------------------------------------
地图SDK功能介绍全功能开发包
地图:提供地图展示和地图操作功能;
POI检索支持周边检索、区域检索和城市内兴趣点检索
地理编码:提供经纬度和地址信息相互转化的功能接口;
线路规划:支持公交、驾车、步行三种方式的线路规划;
覆盖物图层支持在地图上添加覆盖物标注、几何图形、热力图、地形图图层等展示更丰富的LBS信息
定位:获取当前位置信息,并在地图上展示(支持普通、跟随、罗盘三种模式);
离线地图:使用离线地图可节省用户流量,提供更好的地图展示效果;
调启百度地图利用SDK接口直接在本地打开百度地图客户端或WebApp实现地图功能
周边雷达利用周边雷达功能开发者可在App内低成本、快速实现查找周边使用相同App的用户位置的功能
LBS云检索支持查询存储在LBS云内的自有数据
特色功能提供短串分享、Place详情检索、热力图等特色功能帮助开发者搭建功能更加强大的应用
--------------------------------------------------------------------------------------
自v3.2.0起百度地图iOS SDK全面支持HTTPS需要广大开发者导入第三方openssl静态库libssl.a和libcrypto.a存放于thirdlib目录下
新 版 提 示 】
【 注 意 】
1、自v3.2.0起百度地图iOS SDK全面支持HTTPS需要广大开发者导入第三方openssl静态库libssl.a和libcrypto.a存放于thirdlib目录下
添加方法:在 TARGETS->Build Phases-> Link Binary With Libaries中点击“+”按钮在弹出的窗口中点击“Add Other”按钮选择libssl.a和libcrypto.a添加到工程中 。
2、支持CocoaPods导入
pod setup //更新CocoPods的本地库
pod search BaiduMapKit //下载最新地图SDK
【 新 增 】
[ 基 础 地 图 ]
3D地图下增加显示天空效果无需设置
[ 工 具 ]
1全面支持GCJ02坐标输入/输出,全局设置方法如下:
[BMKMapManager setCoordinateTypeUsedInBaiduMapSDK:BMK_COORDTYPE_COMMON];//默认为BD09LL坐标且此方法仅在国内生效国外均为WGS84坐标
2. 新增调启步行AR导航接口openBaiduMapwalkARNavigation
[ LBS云]
云检索中keywords 改为非必填项
【 优 化 】
优化个性化地图元素分类
【 修 复 】
少部分地铁线及室内图无法显示问题v3.2.0引入的问题)。 未下载全国离线基础包时,离线状态下全国(球)地图显示异常。

Some files were not shown because too many files have changed in this diff Show More