no message

iOS-Xiaowen
1 parent 2865f827
Showing 6 changed files with 209 additions and 5 deletions
CNLiveBUserAgreement.podspec
CNLiveBUserAgreement/Classes/CNLiveUserAgreementController.m
CNLiveBUserAgreement/Classes/CNLiveUserAgreementManager.m
Example/CNLiveBUserAgreement.xcodeproj/project.pbxproj
Example/CNLiveBUserAgreement/CNLIVEViewController.m
Example/Podfile
@@ -51,6 +51,13 @@ TODO: 网家家企业端-用户协议.
   # 基类
   s.dependency 'CNLiveBaseClass'
+  
+  # 相册
+  s.dependency 'CNLiveImagePickerController'
+  
+  # 相机
+  s.dependency 'CNLiveAVCamera'
   s.static_framework = true
+  
 end
@@ -7,15 +7,33 @@
 //
 #import "CNLiveUserAgreementController.h"
+#import "QMUIKit.h"
 #import "WKWebViewJavascriptBridge.h"
+#import <AVFoundation/AVCaptureDevice.h>
+#import <AVFoundation/AVMediaFormat.h>
+#import "XFCameraController.h"
+#import "TZImagePickerController.h"
+#import <CNLiveRequestBastKit/CNLiveNetworking.h>
+#import "CNLiveManager.h"
+
 #import "CNLiveWebView.h"
-@interface CNLiveUserAgreementController ()
+@interface CNLiveUserAgreementController ()<UIImagePickerControllerDelegate,UINavigationControllerDelegate,TZImagePickerControllerDelegate>
+@property (nonatomic, strong) NSMutableArray * images;
 @end
 @implementation CNLiveUserAgreementController
+#define wjjHelpAndFeedbackImage @"wjjHelpAndFeedbackImage"   //帮助与反馈->产品建议:添加照片按钮
+#define wjjSubmitImage          @"wjjSubmitImage"            //帮助与反馈->产品建议:点击提交
+#define wjjDelegateImage        @"wjjDelegateImage"          //帮助与反馈->产品建议:删除照片
+#define wjjSubmitSuccessFinal   @"wjjSubmitSuccessFinal"     //反馈提交(成功/失败)后隐藏loading
+#define wjjFeedbackSuccess      @"wjjFeedbackSuccess"        //帮助与反馈 提交反馈后点击完成
+#define wjjJSGetNetStatusFromClient @"JSGetNetStatusFromClient" //h5主动从客户端获取网络状态
+#define OCSendNetStatusToJS @"OCSendNetStatusToJS" //网络状态变化信息
+#define wjjSubmitSuccess    @"wjjSubmitSuccess"    //帮助与反馈->产品建议:App->h5图片urls
+
 - (void)createSubViews {
     [super createSubViews];
     UIColor *color = [UIColor colorWithRed:72/255.0 green:168/255.0 blue:249/255.0 alpha:1.0];
@@ -24,6 +42,84 @@
 #pragma mark - 交互
 - (void)interaction {
     [super interaction];
+    __weak typeof(self)weakSelf = self;
+    
+    // 帮助与反馈->产品建议:添加照片按钮
+    [self.bridge registerHandler:wjjHelpAndFeedbackImage handler:^(id data, WVJBResponseCallback responseCallback) {
+        NSLog(@"ObjC Echo called with: %@", data);
+        [weakSelf uploadPictures];
+        responseCallback(data);
+    }];
+    
+    // 帮助与反馈->产品建议:删除照片
+    [self.bridge registerHandler:wjjDelegateImage handler:^(id data, WVJBResponseCallback responseCallback) {
+        NSLog(@"ObjC Echo called with: %@", data);
+        if ([data isKindOfClass:[NSDictionary class]]) {
+            NSString *index = [data objectForKey:@"index"];
+            [weakSelf.images removeObjectAtIndex:[index integerValue]];
+        }
+        responseCallback(data);
+    }];
+    
+    //帮助与反馈->产品建议:点击提交
+    [self.bridge registerHandler:wjjSubmitImage handler:^(id data, WVJBResponseCallback responseCallback) {
+        NSLog(@"ObjC Echo called with: %@", data);
+        NSString *text = @"";
+        NSString *mobile = @"";
+        NSString *modeltype = @"";
+        if ([data isKindOfClass:[NSDictionary class]]) {
+            text = [data objectForKey:@"text"];
+            mobile = [data objectForKey:@"mobile"];
+            modeltype = [data objectForKey:@"modeltype"];
+        }
+        if (weakSelf.images.count > 0) {
+//            [weakSelf getimgToken];
+        } else {
+            NSArray *array = [NSArray array];
+            id data = @{ @"images": array };
+            [QMUITips showLoading:@"正在提交" inView:weakSelf.view];
+            // 帮助与反馈->产品建议App->h5图片urls
+            [weakSelf.bridge callHandler:wjjSubmitSuccess data:data responseCallback:^(id responseData) {
+                NSLog(@"ObjC received response: %@", responseData);
+            }];
+        }
+        responseCallback(data);
+    }];
+    
+    // 反馈提交(成功/失败)后隐藏loading
+    [self.bridge registerHandler:wjjSubmitSuccessFinal handler:^(id data, WVJBResponseCallback responseCallback) {
+        NSLog(@"ObjC Echo called with: %@", data);
+        [QMUITips hideAllTipsInView:weakSelf.view];
+        responseCallback(data);
+    }];
+    
+    // 帮助与反馈 提交反馈后点击完成
+    [self.bridge registerHandler:wjjFeedbackSuccess handler:^(id data, WVJBResponseCallback responseCallback) {
+        NSLog(@"ObjC Echo called with: %@", data);
+        [weakSelf.navigationController popViewControllerAnimated:YES];
+        responseCallback(data);
+    }];
+    
+    // h5主动从客户端获取网络状态
+    [self.bridge registerHandler:wjjJSGetNetStatusFromClient handler:^(id data, WVJBResponseCallback responseCallback) {
+        NSLog(@"ObjC Echo called with: %@", data);
+        // 向h5传递网路状态信息
+        NSInteger networkStatus = 0;
+        if (![CNLiveNetworking isNetworking]) {
+            networkStatus = 0;
+        }
+        else if ([CNLiveNetworking isWWANNetwork]) {
+            networkStatus = 1;
+        }
+        else if ([CNLiveNetworking isWiFiNetwork]) {
+            networkStatus = 2;
+        }
+        id answerData = @{ @"netStatus": [NSString stringWithFormat:@"%ld",(long)networkStatus] };
+        [weakSelf.bridge callHandler:OCSendNetStatusToJS data:answerData responseCallback:^(id responseData) {
+            NSLog(@"ObjC received response: %@", responseData);
+        }];
+        responseCallback(data);
+    }];
 }
 #pragma mark - Setter方法
@@ -34,7 +130,6 @@
 #pragma mark - CNLiveWebViewDelegate
 - (void)webView:(CNLiveWebView *)webView didFinishLoadWithURL:(NSURL *)url {
-    NSLog(@"CNLiveUserAgreementController - didFinishLoad");
     if(self.title.length == 0){
         self.title = webView.title;
     }
@@ -44,4 +139,77 @@
 }
+#pragma mark - 添加图片
+- (void)uploadPictures{
+    __weak typeof(self) weakSelf = self;
+    QMUIAlertAction *action1 = [QMUIAlertAction actionWithTitle:@"拍照" style:QMUIAlertActionStyleDefault handler:^(__kindof QMUIAlertController *aAlertController, QMUIAlertAction *action) {
+        __strong typeof(weakSelf) strongSelf = weakSelf;
+        if(!strongSelf) return ;
+        __strong typeof(strongSelf) weakSelf = strongSelf;
+        [CNLiveAuthorizationManager getAVAuthorizationStatus:^{
+            __strong typeof(weakSelf) strongSelf = weakSelf;
+            if(!strongSelf) return ;
+            XFCameraController *cameraController = [[XFCameraController alloc] init];
+            cameraController.isCanShootVideo = NO;
+            cameraController.modalPresentationStyle = UIModalPresentationFullScreen;
+            __weak XFCameraController *weakCameraController = cameraController;
+            __weak typeof(strongSelf) weakSelf = strongSelf;
+            cameraController.takePhotosCompletionBlock = ^(UIImage *image, NSError *error) {
+                __strong typeof(weakSelf) strongSelf = weakSelf;
+                if(!strongSelf) return ;
+                [strongSelf.images addObject:image];
+                dispatch_async(dispatch_get_main_queue(), ^{
+                    [weakCameraController dismissViewControllerAnimated:YES completion:nil];
+                });
+            };
+            [strongSelf presentViewController:cameraController animated:YES completion:nil];
+        }];
+
+    }];
+    QMUIAlertAction *action2 = [QMUIAlertAction actionWithTitle:@"从手机相册中选择" style:QMUIAlertActionStyleDefault handler:^(__kindof QMUIAlertController *aAlertController, QMUIAlertAction *action) {
+        __strong typeof(weakSelf) strongSelf = weakSelf;
+        if(!strongSelf) return ;
+        __strong typeof(strongSelf) weakSelf = strongSelf;
+        [CNLiveAuthorizationManager getPHAuthorizationStatus:^{
+            __strong typeof(weakSelf) strongSelf = weakSelf;
+            if(!strongSelf) return ;
+            TZImagePickerController *picker = [[TZImagePickerController alloc] initWithMaxImagesCount:1 delegate:strongSelf];
+            picker.modalPresentationStyle = UIModalPresentationFullScreen;
+            picker.allowPickingVideo = NO;
+            picker.allowPreview = NO;
+            __weak typeof(strongSelf) weakSelf = strongSelf;
+            [picker setDidFinishPickingPhotosHandle:^(NSArray<UIImage *> *photos, NSArray *assets, BOOL isSelectOriginalPhoto) {
+                __strong typeof(weakSelf) strongSelf = weakSelf;
+                if(!strongSelf) return ;
+                [strongSelf.images addObject:[photos firstObject]];
+            }];
+            [strongSelf presentViewController:picker animated:YES completion:nil];
+        }];
+
+    }];
+    QMUIAlertAction *cancel = [QMUIAlertAction actionWithTitle:@"取消" style:QMUIAlertActionStyleCancel handler:^(__kindof QMUIAlertController *aAlertController, QMUIAlertAction *action) {
+          __strong typeof(weakSelf) strongSelf = weakSelf;
+          if(!strongSelf) return ;
+
+      }];
+           
+    QMUIAlertController *alertController = [QMUIAlertController alertControllerWithTitle:@"" message:@"" preferredStyle:QMUIAlertControllerStyleActionSheet];
+    [alertController addAction:action1];
+    [alertController addAction:action2];
+    [alertController addAction:cancel];
+    
+    NSMutableDictionary *titleAttributs = [[NSMutableDictionary alloc] initWithDictionary:alertController.alertTitleAttributes];
+    titleAttributs[NSForegroundColorAttributeName] = [UIColor colorWithRed:72/255.0 green:168/255.0 blue:249/255.0 alpha:1.0];
+    
+    NSMutableDictionary *cancelAttributs = [[NSMutableDictionary alloc] initWithDictionary:alertController.alertTitleAttributes];
+    cancelAttributs[NSForegroundColorAttributeName] = [UIColor colorWithRed:51/255.0 green:51/255.0 blue:51/255.0 alpha:1.0];
+
+    action1.buttonAttributes = titleAttributs;
+    action2.buttonAttributes = titleAttributs;
+    cancel.buttonAttributes = cancelAttributs;
+
+    [alertController showWithAnimated:YES];
+
+}
+
 @end
@@ -64,7 +64,7 @@ static CNLiveUserAgreementManager *_instance = nil;
         }
         else{
             if ([responseObject isKindOfClass:[NSArray class]]) {
-                BOOL closeHidden = NO;
+                BOOL closeHidden = YES;
                 for (NSDictionary *dic in responseObject) {
                     switch (type) {
@@ -102,7 +102,7 @@ static CNLiveUserAgreementManager *_instance = nil;
                         {
                             if ([[NSString stringWithFormat:@"%@",dic[@"type"]] isEqualToString:@"bzfk"]) {
                                 if (success) {
-                                    success(dic[@"detailUrl"], dic[@"title"], closeHidden);
+                                    success(dic[@"detailUrl"], dic[@"title"], !closeHidden);
                                     return ;
                                 }
                             }
@@ -307,32 +307,58 @@
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-CNLiveBUserAgreement_Example/Pods-CNLiveBUserAgreement_Example-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveAVCamera/CNLiveAVCamera.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveBaseClass/CNLiveBaseClass.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveBaseKit/CNLiveBaseKit.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveBaseTools/CNLiveBaseTools.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveBusinessTools/CNLiveBusinessTools.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCategory/CNLiveCategory.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveCommonCategory/CNLiveCommonCategory.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCustomControl/CNLiveCustomControl.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveImagePickerController/CNLiveImagePickerController.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveManager/CNLiveManager.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveTripartiteManagement/CNLiveTripartiteManagement.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveUploadManager/CNLiveUploadManager.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveUserManagement/CNLiveUserManagement.framework",
+				"${BUILT_PRODUCTS_DIR}/HappyDNS/HappyDNS.framework",
 				"${BUILT_PRODUCTS_DIR}/MJExtension/MJExtension.framework",
 				"${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework",
 				"${BUILT_PRODUCTS_DIR}/QMUIKit/QMUIKit.framework",
+				"${BUILT_PRODUCTS_DIR}/Qiniu/Qiniu.framework",
+				"${BUILT_PRODUCTS_DIR}/SDAutoLayout/SDAutoLayout.framework",
+				"${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
 				"${BUILT_PRODUCTS_DIR}/WebViewJavascriptBridge/WebViewJavascriptBridge.framework",
+				"${BUILT_PRODUCTS_DIR}/YYKit/YYKit.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveAVCamera.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseClass.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseKit.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseTools.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBusinessTools.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCategory.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonCategory.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCustomControl.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveImagePickerController.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveManager.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveTripartiteManagement.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUploadManager.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserManagement.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/HappyDNS.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJExtension.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Masonry.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/QMUIKit.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Qiniu.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDAutoLayout.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WebViewJavascriptBridge.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYKit.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -32,7 +32,7 @@
 }
 - (void)testButtonClicked {
-    [CNLiveUserAgreementManager jumpToAgreementH5WithType:CNLiveUserAgreementCancellation];
+    [CNLiveUserAgreementManager jumpToAgreementH5WithType:CNLiveUserAgreementHelp];
 }
@@ -5,6 +5,9 @@ use_frameworks!
 platform :ios, '9.0'
 target 'CNLiveBUserAgreement_Example' do
   pod 'CNLiveBUserAgreement', :path => '../'
+  #依赖三方私有库,如果里面有.a的时候加上这个
+  pre_install do |installer| Pod::Installer::Xcode::TargetValidator.send(:define_method, :verify_no_static_framework_transitive_dependencies) {}
+  end
   target 'CNLiveBUserAgreement_Tests' do
     inherit! :search_paths