Commit bb3885f9 authored by 朱璇's avatar 朱璇

Merge branch 'lym/test' of git.wanmeizhensuo.com:gengmeiios/GMAILab into zx/faceTest

parents 5a488c0a 32358719
...@@ -336,7 +336,6 @@ ...@@ -336,7 +336,6 @@
"${BUILT_PRODUCTS_DIR}/GMRefresh/GMRefresh.framework", "${BUILT_PRODUCTS_DIR}/GMRefresh/GMRefresh.framework",
"${BUILT_PRODUCTS_DIR}/GMRouter/GMRouter.framework", "${BUILT_PRODUCTS_DIR}/GMRouter/GMRouter.framework",
"${BUILT_PRODUCTS_DIR}/GMUtil/GMUtil.framework", "${BUILT_PRODUCTS_DIR}/GMUtil/GMUtil.framework",
"${BUILT_PRODUCTS_DIR}/GMediator/GMediator.framework",
"${BUILT_PRODUCTS_DIR}/GPUImage/GPUImage.framework", "${BUILT_PRODUCTS_DIR}/GPUImage/GPUImage.framework",
"${BUILT_PRODUCTS_DIR}/MBProgressHUD/MBProgressHUD.framework", "${BUILT_PRODUCTS_DIR}/MBProgressHUD/MBProgressHUD.framework",
"${BUILT_PRODUCTS_DIR}/MJExtension/MJExtension.framework", "${BUILT_PRODUCTS_DIR}/MJExtension/MJExtension.framework",
...@@ -375,7 +374,6 @@ ...@@ -375,7 +374,6 @@
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GMRefresh.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GMRefresh.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GMRouter.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GMRouter.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GMUtil.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GMUtil.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GMediator.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GPUImage.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GPUImage.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MBProgressHUD.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MBProgressHUD.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJExtension.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJExtension.framework",
......
...@@ -12,24 +12,17 @@ target 'GMAILab_Example' do ...@@ -12,24 +12,17 @@ target 'GMAILab_Example' do
pod 'GMAILab', :path => '../' pod 'GMAILab', :path => '../'
# pod 'GMBase', :git => 'git@git.wanmeizhensuo.com:gengmeiios/GMBase.git', :commit => 'f3b40c7' # pod 'GMBase', :git => 'git@git.wanmeizhensuo.com:gengmeiios/GMBase.git', :commit => 'f3b40c7'
pod 'GMPhobos', :git => 'git@git.wanmeizhensuo.com:gengmeiios/GMPhobos.git', :commit => '960bbb8' pod 'GMPhobos', :git => 'git@git.wanmeizhensuo.com:gengmeiios/GMPhobos.git', :commit => '960bbb8'
pod 'GMBaseWeb', :git => 'git@git.wanmeizhensuo.com:gengmeiios/GMBaseWeb.git', :commit => '0752677' # pod 'GMBaseWeb', :git => 'git@git.wanmeizhensuo.com:gengmeiios/GMBaseWeb.git', :commit => '0752677'
#9e91ae1 #9e91ae1
pod 'GMBase', :git => 'git@git.wanmeizhensuo.com:gengmeiios/GMBase.git', :commit => '9e91ae1' pod 'GMBase', :git => 'git@git.wanmeizhensuo.com:gengmeiios/GMBase.git', :commit => '9e91ae1'
pod 'GMBaseSwift', :git => 'git@git.wanmeizhensuo.com:gengmeiios/GMBaseSwift.git', :commit => 'b54da90' pod 'GMBaseSwift', :git => 'git@git.wanmeizhensuo.com:gengmeiios/GMBaseSwift.git', :commit => 'b54da90'
pod 'GMAlbum', :git => 'git@git.wanmeizhensuo.com:gengmeiios/GMAlbum.git', :commit => '31dcd07' pod 'GMAlbum', :git => 'git@git.wanmeizhensuo.com:gengmeiios/GMAlbum.git', :commit => '31dcd07'
# pod 'GMBaseSwift', :path => '../../GMBaseSwift'
pod 'Qiniu', '7.2.6' pod 'Qiniu', '7.2.6'
pod 'GMBaseWeb', :path => '../../GMBaseWeb'
# pod 'GMBase', :path => '../../GMBase'
# pod 'GMBaseWeb', :path => '../../GMBaseWeb'
# s.dependency 'GMBaseSwift','3.4.0' # s.dependency 'GMBaseSwift','3.4.0'
# s.dependency 'EVReflection', '5.10.0' # s.dependency 'EVReflection', '5.10.0'
target 'GMAILab_Tests' do target 'GMAILab_Tests' do
......
...@@ -30,7 +30,6 @@ PODS: ...@@ -30,7 +30,6 @@ PODS:
- GMBase - GMBase
- GMBaseSwift - GMBaseSwift
- GMBaseWeb - GMBaseWeb
- GMediator
- GMFoundation - GMFoundation
- GMKit - GMKit
- GMNetService - GMNetService
...@@ -42,6 +41,8 @@ PODS: ...@@ -42,6 +41,8 @@ PODS:
- PLMediaStreamingKit - PLMediaStreamingKit
- PLPlayerKit - PLPlayerKit
- Qiniu - Qiniu
- TTTPlayerKit_iOS
- TTTRtcEngineKit_iOS
- YYText - YYText
- GMAlbum (4.1.3): - GMAlbum (4.1.3):
- GMBase - GMBase
...@@ -72,19 +73,16 @@ PODS: ...@@ -72,19 +73,16 @@ PODS:
- GMBaseWeb (0.1.0): - GMBaseWeb (0.1.0):
- GMAlbum - GMAlbum
- GMBase - GMBase
- GMBaseSwift
- GMCache - GMCache
- GMFoundation - GMFoundation
- GMHud - GMHud
- GMNetService
- GMPhobos - GMPhobos
- GMRouter - GMRouter
- GMShareSDK (= 0.2.1) - GMShareSDK
- GMUtil - GMUtil
- SnapKit (= 4.2.0) - SnapKit
- GMCache (1.0.1): - GMCache (1.0.1):
- TMCache (= 2.1.0) - TMCache (= 2.1.0)
- GMediator (1.0.1)
- GMFoundation (1.0.8) - GMFoundation (1.0.8)
- GMHud (1.0.3): - GMHud (1.0.3):
- MBProgressHUD (= 0.9.2) - MBProgressHUD (= 0.9.2)
...@@ -177,6 +175,8 @@ PODS: ...@@ -177,6 +175,8 @@ PODS:
- SDWebImage/Core (5.8.0) - SDWebImage/Core (5.8.0)
- SnapKit (4.2.0) - SnapKit (4.2.0)
- TMCache (2.1.0) - TMCache (2.1.0)
- TTTPlayerKit_iOS (1.7.0)
- TTTRtcEngineKit_iOS (2.9.2)
- "UITableView+FDTemplateLayoutCell (1.4)" - "UITableView+FDTemplateLayoutCell (1.4)"
- WechatOpenSDK (1.8.6.2) - WechatOpenSDK (1.8.6.2)
- Weibo_SDK (3.2.7) - Weibo_SDK (3.2.7)
...@@ -187,7 +187,7 @@ DEPENDENCIES: ...@@ -187,7 +187,7 @@ DEPENDENCIES:
- "GMAlbum (from `git@git.wanmeizhensuo.com:gengmeiios/GMAlbum.git`, commit `31dcd07`)" - "GMAlbum (from `git@git.wanmeizhensuo.com:gengmeiios/GMAlbum.git`, commit `31dcd07`)"
- "GMBase (from `git@git.wanmeizhensuo.com:gengmeiios/GMBase.git`, commit `9e91ae1`)" - "GMBase (from `git@git.wanmeizhensuo.com:gengmeiios/GMBase.git`, commit `9e91ae1`)"
- "GMBaseSwift (from `git@git.wanmeizhensuo.com:gengmeiios/GMBaseSwift.git`, commit `b54da90`)" - "GMBaseSwift (from `git@git.wanmeizhensuo.com:gengmeiios/GMBaseSwift.git`, commit `b54da90`)"
- "GMBaseWeb (from `git@git.wanmeizhensuo.com:gengmeiios/GMBaseWeb.git`, commit `0752677`)" - GMBaseWeb (from `../../GMBaseWeb`)
- "GMPhobos (from `git@git.wanmeizhensuo.com:gengmeiios/GMPhobos.git`, commit `960bbb8`)" - "GMPhobos (from `git@git.wanmeizhensuo.com:gengmeiios/GMPhobos.git`, commit `960bbb8`)"
- Qiniu (= 7.2.6) - Qiniu (= 7.2.6)
...@@ -195,7 +195,6 @@ SPEC REPOS: ...@@ -195,7 +195,6 @@ SPEC REPOS:
"git@git.wanmeizhensuo.com:gengmeiios/GMSpecs.git": "git@git.wanmeizhensuo.com:gengmeiios/GMSpecs.git":
- GM-Swift-Observable - GM-Swift-Observable
- GMCache - GMCache
- GMediator
- GMFoundation - GMFoundation
- GMHud - GMHud
- GMJSONModel - GMJSONModel
...@@ -227,6 +226,8 @@ SPEC REPOS: ...@@ -227,6 +226,8 @@ SPEC REPOS:
- SDWebImage - SDWebImage
- SnapKit - SnapKit
- TMCache - TMCache
- TTTPlayerKit_iOS
- TTTRtcEngineKit_iOS
- "UITableView+FDTemplateLayoutCell" - "UITableView+FDTemplateLayoutCell"
- WechatOpenSDK - WechatOpenSDK
- Weibo_SDK - Weibo_SDK
...@@ -245,8 +246,7 @@ EXTERNAL SOURCES: ...@@ -245,8 +246,7 @@ EXTERNAL SOURCES:
:commit: b54da90 :commit: b54da90
:git: "git@git.wanmeizhensuo.com:gengmeiios/GMBaseSwift.git" :git: "git@git.wanmeizhensuo.com:gengmeiios/GMBaseSwift.git"
GMBaseWeb: GMBaseWeb:
:commit: '0752677' :path: "../../GMBaseWeb"
:git: "git@git.wanmeizhensuo.com:gengmeiios/GMBaseWeb.git"
GMPhobos: GMPhobos:
:commit: 960bbb8 :commit: 960bbb8
:git: "git@git.wanmeizhensuo.com:gengmeiios/GMPhobos.git" :git: "git@git.wanmeizhensuo.com:gengmeiios/GMPhobos.git"
...@@ -261,9 +261,6 @@ CHECKOUT OPTIONS: ...@@ -261,9 +261,6 @@ CHECKOUT OPTIONS:
GMBaseSwift: GMBaseSwift:
:commit: b54da90 :commit: b54da90
:git: "git@git.wanmeizhensuo.com:gengmeiios/GMBaseSwift.git" :git: "git@git.wanmeizhensuo.com:gengmeiios/GMBaseSwift.git"
GMBaseWeb:
:commit: '0752677'
:git: "git@git.wanmeizhensuo.com:gengmeiios/GMBaseWeb.git"
GMPhobos: GMPhobos:
:commit: 960bbb8 :commit: 960bbb8
:git: "git@git.wanmeizhensuo.com:gengmeiios/GMPhobos.git" :git: "git@git.wanmeizhensuo.com:gengmeiios/GMPhobos.git"
...@@ -276,13 +273,12 @@ SPEC CHECKSUMS: ...@@ -276,13 +273,12 @@ SPEC CHECKSUMS:
DouyinOpenSDK: 5ba83de22963ba7a3ba70c8ff11dfcb2885ecc2b DouyinOpenSDK: 5ba83de22963ba7a3ba70c8ff11dfcb2885ecc2b
EVReflection: 1abc1a81927ab0d30170238cf9b79bff489e9728 EVReflection: 1abc1a81927ab0d30170238cf9b79bff489e9728
GM-Swift-Observable: 756d8fc13638b9faa68cb10266b2ffb47a911595 GM-Swift-Observable: 756d8fc13638b9faa68cb10266b2ffb47a911595
GMAILab: 66c985ff5c6211851a805711fbd31f433929bc64 GMAILab: 959b642bc718d21706ed5fb1b3a6ede16cb3ffd2
GMAlbum: d667396a6dab574a45af71dfebd1a75257c80192 GMAlbum: d667396a6dab574a45af71dfebd1a75257c80192
GMBase: 358e72062cb0f64a57ff34ec181b20ad9973d79b GMBase: 358e72062cb0f64a57ff34ec181b20ad9973d79b
GMBaseSwift: 8f327883b33ac24d0dcdb648ac3f9d6c57949ad5 GMBaseSwift: 8f327883b33ac24d0dcdb648ac3f9d6c57949ad5
GMBaseWeb: 6e0b157f5e3699fc8b2d117813fa3d7e03116c0b GMBaseWeb: 4b374ec5a7afc59368eea5dc480f0e98129a9c69
GMCache: b78d8e46db864405e91d226ce640cc80d966c611 GMCache: b78d8e46db864405e91d226ce640cc80d966c611
GMediator: 0b222275ef14deaf72eca107e76e048b67172c2c
GMFoundation: e9f7fd9c6e5f133e09009b0ee5de4fce60ac5682 GMFoundation: e9f7fd9c6e5f133e09009b0ee5de4fce60ac5682
GMHud: 18d41f4900a204f27be14e9504fcee2060ae3b2c GMHud: 18d41f4900a204f27be14e9504fcee2060ae3b2c
GMJSONModel: 5e81a98de668e9f93cf6ff77869f77b0d1a806be GMJSONModel: 5e81a98de668e9f93cf6ff77869f77b0d1a806be
...@@ -308,11 +304,13 @@ SPEC CHECKSUMS: ...@@ -308,11 +304,13 @@ SPEC CHECKSUMS:
SDWebImage: 84000f962cbfa70c07f19d2234cbfcf5d779b5dc SDWebImage: 84000f962cbfa70c07f19d2234cbfcf5d779b5dc
SnapKit: fe8a619752f3f27075cc9a90244d75c6c3f27e2a SnapKit: fe8a619752f3f27075cc9a90244d75c6c3f27e2a
TMCache: 95ebcc9b3c7e90fb5fd8fc3036cba3aa781c9bed TMCache: 95ebcc9b3c7e90fb5fd8fc3036cba3aa781c9bed
TTTPlayerKit_iOS: e97074d0254e7cb26d88b6be1ec161f621a0a438
TTTRtcEngineKit_iOS: 3d4039c17d2c10537ff1ded31eaf6619f7b9e658
"UITableView+FDTemplateLayoutCell": 234e1582bcc4e18461af91155123bb96538ed030 "UITableView+FDTemplateLayoutCell": 234e1582bcc4e18461af91155123bb96538ed030
WechatOpenSDK: 8b3ba4239193d1112205c139c94e21934e8f369a WechatOpenSDK: 8b3ba4239193d1112205c139c94e21934e8f369a
Weibo_SDK: 5a4d08f7e1fedbb635435e4585c8c0439c7da089 Weibo_SDK: 5a4d08f7e1fedbb635435e4585c8c0439c7da089
YYText: 5c461d709e24d55a182d1441c41dc639a18a4849 YYText: 5c461d709e24d55a182d1441c41dc639a18a4849
PODFILE CHECKSUM: 79af3275103458c1b8cd27726da0c5fc73286b01 PODFILE CHECKSUM: f6246f874e1c9561c47b232c031f3a745819897e
COCOAPODS: 1.9.1 COCOAPODS: 1.9.1
...@@ -30,7 +30,7 @@ TODO: Add long description of the pod here. ...@@ -30,7 +30,7 @@ TODO: Add long description of the pod here.
s.ios.deployment_target = '9.0' s.ios.deployment_target = '9.0'
s.source_files = 'GMAILab/Classes/**/*.{h,m}' s.source_files = 'GMAILab/Classes/**/*'
# s.subspec 'Model' do |ss| # s.subspec 'Model' do |ss|
# ss.source_files = 'GMAILab/Classes/Model/*.{h,m}' # ss.source_files = 'GMAILab/Classes/Model/*.{h,m}'
...@@ -71,7 +71,7 @@ s.vendored_frameworks = 'GMAILab/Frameworks/*.framework' ...@@ -71,7 +71,7 @@ s.vendored_frameworks = 'GMAILab/Frameworks/*.framework'
s.dependency 'GMFoundation' s.dependency 'GMFoundation'
s.dependency 'GMNetService' s.dependency 'GMNetService'
s.dependency 'GMRefresh' s.dependency 'GMRefresh'
s.dependency 'GMediator' # s.dependency 'GMediator'
s.dependency 'GMBaseSwift' s.dependency 'GMBaseSwift'
s.dependency 'EVReflection', '5.10.0' s.dependency 'EVReflection', '5.10.0'
s.dependency 'GMRouter' s.dependency 'GMRouter'
...@@ -87,13 +87,15 @@ s.vendored_frameworks = 'GMAILab/Frameworks/*.framework' ...@@ -87,13 +87,15 @@ s.vendored_frameworks = 'GMAILab/Frameworks/*.framework'
s.dependency 'PLMediaStreamingKit' s.dependency 'PLMediaStreamingKit'
s.dependency 'PLPlayerKit' s.dependency 'PLPlayerKit'
s.dependency 'Qiniu' s.dependency 'Qiniu'
s.libraries = "z", "c++", "xml2", "sqlite3"
s.frameworks = 'ReplayKit', 'CoreTelephony', 'SystemConfiguration'
# s.libraries = "z", "c++", "xml2", "sqlite3"
# s.frameworks = 'ReplayKit', 'CoreTelephony', 'SystemConfiguration'
# s.pod_target_xcconfig = { 'VALID_ARCHS[sdk=iphonesimulator*]' => '' } # s.pod_target_xcconfig = { 'VALID_ARCHS[sdk=iphonesimulator*]' => '' }
# s.dependency 'TTTRtcEngineKit_iOS' s.dependency 'TTTRtcEngineKit_iOS'
# s.dependency 'TTTPlayerKit_iOS' s.dependency 'TTTPlayerKit_iOS'
s.static_framework = true s.static_framework = true
# s.pod_target_xcconfig = { 'VALID_ARCHS' => 'armv7' } # s.pod_target_xcconfig = { 'VALID_ARCHS' => 'armv7' }
......
...@@ -8,9 +8,9 @@ ...@@ -8,9 +8,9 @@
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import <GMbase/GMObject.h> #import <GMbase/GMObject.h>
typedef NS_ENUM(NSUInteger, GMTokenType) { typedef NS_ENUM(NSUInteger, GMAITokenType) {
GMTokenTypeImage = 1,// 图片 GMAITokenTypeImage = 1,// 图片
GMTokenTypeViedo,// 视频 GMAITokenTypeViedo,// 视频
}; };
/** @brief 返回结果Block */ /** @brief 返回结果Block */
...@@ -24,7 +24,7 @@ typedef void(^UploadFinishedBlock)(BOOL result, NSString *message); ...@@ -24,7 +24,7 @@ typedef void(^UploadFinishedBlock)(BOOL result, NSString *message);
- (NSString *)createImagePath; - (NSString *)createImagePath;
// 1: '图片' 2:'视频' // 1: '图片' 2:'视频'
- (void)getTokenWithType:(GMTokenType)type resultBlock:(UploadFinishedBlock)resultBlock; - (void)getTokenWithType:(GMAITokenType)type resultBlock:(UploadFinishedBlock)resultBlock;
-(void)uploadImages:(NSArray *)images imageToken:(NSString *)imageToken resultBlock:(UploadFinishedBlock)resultBlock; -(void)uploadImages:(NSArray *)images imageToken:(NSString *)imageToken resultBlock:(UploadFinishedBlock)resultBlock;
......
...@@ -33,7 +33,7 @@ static GMAIUploadImagesManager *shareInstance = nil; ...@@ -33,7 +33,7 @@ static GMAIUploadImagesManager *shareInstance = nil;
return shareInstance; return shareInstance;
} }
- (void)getTokenWithType:(GMTokenType)type resultBlock:(UploadFinishedBlock)resultBlock { - (void)getTokenWithType:(GMAITokenType)type resultBlock:(UploadFinishedBlock)resultBlock {
NSDictionary *params = @{@"token_type" : @(type)}; NSDictionary *params = @{@"token_type" : @(type)};
[GMNetworking requestOCWithApi:@"/api/app/upload_token" method:GMHTTPMethodPost parameters:params completion:^(GMResponseOC * response) { [GMNetworking requestOCWithApi:@"/api/app/upload_token" method:GMHTTPMethodPost parameters:params completion:^(GMResponseOC * response) {
if (response.isSuccess) { if (response.isSuccess) {
......
...@@ -8,7 +8,8 @@ ...@@ -8,7 +8,8 @@
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import "GMALNetworkMacros.h" #import "GMALNetworkMacros.h"
@import GMBase; #import <GMBase/GMObject.h>
//@import GMBase;
typedef NS_ENUM(NSInteger, GMRequestMethod) { typedef NS_ENUM(NSInteger, GMRequestMethod) {
GMRequestMethodGET = 0, GMRequestMethodGET = 0,
GMRequestMethodPOST = 1, GMRequestMethodPOST = 1,
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#import "GMToFaceNetworking.h" #import "GMToFaceNetworking.h"
#import "RequestHeader.h" #import "RequestHeader.h"
#import <GMKit/GMSafeValue.h>
@implementation GMToFaceNetworking @implementation GMToFaceNetworking
......
...@@ -32,8 +32,8 @@ ...@@ -32,8 +32,8 @@
#define dispatchAllHeight (522 + UIView.safeAreaInsetsBottom) #define dispatchAllHeight (522 + UIView.safeAreaInsetsBottom)
#define dispatchHalfHeight (286 + UIView.safeAreaInsetsBottom) #define dispatchHalfHeight (286 + UIView.safeAreaInsetsBottom)
@interface GMBasicInfoCardView ()<WKWebViewDelegate> @interface GMBasicInfoCardView ()<WKBaseWebViewDelegate>
@property (nonatomic, strong) GMWebViewComponent *webCompent; @property (nonatomic, strong) GMBaseWebViewComponent *webCompent;
@property (nonatomic, strong) GMVideoWaitingView *waitingView; @property (nonatomic, strong) GMVideoWaitingView *waitingView;
@property (nonatomic, assign) int currentTime; @property (nonatomic, assign) int currentTime;
@property (nonatomic, copy) NSString *traceId; @property (nonatomic, copy) NSString *traceId;
...@@ -413,9 +413,9 @@ ...@@ -413,9 +413,9 @@
[GMVideoPhobos video_monitoringWithActionStep:str consultId:nil traceId:self.traceId]; [GMVideoPhobos video_monitoringWithActionStep:str consultId:nil traceId:self.traceId];
} }
- (GMWebViewComponent *)webCompent { - (GMBaseWebViewComponent *)webCompent {
if (!_webCompent) { if (!_webCompent) {
_webCompent = [GMWebViewComponent new]; _webCompent = [GMBaseWebViewComponent new];
_webCompent.delegate = self; _webCompent.delegate = self;
} }
if (!_webCompent.superview) { if (!_webCompent.superview) {
......
...@@ -6,10 +6,10 @@ ...@@ -6,10 +6,10 @@
// Copyright © 2020 更美互动信息科技有限公司. All rights reserved. // Copyright © 2020 更美互动信息科技有限公司. All rights reserved.
// //
#import "GMBaseWebViewController.h" #import "GMWebViewController.h"
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
@interface GMTofaceOrderDetailViewController : GMBaseWebViewController @interface GMTofaceOrderDetailViewController : GMWebViewController
// 面诊记录Id // 面诊记录Id
@property (nonatomic, copy) NSString *recordId; @property (nonatomic, copy) NSString *recordId;
// 订单编号 // 订单编号
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#import <GMBaseWeb/GMBaseWeb-Swift.h> #import <GMBaseWeb/GMBaseWeb-Swift.h>
#import <WebKit/WebKit.h> #import <WebKit/WebKit.h>
@import GMHud; @import GMHud;
@interface GMTofaceOrderDetailViewController () <WKWebViewDelegate> @interface GMTofaceOrderDetailViewController () <WKBaseWebViewDelegate>
@property (nonatomic, strong) GMComplaintObject *complaintObject; @property (nonatomic, strong) GMComplaintObject *complaintObject;
@end @end
......
...@@ -6,9 +6,12 @@ ...@@ -6,9 +6,12 @@
// Copyright © 2019 更美互动信息科技有限公司. All rights reserved. // Copyright © 2019 更美互动信息科技有限公司. All rights reserved.
// //
#import "GMLibraryHeader.h" #import "GMLibraryHeader.h"
@protocol GMSearchNavigationViewDelegate; @protocol GMAISearchNavigationViewDelegate <NSObject>
- (void)searchNavigationCancelButtonClick;
@end
@interface GMAISearchNavigationView : GMView @interface GMAISearchNavigationView : GMView
@property (nonatomic, assign) id<GMSearchNavigationViewDelegate> delegate; @property (nonatomic, assign) id<GMAISearchNavigationViewDelegate> delegate;
@property (nonatomic, assign) BOOL showCancelButton; @property (nonatomic, assign) BOOL showCancelButton;
@property (nonatomic, strong) UITextField *textField; @property (nonatomic, strong) UITextField *textField;
...@@ -20,7 +23,3 @@ ...@@ -20,7 +23,3 @@
- (BOOL)becomeFirstResponder; - (BOOL)becomeFirstResponder;
- (BOOL)resignFirstResponder; - (BOOL)resignFirstResponder;
@end @end
@protocol GMSearchNavigationViewDelegate <NSObject>
- (void)searchNavigationCancelButtonClick;
@end
...@@ -5,9 +5,10 @@ ...@@ -5,9 +5,10 @@
// Created by Jessica on 2020/3/9. // Created by Jessica on 2020/3/9.
// Copyright © 2020 更美互动信息科技有限公司. All rights reserved. // Copyright © 2020 更美互动信息科技有限公司. All rights reserved.
// //
#import "Lottie.h"
#import "GMLibraryHeader.h" #import "GMLibraryHeader.h"
@class LOTAnimationView;
@interface GMGrabLoadingAnimaitionView : GMView @interface GMGrabLoadingAnimaitionView : GMView
@property (nonatomic, strong) LOTAnimationView *animationView; @property (nonatomic, strong) LOTAnimationView *animationView;
@end @end
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#import "GMGrabLoadingView.h" #import "GMGrabLoadingView.h"
#import "GMTelephoneProxy.h" #import "GMTelephoneProxy.h"
#import <Lottie/Lottie.h>
@interface GMGrabLoadingAnimaitionView() @interface GMGrabLoadingAnimaitionView()
@property (nonatomic, strong) UILabel *textLabel; @property (nonatomic, strong) UILabel *textLabel;
......
...@@ -6,11 +6,11 @@ ...@@ -6,11 +6,11 @@
// Copyright © 2020 更美互动信息科技有限公司. All rights reserved. // Copyright © 2020 更美互动信息科技有限公司. All rights reserved.
// //
#import "GMBaseWebViewController.h" #import "GMWebViewController.h"
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
@interface GMBusinessReportListController : GMBaseWebViewController @interface GMBusinessReportListController : GMWebViewController
@property (nonatomic, copy) NSString *doctorId; @property (nonatomic, copy) NSString *doctorId;
@property (nonatomic, copy) NSString *counsellorId; @property (nonatomic, copy) NSString *counsellorId;
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#import <GMFoundation/GMFoundation-umbrella.h> #import <GMFoundation/GMFoundation-umbrella.h>
@import GMNetworking; @import GMNetworking;
@import WebKit.WKWebView; @import WebKit.WKWebView;
@interface GMBusinessReportListController () <WKWebViewDelegate> @interface GMBusinessReportListController () <WKBaseWebViewDelegate>
@end @end
......
...@@ -6,11 +6,11 @@ ...@@ -6,11 +6,11 @@
// Copyright © 2020 更美互动信息科技有限公司. All rights reserved. // Copyright © 2020 更美互动信息科技有限公司. All rights reserved.
// //
#import "GMBaseWebViewController.h" #import "GMWebViewController.h"
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
@interface GMBusinessReportResultController : GMBaseWebViewController @interface GMBusinessReportResultController : GMWebViewController
@property (nonatomic, copy) NSString *recordId; @property (nonatomic, copy) NSString *recordId;
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#import "QiniuSDK.h" #import "QiniuSDK.h"
#import "RequestHeader.h" #import "RequestHeader.h"
#import "GMAIUploadImagesManager.h" #import "GMAIUploadImagesManager.h"
//#import "GMUploadImagesManager.h"
#import <GMBaseWeb/GMBaseWeb-Swift.h> #import <GMBaseWeb/GMBaseWeb-Swift.h>
#import <GMbase/GMBaseTool.h> #import <GMbase/GMBaseTool.h>
...@@ -17,7 +18,7 @@ ...@@ -17,7 +18,7 @@
@import GMNetworking; @import GMNetworking;
@import GMFoundation; @import GMFoundation;
@import GMAlbum; @import GMAlbum;
@interface GMBusinessReportResultController () <WKWebViewDelegate> @interface GMBusinessReportResultController () <WKBaseWebViewDelegate>
@property (nonatomic, strong) UIImage *shareImage; @property (nonatomic, strong) UIImage *shareImage;
@property (nonatomic, copy) NSString *shareUserId; @property (nonatomic, copy) NSString *shareUserId;
...@@ -57,7 +58,7 @@ ...@@ -57,7 +58,7 @@
self.shareUserId = SafeString(dict[@"userId"]); self.shareUserId = SafeString(dict[@"userId"]);
self.shareImage = [UIImage imageWithData:[[NSData alloc] initWithBase64EncodedString:imageString options:NSDataBase64DecodingIgnoreUnknownCharacters]]; self.shareImage = [UIImage imageWithData:[[NSData alloc] initWithBase64EncodedString:imageString options:NSDataBase64DecodingIgnoreUnknownCharacters]];
__block NSString *key = [[GMAIUploadImagesManager shareInstance] createImagePath]; __block NSString *key = [[GMAIUploadImagesManager shareInstance] createImagePath];
[[GMAIUploadImagesManager shareInstance] getTokenWithType:GMTokenTypeImage resultBlock:^(BOOL result, NSString *message) { [[GMAIUploadImagesManager shareInstance] getTokenWithType:GMAITokenTypeImage resultBlock:^(BOOL result, NSString *message) {
if (result) { if (result) {
NSData *imageData = UIImageJPEGRepresentation(self.shareImage, 1); NSData *imageData = UIImageJPEGRepresentation(self.shareImage, 1);
QNUploadManager *upManager = [[QNUploadManager alloc] init]; QNUploadManager *upManager = [[QNUploadManager alloc] init];
......
...@@ -6,11 +6,11 @@ ...@@ -6,11 +6,11 @@
// Copyright © 2020 更美互动信息科技有限公司. All rights reserved. // Copyright © 2020 更美互动信息科技有限公司. All rights reserved.
// //
#import "GMBaseWebViewController.h" #import "GMWebViewController.h"
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
@interface GMDiagnoseRecordWebViewController : GMBaseWebViewController @interface GMDiagnoseRecordWebViewController : GMWebViewController
@end @end
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
@end @end
@implementation GMViewEvaluateModel @end @implementation GMViewEvaluateModel @end
@interface GMDiagnoseRecordWebViewController () <WKWebViewDelegate> @interface GMDiagnoseRecordWebViewController () <WKBaseWebViewDelegate>
@property (nonatomic, strong) GMComplaintObject *complaintObject; @property (nonatomic, strong) GMComplaintObject *complaintObject;
@property (nonatomic, assign) BOOL isSureOrder; @property (nonatomic, assign) BOOL isSureOrder;
......
#import <Foundation/Foundation.h>
#import <UIKit/UIKit.h>
#import "TTTPlayerOptions.h"
/**
TTTPlayer 的播放状态
*/
typedef NS_ENUM(NSInteger, TTTPlayerStatus) {
/**
未知状态,只会作为 init 后的初始状态,开始播放之后任何情况下都不会再回到此状态。
*/
TTTPlayerStatusUnknow = 0,
/**
正在准备播放所需组件,在调用 play 方法时出现。
*/
TTTPlayerStatusPreparing,
/**
播放组件准备完成,准备开始播放,在调用 play 方法时出现。
*/
TTTPlayerStatusReady,
/**
TTTPlayer 缓存数据为空状态
*/
TTTPlayerStatusCaching,
/**
正在播放状态
*/
TTTPlayerStatusPlaying,
/**
暂停状态
*/
TTTPlayerStatusPaused,
/**
停止状态
该状态仅会在回放时播放结束出现,RTMP 直播结束并不会出现此状态
*/
TTTPlayerStatusStopped,
/**
错误状态,播放出现错误时会出现此状态。
*/
TTTPlayerStatusError
};
/**
TTTPlayer 的统计信息类
*/
@interface TTTPlayerStatsInfo : NSObject
@property (nonatomic, assign) int frameRate; // 帧率(fps)
@property (nonatomic, assign) int videoBitrate; // 视频的码率(kbps)
@property (nonatomic, assign) int audioBitrate; // 音频的码率(kbps)
@property (nonatomic, assign) int width; // 视频宽
@property (nonatomic, assign) int height; // 视频高
@property (nonatomic, assign) int audioDelay; // 音频延迟(ms)
@property (nonatomic, assign) int videoDelay; // 视频延迟(ms)
@end
@protocol TTTPlayerDelegate;
/**
TTTPlayer 是 TTTPlayerKit 中负责播放控制的核心类
*/
@interface TTTPlayer : NSObject
/**
代理对象,用于告知播放器状态改变或其他行为,对象需实现 TTTPlayerDelegate 协议
*/
@property (nonatomic, weak) id<TTTPlayerDelegate> delegate;
/**
TTTPlayer 的 options 对象
*/
@property (nonatomic, strong, readonly) TTTPlayerOptions *options;
/**
TTTPlayer 的画面输出到该 UIView 对象
*/
@property (nonatomic, strong, readonly) UIView *playerView;
/**
TTTPlayer 的播放状态
*/
@property (nonatomic, assign, readonly) TTTPlayerStatus status;
/**
指示当前 TTTPlayer 是否处于正在播放状态
*/
@property (nonatomic, assign, readonly, getter=isPlaying) BOOL playing;
/**
TTTPlayer 的当前播放时间
*/
@property (nonatomic, assign, readonly) NSTimeInterval currentTime;
/**
TTTPlayer 的总播放时间
*/
@property (nonatomic, assign, readonly) NSTimeInterval totalDuration;
/**
使用 URL 和 options 生成一个 TTTPlayer 对象
@param URL 需要播放的 URL
@param options 播放器初始化选项,传入 nil 值将按照默认选项进行初始化
@return 生成的 TTTPlayer 对象
*/
+ (instancetype)playerWithURL:(NSURL *)URL options:(TTTPlayerOptions *)options;
/**
使用 url 和 option 初始化一个 TTTPlayer 对象
@param URL 需要播放的 URL
@param options 播放器初始化选项,传入 nil 值将按照默认选项进行初始化
@return 初始化后的 TTTPlayer 对象
*/
- (instancetype)initWithURL:(NSURL *)URL options:(TTTPlayerOptions *)options;
/**
开始播放
*/
- (void)play;
/**
当播放器处于暂停状态时调用该方法可以使播放器继续播放
*/
- (void)resume;
/**
当播放器处于 playing 或 caching 状态时调用该方法可以暂停播放器
*/
- (void)pause;
/**
停止播放
*/
- (void)stop;
/**
快速定位到指定播放时间点,该方法仅在回放时起作用,直播场景下该方法直接返回
*/
- (void)seekTo:(NSTimeInterval)time;
/**
调节播放音量
@param volume 0-100
*/
- (void)setPlaybackVolume:(int)volume;
- (UIImage *)thumbnailImageAtCurrentTime;
#pragma mark - KTV
/**
KTV场景再play之前调用该接口
*/
- (void)prepareForKTV;
/**
调节KTV播放音量
@param volume 0-100
*/
- (void)adjustKTVVolume:(int)volume;
/**
* 拉取KTV音频数据
*
* @param data 数据地址
* @param size 数据长度
* @param sampleRate 采样率
* @param channels 声道数
*/
- (void)pullKTVAudioData:(char *)data size:(int)size sampleRate:(int)sampleRate channels:(int)channels;
+ (NSString *)getVersion;
@end
/**
TTTPlayer 的代理协议
*/
@protocol TTTPlayerDelegate <NSObject>
@optional;
/**
告知代理对象播放器状态变更
@param player 调用该方法的 TTTPlayer 对象
@param playerStatus 变更之后的 TTTPlayer 状态
*/
- (void)player:(TTTPlayer *)player statusDidChange:(TTTPlayerStatus)playerStatus;
/**
告知代理对象播放器因错误停止播放
@param player 调用该方法的 TTTPlayer 对象
@param error 携带播放器停止播放错误信息的 NSError 对象
*/
- (void)player:(TTTPlayer *)player stoppedWithError:(NSError *)error;
/**
告知代理对象播放器统计信息(每2秒触发一次)
@param player 调用该方法的 TTTPlayer 对象
@param statsInfo 统计信息
*/
- (void)player:(TTTPlayer *)player statsInfo:(TTTPlayerStatsInfo *)statsInfo;
/**
告知代理对象播放器H264SEI
@param player 调用该方法的 TTTPlayer 对象
@param sei H264SEI
*/
- (void)player:(TTTPlayer *)player playbackH264SEI:(NSString *)sei;
/**
告知代理对象播放器H264SEI中的音量信息
@param player 调用该方法的 TTTPlayer 对象
@param volInfo 音量信息
*/
- (void)player:(TTTPlayer *)player playbackVolInfo:(NSArray<NSDictionary *> *)volInfo;
/**
* 视频第一帧解码成功
*/
- (void)playerVideoDecoderOpen:(TTTPlayer *)player;
- (void)playerVideoFrameRenderedStart:(TTTPlayer *)player;
- (void)playerRenderOverlay:(TTTPlayer *)player;
#pragma mark - KTV
/**
回调KTV视频数据信息
@param player 调用该方法的 TTTPlayer 对象
@param data 420P数据
@param width 视频宽
@param height 视频高
*/
- (void)player:(TTTPlayer *)player videoData:(NSData *)data width:(int)width height:(int)height;
/**
回调KTV音频数据信息
@param player 调用该方法的 TTTPlayer 对象
@param data 音频数据
*/
- (void)player:(TTTPlayer *)player audioData:(NSData *)data;
@end
#import <UIKit/UIKit.h>
//! Project version number for TTTPlayerKit.
FOUNDATION_EXPORT double TTTPlayerKitVersionNumber;
//! Project version string for TTTPlayerKit.
FOUNDATION_EXPORT const unsigned char TTTPlayerKitVersionString[];
// In this header, you should import all the public headers of your framework using statements like #import <TTTPlayerKit/PublicHeader.h>
#import "TTTPlayer.h"
#import <Foundation/Foundation.h>
#import <MediaPlayer/MediaPlayer.h>
typedef NS_ENUM(NSUInteger, TTTPlayerMovieScalingMode) {
TTTPlayerMovieScalingModeNone, // No scaling
TTTPlayerMovieScalingModeAspectFit, // Uniform scale until one dimension fits
TTTPlayerMovieScalingModeAspectFill, // Uniform scale until the movie fills the visible bounds. One dimension may have clipped contents
TTTPlayerMovieScalingModeFill // Non-uniform scale. Both render dimensions will exactly match the visible bounds
};
/**
TTTPlayer 的可选配置类,在初始化 TTTPlayer 对象的时候传入其实例进行 TTTPlayer 的可选项配置
*/
@interface TTTPlayerOptions : NSObject
@property (nonatomic, assign) TTTPlayerMovieScalingMode movieScalingMode;
/**
使用默认配置生成一个 TTTPlayerOption 对象
*/
+ (nonnull TTTPlayerOptions *)defaultOptions;
@end
framework module TTTPlayerKit {
umbrella header "TTTPlayerKit.h"
export *
module * { export * }
}
framework module TTTRtcEngineKit {
umbrella header "TTTRtcEngineKit.h"
export *
module * { export * }
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment