萤石云 iOSSDK,移植跨平台相关工程
2021-04-19 1.1.HDL云萤石摄像头对接接口,增加platform参数, 代表平台  1.on+(默认) 2.evoyo
7个文件已修改
31 ■■■■■ 已修改文件
Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo.xcodeproj/project.pbxproj 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/AppDelegate.m 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Global/EZHttpUtil.m 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Info.plist 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/ViewController.m 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
EZSDK.IOS/EZSDK.IOS/Library/libEZSDK.a 补丁 | 查看 | 原始文档 | blame | 历史
EZSDK/EZSDK/EZ/Global/EZHttpUtil.m 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo.xcodeproj/project.pbxproj
@@ -1978,10 +1978,10 @@
                MARKETING_VERSION = 4.15.0;
                ONLY_ACTIVE_ARCH = YES;
                OTHER_LDFLAGS = "-ObjC";
                PRODUCT_BUNDLE_IDENTIFIER = com.hdl.onpro;
                PRODUCT_BUNDLE_IDENTIFIER = com.evoyo.home;
                PRODUCT_NAME = EZOpenSDK;
                PROVISIONING_PROFILE = "";
                PROVISIONING_PROFILE_SPECIFIER = "ComHdlOnProDevelopment20210225-1";
                PROVISIONING_PROFILE_SPECIFIER = ComEvoyoHomeDevelopment20210301;
                VALID_ARCHS = "arm64 armv7 armv7s";
                WRAPPER_EXTENSION = app;
            };
Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/AppDelegate.m
@@ -29,7 +29,11 @@
    
    
//    [EZOPENSDK initLibWithAppKey:@"0311c3f70a854aacb5a099f2bfbef986"];
    [EZOPENSDK initLibWithAppKey:@"1aa98a90489b4838b966b57018b4b04b"];
    //ON+
//    [EZOPENSDK initLibWithAppKey:@"1aa98a90489b4838b966b57018b4b04b"];
    //home
    [EZOPENSDK initLibWithAppKey:@"89f6219d561441f5b664c7475698841e"];
//    NSLog(@"LanguageIsChinese :%s", LanguageIsChinese ? "YES":"NO");
//    NSLog(@"NSStringFromClass :%@", NSStringFromClass(EZOPENSDK));
    [EZHCNetDeviceSDK initSDK];
Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Global/EZHttpUtil.m
@@ -50,7 +50,7 @@
    
    //2.设置请求参数
    NSMutableDictionary *parameters = [NSMutableDictionary dictionary];
    [parameters setValue:[NSNumber numberWithInteger:[GlobalKit shareKit].hdlPlatform] forKey:@"platform"];
    [parameters setValue: [NSString stringWithFormat:@"%d", [GlobalKit shareKit].hdlPlatform] forKey:@"platform"];
    parameters = [self GetSignRequestDictionary:parameters];
    
    [self requestHttpsPost:API_POST_EZ_GetChildToken parameters:parameters completion:^(ResponseData *responseData) {
@@ -83,7 +83,7 @@
    NSMutableDictionary *parameters = [NSMutableDictionary dictionary];
    [parameters setValue:deviceSerial forKey:@"deviceSerial"];
    [parameters setValue:verifyCode forKey:@"validateCode"];
    [parameters setValue:[NSNumber numberWithInteger:[GlobalKit shareKit].hdlPlatform] forKey:@"platform"];
    [parameters setValue: [NSString stringWithFormat:@"%d",[GlobalKit shareKit].hdlPlatform] forKey:@"platform"];
    parameters = [self GetSignRequestDictionary:parameters];
    
   [self requestHttpsPost:API_POST_EZ_AddDevice parameters:parameters completion:^(ResponseData *responseData) {
@@ -107,7 +107,7 @@
    //1.设置请求参数
    NSMutableDictionary *parameters = [NSMutableDictionary dictionary];
    [parameters setValue:deviceSerial forKey:@"deviceSerial"];
    [parameters setValue:[NSNumber numberWithInteger:[GlobalKit shareKit].hdlPlatform] forKey:@"platform"];
    [parameters setValue: [NSString stringWithFormat:@"%d",[GlobalKit shareKit].hdlPlatform] forKey:@"platform"];
    parameters = [self GetSignRequestDictionary:parameters];
    
    [self requestHttpsPost:API_POST_EZ_ChildDelDevice parameters:parameters completion:^(ResponseData *responseData) {
Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Info.plist
@@ -53,9 +53,9 @@
    <key>NSLocalNetworkUsageDescription</key>
    <string>用于wifi配网</string>
    <key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
    <string>$(PRODUCT_NAME) App needs Location permission to configure device&apos;s network.</string>
    <string>$(PRODUCT_NAME) App needs Location permission to configure device's network.</string>
    <key>NSLocationAlwaysUsageDescription</key>
    <string>$(PRODUCT_NAME) App needs Location permission to configure device&apos;s network.</string>
    <string>$(PRODUCT_NAME) App needs Location permission to configure device's network.</string>
    <key>NSLocationWhenInUseUsageDescription</key>
    <string>$(PRODUCT_NAME) App needs Location permission so that you can select location information when posting videos publicly.</string>
    <key>NSMicrophoneUsageDescription</key>
Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/ViewController.m
@@ -55,9 +55,10 @@
//     */
//    [self performSegueWithIdentifier:@"go2CameraList" sender:nil];
    
    [EZSDK setHDlAccessToken:@"Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJqdGkiOiI5MDdhMzhkOTcyZjg0YmQ4YmY0NGM2OTczZGU2ZDU0OCIsInJvbGUiOiIiLCJoZWFkZXJQcmVmaXgiOiJCZWFyZXIgIiwidXNlckFjY291bnQiOiIxODgyNDg2NDE0MyIsInRlbmFudElkIjoiMjAiLCJ1c2VyVHlwZSI6IlVTRVJfQyIsInRva2VuVHlwZSI6ImFjY2Vzc190b2tlbiIsInVzZXJOYW1lIjoiTEUwMDAiLCJhcHBsaWNhdGlvbklkIjoiMCIsInVzZXJJZCI6IjEzMjg4ODYyNzMwMDM4NTU4NzQiLCJleHAiOjE2MTUyODgyMjEsIm5iZiI6MTYxNTI4MTAyMX0.HsVLWNUozTxFcXuQ1ljT_7P4wCzmbV3i4elbQzpWgi6hGWyrgvFi7yiD5sedSwygE8wwvujD342VunG_nDcttLtBijdcKfbiteOgttk-1HlWkny4xAhiRgFeJ3hQnLuH9QDnF1qiznFe_pwy8l41P-gM-WkxKGv7TlX3TPfzC5g" refreshToken:@"eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJqdGkiOiI5MjRhOWMzNGIwNDA0MGE4OGQ2OGNkNGI5NzllZGUxMiIsImhlYWRlclByZWZpeCI6IkJlYXJlciAiLCJ0ZW5hbnRJZCI6IjIwIiwidG9rZW5UeXBlIjoicmVmcmVzaF90b2tlbiIsImFwcGxpY2F0aW9uSWQiOiIwIiwidXNlcklkIjoiMTMyODg4NjI3MzAwMzg1NTg3NCIsImV4cCI6MTYxNTg4NTgyMSwibmJmIjoxNjE1MjgxMDIxfQ.VCwNcWPG5e--3JxLwoO6__vwZEcR_nAP_jTZKYYa2uhruHMhKUat2WYabiU6hofAp9KYKayqI7A24fbl2OrejVoJa_2s5zHkK7vVayo44u8J4aiw0m7YcfH_bzaz45pHhxAG2hKHm-3e95FqBTuKu3eP5m7YO-0HqQA9crRtELU"];
    [EZSDK setHDlAccessToken:@"Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJqdGkiOiIwOTZiNzZmYzVlNTk0MzNjOGI2YTBjOWIwODg2MWVhZiIsInJvbGUiOiIiLCJoZWFkZXJQcmVmaXgiOiJCZWFyZXIgIiwidXNlckFjY291bnQiOiIxODgyNDg2NDE0MyIsInRlbmFudElkIjoiMjAiLCJ1c2VyVHlwZSI6IlVTRVJfQyIsInRva2VuVHlwZSI6ImFjY2Vzc190b2tlbiIsInVzZXJOYW1lIjoiTEUwMDAiLCJhcHBsaWNhdGlvbklkIjoiMCIsInVzZXJJZCI6IjEzMjg4ODYyNzMwMDM4NTU4NzQiLCJleHAiOjE2MTg4MTcyNjUsIm5iZiI6MTYxODgxMDA2NX0.Mjtc_9EGn6elmVJK4B9GVDcGDTJcM70QEhwof5ReMUGgm9mQtCt9VRLKhyDlH28yzlKZ0kVUsQxsqw0ZcfrqdjzIEWQgA-VtnAru3HqkwDuLvhvJz3v2L_jUyD-TBgC5USdGZEgGDaqb-9shthA6w__Kky_N2t-O_tF0XoNO29k" refreshToken:@"eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJqdGkiOiI0YmM4YzhlZTllMmU0YTc0YmNiOGY5YmZlMmUzZTU2YyIsImhlYWRlclByZWZpeCI6IkJlYXJlciAiLCJ0ZW5hbnRJZCI6IjIwIiwidG9rZW5UeXBlIjoicmVmcmVzaF90b2tlbiIsImFwcGxpY2F0aW9uSWQiOiIwIiwidXNlcklkIjoiMTMyODg4NjI3MzAwMzg1NTg3NCIsImV4cCI6MTYxOTQxNTg3NSwibmJmIjoxNjE4ODExMDc1fQ.droDmbiOgr0J8yn1BrZzZa_1idmsQV2T0kMAvGpu8yg8WEA6jKKT4FBS6SwgLwZY5q-evTrkSebU5LGJizJP288BInBF4PhNotjSVn0pXZ3xJ1QQuEZ4ZRmsw9n0Nl-BLMEaNHDqNfi4odkzFlQNb4NijAK1zEqXRpFozg_rR3s"];
    
    [EZSDK setRequestHttpsHost:@"https://test-gz.hdlcontrol.com"];
    [EZSDK setRequestHttpsHostAndPlatform:@"https://test-gz.hdlcontrol.com" platform:2];
    
    
    
EZSDK.IOS/EZSDK.IOS/Library/libEZSDK.a
Binary files differ
EZSDK/EZSDK/EZ/Global/EZHttpUtil.m
@@ -50,7 +50,7 @@
    
    //2.设置请求参数
    NSMutableDictionary *parameters = [NSMutableDictionary dictionary];
    [parameters setValue:[NSNumber numberWithInteger:[GlobalKit shareKit].hdlPlatform] forKey:@"platform"];
    [parameters setValue: [NSString stringWithFormat:@"%d", [GlobalKit shareKit].hdlPlatform] forKey:@"platform"];
    parameters = [self GetSignRequestDictionary:parameters];
    
    [self requestHttpsPost:API_POST_EZ_GetChildToken parameters:parameters completion:^(ResponseData *responseData) {
@@ -83,7 +83,7 @@
    NSMutableDictionary *parameters = [NSMutableDictionary dictionary];
    [parameters setValue:deviceSerial forKey:@"deviceSerial"];
    [parameters setValue:verifyCode forKey:@"validateCode"];
    [parameters setValue:[NSNumber numberWithInteger:[GlobalKit shareKit].hdlPlatform] forKey:@"platform"];
    [parameters setValue: [NSString stringWithFormat:@"%d",[GlobalKit shareKit].hdlPlatform] forKey:@"platform"];
    parameters = [self GetSignRequestDictionary:parameters];
    
   [self requestHttpsPost:API_POST_EZ_AddDevice parameters:parameters completion:^(ResponseData *responseData) {
@@ -107,7 +107,7 @@
    //1.设置请求参数
    NSMutableDictionary *parameters = [NSMutableDictionary dictionary];
    [parameters setValue:deviceSerial forKey:@"deviceSerial"];
    [parameters setValue:[NSNumber numberWithInteger:[GlobalKit shareKit].hdlPlatform] forKey:@"platform"];
    [parameters setValue: [NSString stringWithFormat:@"%d",[GlobalKit shareKit].hdlPlatform] forKey:@"platform"];
    parameters = [self GetSignRequestDictionary:parameters];
    
    [self requestHttpsPost:API_POST_EZ_ChildDelDevice parameters:parameters completion:^(ResponseData *responseData) {