提交0.0.7

梁星国
1 parent b5c66744
Showing 7 changed files with 192 additions and 22 deletions
CNLiveServiceCenterModule.podspec
CNLiveServiceCenterModule/Classes/CNLiveServiceCenterModule/Controller/CNLiveBCreatorViewController.h
CNLiveServiceCenterModule/Classes/CNLiveServiceCenterModule/Controller/CNLiveBCreatorViewController.m
CNLiveServiceCenterModule/Classes/CNLiveServiceCenterModule/Controller/CNLiveBServiceCenterController.m
Example/CNLiveServiceCenterModule/Base.lproj/LaunchScreen.storyboard
Example/CNLiveServiceCenterModule/Base.lproj/Main.storyboard
Example/CNLiveServiceCenterModule/CNLIVEBAppDelegate.m
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
     s.name             = 'CNLiveServiceCenterModule'
-    s.version          = '0.0.6'
+    s.version          = '0.0.7'
     s.summary          = '网家家企业端服务中心模块'
     # This description is used to generate tags and improve search results.
@@ -81,6 +81,8 @@ Pod::Spec.new do |s|
     ###    所有github三方管理库(非频繁更新)
     ########################################
     s.dependency  'CNLiveTripartiteManagement'
+    
+    #TODO:后面都注释掉直接在主工程导入
     #认证模块
     s.dependency  'CNLiveOrganizationValidationModule'
     #用户认证模块
+//
+//  CNLiveBCreatorViewController.h
+//  CNLiveBPersonalVerificationModule
+//
+//  Created by 梁星国 on 2020/4/20.
+//
+
+#import <UIKit/UIKit.h>
+#import <CNLiveBusinessBaseModule/CNLiveBusinessBaseModule.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface CNLiveBCreatorViewController : CNCommonViewController
+
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  CNLiveBCreatorViewController.m
+//  CNLiveBPersonalVerificationModule
+//
+//  Created by 梁星国 on 2020/4/20.
+//
+
+#import "CNLiveBCreatorViewController.h"
+#import <WebKit/WebKit.h>
+#import <CNLiveEnvironment/CNLiveEnvironment.h>
+#import <CNLiveRequestBastKit/CNLiveNetworkRequest.h>
+#import <CNLiveRequestBastKit/CNLiveNetworking.h>
+#import <CNLiveUserManagement/CNUserInfoManager.h>
+#import <CNLiveBeeHive/CNLiveBeeHive.h>
+#import <MJExtension/MJExtension.h>
+#import <QMUIKit/QMUIKit.h>
+#import <YYKit/YYKit.h>
+#import <objc/runtime.h>
+#import <CNLiveBaseKit/CNLiveBaseKit.h>
+
+//http://wjjh5.cnlive.com/cnBCzzxy.html
+//http://wjjh5test.cnlive.com/cnBCzzxy.html
+
+
+#define CNLiveBCenterCreaterUrl cn_WjjH5_Host(@"/cnBCzzxy.html")
+
+@interface CNLiveBCreatorViewController ()<WKNavigationDelegate,WKUIDelegate,UIScrollViewDelegate>
+
+@property (strong, nonatomic) WKWebView *wkwebView;
+
+@property (strong, nonatomic) NSString *url;
+
+@end
+
+@implementation CNLiveBCreatorViewController
+
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    self.title = @"创作者学院";
+    [self.view setBackgroundColor:[UIColor whiteColor]];
+    [self initWKWebView];
+    
+    
+}
+
+-(void)initWKWebView
+{
+    self.view.backgroundColor = [UIColor whiteColor];
+    self.url = CNLiveBCenterCreaterUrl;
+    WKWebView *webView = [[WKWebView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, KScreenHeight)];
+    self.view = webView;
+    NSURL *url = [NSURL URLWithString:self.url];
+    NSURLRequest *request = [NSURLRequest requestWithURL:url];
+    [webView loadRequest:request];
+
+    
+}
+
+
+
+
+
+
+@end
@@ -22,6 +22,8 @@
 #import <YYKit/YYKit.h>
 #import <QMUIKit/QMUIKit.h>
 #import <CNLiveBServices/CNLiveBPersonAuthentProtocol.h>
+#import <CNLiveBServices/CNLiveBMineServiceProtocol.h>
+#import "CNLiveBCreatorViewController.h"
 #define CNLiveBGetServiceStatusUrl          cn_API_OpenApi2(@"/user/readWJJBStatusById")
 #define CNLiveBOrganizationValidattionStatusUrl        cn_API_OpenApi2(@"/auser/getAccount.action")
@@ -112,15 +114,18 @@
 #pragma mark - TODO:获取用户信息显示
     [self.headerView configUIWithIsPerson:self.personStatus isEnterprise:self.institutionStatus];
+    __weak typeof(self) weakSelf = self;
     self.headerView.clickUserImageVBlock = ^(CNLiveBServiceCenterHeaderView * _Nonnull view, UIImageView * _Nonnull userImageV) {
         NSLog(@"点击-用户头像");
+        [weakSelf jumpPersonVC];
     };
     self.headerView.clickUserNameLBlock = ^(CNLiveBServiceCenterHeaderView * _Nonnull view, UILabel * _Nonnull userNameL) {
         NSLog(@"点击-用户名字");
+        [weakSelf jumpPersonVC];
     };
-    __weak typeof(self) weakSelf = self;
+
     self.headerView.clickEnterViewBlock = ^(CNLiveBServiceCenterHeaderView * _Nonnull view, CNLiveBCenterAuthEnterView * _Nonnull enterView) {
         NSLog(@"点击-用户认证进入");
         [weakSelf  checkPersonCertification];
@@ -252,11 +257,17 @@
     if (indexPath.section == 0) {
         if (indexPath.row == 0){
+            
             [self checkPersonCertification];
+            
         }else if (indexPath.row == 1) {
             [self checkAccreditedInstitution];
+        }else if (indexPath.row == 2) {
+            
+            [self jumpCreaterVC];
+            
         }
     }
@@ -280,8 +291,21 @@
-#pragma mark - TODO:
 #pragma mark - *** 事件实现 ***
+///跳转个人
+- (void)jumpPersonVC {
+    /// 详情页
+    id<CNLiveBMineServiceProtocol> organizationValidationProtocol = [[BeeHive shareInstance] createService:@protocol(CNLiveBMineServiceProtocol)];
+    UIViewController *vc = [organizationValidationProtocol getUserInfoViewController];
+    [self setHidesBottomBarWhenPushed:YES];
+    [self.navigationController pushViewController:vc animated:YES];
+}
+///跳转创作者
+- (void)jumpCreaterVC {
+    CNLiveBCreatorViewController *vc = [[CNLiveBCreatorViewController alloc]init];
+    [self setHidesBottomBarWhenPushed:YES];
+    [self.navigationController pushViewController:vc animated:YES];
+}
@@ -291,7 +315,6 @@
 /// 获取用户认证状态
 - (void)loadStatus{
-#pragma mark - TODO:请求路径刷新
     NSString *strUrl = CNLiveBGetServiceStatusUrl;
     NSString *appId = [NSString stringWithFormat:@"%@",AppId];
@@ -386,6 +409,7 @@
                         ///  填表页
                         id<CNLiveBPersonAuthentProtocol> personProtocol = [[BeeHive shareInstance] createService:@protocol(CNLiveBPersonAuthentProtocol)];
                         UIViewController *vc = [personProtocol pushToPersonalCertificationStatusController:dicContent];
+                        [self setHidesBottomBarWhenPushed:YES];
                         [self.navigationController pushViewController:vc animated:YES];
                         isEnter = YES;
@@ -394,6 +418,7 @@
                         ///  填表页
                         id<CNLiveBPersonAuthentProtocol> personProtocol = [[BeeHive shareInstance] createService:@protocol(CNLiveBPersonAuthentProtocol)];
                         UIViewController *vc = [personProtocol pushToPersonalAuthenticationSuccessController:dicContent];
+                        [self setHidesBottomBarWhenPushed:YES];
                         [self.navigationController pushViewController:vc animated:YES];
@@ -401,6 +426,7 @@
                     }else if ([ischeckStatusStr isEqualToString:@"2"]) {//审核中
                         id<CNLiveBPersonAuthentProtocol> personProtocol = [[BeeHive shareInstance] createService:@protocol(CNLiveBPersonAuthentProtocol)];
                         UIViewController *vc = [personProtocol pushToPersonalCertificationStatusController:dicContent];
+                        [self setHidesBottomBarWhenPushed:YES];
                         [self.navigationController pushViewController:vc animated:YES];
@@ -409,8 +435,8 @@
                     }else if ([ischeckStatusStr isEqualToString:@"3"]) {//审核失败
                         id<CNLiveBPersonAuthentProtocol> personProtocol = [[BeeHive shareInstance] createService:@protocol(CNLiveBPersonAuthentProtocol)];
                         UIViewController *vc = [personProtocol pushToPersonalCertificationStatusController:dicContent];
+                        [self setHidesBottomBarWhenPushed:YES];
                         [self.navigationController pushViewController:vc animated:YES];
-                        
                         isEnter = YES;
                     }
@@ -439,7 +465,7 @@
 }
-
+/// 检查机构认证状态
 - (void)checkAccreditedInstitution {
@@ -479,35 +505,48 @@
                         ///  填表页
                         id<CNLiveBOrganizationValidationProtocol> organizationValidationProtocol = [[BeeHive shareInstance] createService:@protocol(CNLiveBOrganizationValidationProtocol)];
                         UIViewController *vc = [organizationValidationProtocol getOrganizationValidationController:dicContent];
+                        [self setHidesBottomBarWhenPushed:YES];
                         [self.navigationController pushViewController:vc animated:YES];
+
                         isEnter = YES;
                     }else if ([isCertificationStr isEqualToString:@"1"]) {
                         /// 详情页
                         id<CNLiveBOrganizationValidationProtocol> organizationValidationProtocol = [[BeeHive shareInstance] createService:@protocol(CNLiveBOrganizationValidationProtocol)];
                         UIViewController *vc = [organizationValidationProtocol getOrganizationDetailController:dicContent];
+                        
+                        [self setHidesBottomBarWhenPushed:YES];
                         [self.navigationController pushViewController:vc animated:YES];
+    
                         isEnter = YES;
                     }else if ([isCertificationStr isEqualToString:@"2"]) {
-#pragma mark - TODO:  测试先用
                         /// 详情页
                         id<CNLiveBOrganizationValidationProtocol> organizationValidationProtocol = [[BeeHive shareInstance] createService:@protocol(CNLiveBOrganizationValidationProtocol)];
-                        UIViewController *vc = [organizationValidationProtocol getOrganizationDetailController:dicContent];
-                        [self.navigationController pushViewController:vc animated:YES];
+                        UIViewController *vc = [organizationValidationProtocol getOrganizationAuditController:dicContent];
+                        [self setHidesBottomBarWhenPushed:YES];
+                        [self.navigationController pushViewController:vc animated:YES];
                         isEnter = YES;
                     }
                 }
             }
             if (!isEnter) {
-#pragma mark - TODO:弹框
-                ///弹框
+                [QMUITips showError:err.domain inView:[UIApplication sharedApplication].keyWindow hideAfterDelay:0.5];//@"上传失败"
             }
         }else {
+            if (error) {
+                if (error.code == -1001 || error.code == -1009) {
+                    [QMUITips showError:@"网络连接已断开" inView:[UIApplication sharedApplication].keyWindow hideAfterDelay:1.5];
+                }else {
+                    [QMUITips showError:error.domain inView:[UIApplication sharedApplication].keyWindow hideAfterDelay:1.5];//@"上传失败"
+                }
+                return;
+            }
+            
         }
     }];
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -25,7 +23,26 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="53" y="375"/>
+            <point key="canvasLocation" x="370" y="-933"/>
+        </scene>
+        <!--Item 2-->
+        <scene sceneID="F9M-VM-WxF">
+            <objects>
+                <viewController id="Rwx-eR-8bd" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="TED-8L-hd6"/>
+                        <viewControllerLayoutGuide type="bottom" id="lNi-WU-LlF"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="zz4-Hw-x70">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                    </view>
+                    <tabBarItem key="tabBarItem" title="Item 2" id="18v-RL-dPh"/>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="JW1-RX-Gyl" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="-2074" y="-398"/>
         </scene>
     </scenes>
 </document>
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="rWB-m7-oK9">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="GeK-gb-c05">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16086"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
-        <!--Navigation Controller-->
+        <!--Item-->
         <scene sceneID="6pI-4V-wpA">
             <objects>
                 <navigationController id="rWB-m7-oK9" sceneMemberID="viewController">
+                    <tabBarItem key="tabBarItem" title="Item" id="oRi-my-umV"/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="Bhs-dN-KgY">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <connections>
-                        <segue destination="whP-gf-Uak" kind="relationship" relationship="rootViewController" id="wDI-o3-N1c"/>
+                        <segue destination="whP-gf-Uak" kind="relationship" relationship="rootViewController" id="edo-lx-dt4"/>
                     </connections>
                 </navigationController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="P0o-eo-7as" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
@@ -42,5 +43,34 @@
             </objects>
             <point key="canvasLocation" x="305" y="433"/>
         </scene>
+        <!--Item 2-->
+        <scene sceneID="8XJ-Z5-RDK">
+            <objects>
+                <viewController id="Llj-lD-vhl" sceneMemberID="viewController">
+                    <tabBarItem key="tabBarItem" title="Item 2" id="hBK-1Z-tIW"/>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="4gV-Pw-jyQ" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="-404" y="-242"/>
+        </scene>
+        <!--Tab Bar Controller-->
+        <scene sceneID="1S9-vg-hU8">
+            <objects>
+                <tabBarController id="GeK-gb-c05" sceneMemberID="viewController">
+                    <navigationItem key="navigationItem" id="YHU-Bh-Mmw"/>
+                    <tabBar key="tabBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="fUw-0E-E46">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="49"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                    </tabBar>
+                    <connections>
+                        <segue destination="rWB-m7-oK9" kind="relationship" relationship="viewControllers" id="1JN-3Z-6l4"/>
+                        <segue destination="Llj-lD-vhl" kind="relationship" relationship="viewControllers" id="mm5-3y-ckf"/>
+                    </connections>
+                </tabBarController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="1aL-XA-E6P" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="-2033" y="357"/>
+        </scene>
     </scenes>
 </document>
@@ -69,7 +69,7 @@ static NSString * uuid;
     CNUserShareModel.faceUrl = @"http://yweb0.cnliveimg.com/images/headImg/2019/1211/1576034177571_small.jpg";
     CNUserShareModel.nickname = @"";
     CNUserShareModel.mobile = @"15027621766";
-    CNUserShareModel.uid = @"10514581";
+    CNUserShareModel.uid = @"10514506";
 }
 - (NSString *)appUUIDString