iOS Team / CNLiveServiceCenterModule · Commits

Commit 338beb9b5a06f462359d69c22cedd6b8be0dfdd9

Authored by 梁星国
1 parent b5c66744

提交0.0.7

Inline Side-by-side
Showing 7 changed files with 192 additions and 22 deletions
CNLiveServiceCenterModule.podspec
  View file @338beb9
... ... @@ -8,7 +8,7 @@
8 8  
9 9 Pod::Spec.new do |s|
10 10 s.name = 'CNLiveServiceCenterModule'
11   - s.version = '0.0.6'
  11 + s.version = '0.0.7'
12 12 s.summary = '网家家企业端服务中心模块'
13 13  
14 14 # This description is used to generate tags and improve search results.
... ... @@ -81,6 +81,8 @@ Pod::Spec.new do |s|
81 81 ### 所有github三方管理库(非频繁更新)
82 82 ########################################
83 83 s.dependency 'CNLiveTripartiteManagement'
  84 +
  85 + #TODO:后面都注释掉直接在主工程导入
84 86 #认证模块
85 87 s.dependency 'CNLiveOrganizationValidationModule'
86 88 #用户认证模块
... ...
CNLiveServiceCenterModule/Classes/CNLiveServiceCenterModule/Controller/CNLiveBCreatorViewController.h 0 → 100644
  View file @338beb9
  1 +//
  2 +// CNLiveBCreatorViewController.h
  3 +// CNLiveBPersonalVerificationModule
  4 +//
  5 +// Created by 梁星国 on 2020/4/20.
  6 +//
  7 +
  8 +#import <UIKit/UIKit.h>
  9 +#import <CNLiveBusinessBaseModule/CNLiveBusinessBaseModule.h>
  10 +
  11 +NS_ASSUME_NONNULL_BEGIN
  12 +
  13 +@interface CNLiveBCreatorViewController : CNCommonViewController
  14 +
  15 +@end
  16 +
  17 +NS_ASSUME_NONNULL_END
... ...
CNLiveServiceCenterModule/Classes/CNLiveServiceCenterModule/Controller/CNLiveBCreatorViewController.m 0 → 100644
  View file @338beb9
  1 +//
  2 +// CNLiveBCreatorViewController.m
  3 +// CNLiveBPersonalVerificationModule
  4 +//
  5 +// Created by 梁星国 on 2020/4/20.
  6 +//
  7 +
  8 +#import "CNLiveBCreatorViewController.h"
  9 +#import <WebKit/WebKit.h>
  10 +#import <CNLiveEnvironment/CNLiveEnvironment.h>
  11 +#import <CNLiveRequestBastKit/CNLiveNetworkRequest.h>
  12 +#import <CNLiveRequestBastKit/CNLiveNetworking.h>
  13 +#import <CNLiveUserManagement/CNUserInfoManager.h>
  14 +#import <CNLiveBeeHive/CNLiveBeeHive.h>
  15 +#import <MJExtension/MJExtension.h>
  16 +#import <QMUIKit/QMUIKit.h>
  17 +#import <YYKit/YYKit.h>
  18 +#import <objc/runtime.h>
  19 +#import <CNLiveBaseKit/CNLiveBaseKit.h>
  20 +
  21 +//http://wjjh5.cnlive.com/cnBCzzxy.html
  22 +//http://wjjh5test.cnlive.com/cnBCzzxy.html
  23 +
  24 +
  25 +#define CNLiveBCenterCreaterUrl cn_WjjH5_Host(@"/cnBCzzxy.html")
  26 +
  27 +@interface CNLiveBCreatorViewController ()<WKNavigationDelegate,WKUIDelegate,UIScrollViewDelegate>
  28 +
  29 +@property (strong, nonatomic) WKWebView *wkwebView;
  30 +
  31 +@property (strong, nonatomic) NSString *url;
  32 +
  33 +@end
  34 +
  35 +@implementation CNLiveBCreatorViewController
  36 +
  37 +
  38 +- (void)viewDidLoad {
  39 + [super viewDidLoad];
  40 + self.title = @"创作者学院";
  41 + [self.view setBackgroundColor:[UIColor whiteColor]];
  42 + [self initWKWebView];
  43 +
  44 +
  45 +}
  46 +
  47 +-(void)initWKWebView
  48 +{
  49 + self.view.backgroundColor = [UIColor whiteColor];
  50 + self.url = CNLiveBCenterCreaterUrl;
  51 + WKWebView *webView = [[WKWebView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, KScreenHeight)];
  52 + self.view = webView;
  53 + NSURL *url = [NSURL URLWithString:self.url];
  54 + NSURLRequest *request = [NSURLRequest requestWithURL:url];
  55 + [webView loadRequest:request];
  56 +
  57 +
  58 +}
  59 +
  60 +
  61 +
  62 +
  63 +
  64 +
  65 +@end
... ...
CNLiveServiceCenterModule/Classes/CNLiveServiceCenterModule/Controller/CNLiveBServiceCenterController.m
  View file @338beb9
... ... @@ -22,6 +22,8 @@
22 22 #import <YYKit/YYKit.h>
23 23 #import <QMUIKit/QMUIKit.h>
24 24 #import <CNLiveBServices/CNLiveBPersonAuthentProtocol.h>
  25 +#import <CNLiveBServices/CNLiveBMineServiceProtocol.h>
  26 +#import "CNLiveBCreatorViewController.h"
25 27  
26 28 #define CNLiveBGetServiceStatusUrl cn_API_OpenApi2(@"/user/readWJJBStatusById")
27 29 #define CNLiveBOrganizationValidattionStatusUrl cn_API_OpenApi2(@"/auser/getAccount.action")
... ... @@ -112,15 +114,18 @@
112 114 #pragma mark - TODO:获取用户信息显示
113 115  
114 116 [self.headerView configUIWithIsPerson:self.personStatus isEnterprise:self.institutionStatus];
  117 + __weak typeof(self) weakSelf = self;
115 118  
116 119 self.headerView.clickUserImageVBlock = ^(CNLiveBServiceCenterHeaderView * _Nonnull view, UIImageView * _Nonnull userImageV) {
117 120 NSLog(@"点击-用户头像");
  121 + [weakSelf jumpPersonVC];
118 122  
119 123 };
120 124 self.headerView.clickUserNameLBlock = ^(CNLiveBServiceCenterHeaderView * _Nonnull view, UILabel * _Nonnull userNameL) {
121 125 NSLog(@"点击-用户名字");
  126 + [weakSelf jumpPersonVC];
122 127 };
123   - __weak typeof(self) weakSelf = self;
  128 +
124 129 self.headerView.clickEnterViewBlock = ^(CNLiveBServiceCenterHeaderView * _Nonnull view, CNLiveBCenterAuthEnterView * _Nonnull enterView) {
125 130 NSLog(@"点击-用户认证进入");
126 131 [weakSelf checkPersonCertification];
... ... @@ -252,11 +257,17 @@
252 257  
253 258 if (indexPath.section == 0) {
254 259 if (indexPath.row == 0){
  260 +
255 261 [self checkPersonCertification];
  262 +
256 263 }else if (indexPath.row == 1) {
257 264  
258 265 [self checkAccreditedInstitution];
259 266  
  267 + }else if (indexPath.row == 2) {
  268 +
  269 + [self jumpCreaterVC];
  270 +
260 271 }
261 272 }
262 273  
... ... @@ -280,8 +291,21 @@
280 291  
281 292  
282 293  
283   -#pragma mark - TODO:
284 294 #pragma mark - *** 事件实现 ***
  295 +///跳转个人
  296 +- (void)jumpPersonVC {
  297 + /// 详情页
  298 + id<CNLiveBMineServiceProtocol> organizationValidationProtocol = [[BeeHive shareInstance] createService:@protocol(CNLiveBMineServiceProtocol)];
  299 + UIViewController *vc = [organizationValidationProtocol getUserInfoViewController];
  300 + [self setHidesBottomBarWhenPushed:YES];
  301 + [self.navigationController pushViewController:vc animated:YES];
  302 +}
  303 +///跳转创作者
  304 +- (void)jumpCreaterVC {
  305 + CNLiveBCreatorViewController *vc = [[CNLiveBCreatorViewController alloc]init];
  306 + [self setHidesBottomBarWhenPushed:YES];
  307 + [self.navigationController pushViewController:vc animated:YES];
  308 +}
285 309  
286 310  
287 311  
... ... @@ -291,7 +315,6 @@
291 315  
292 316 /// 获取用户认证状态
293 317 - (void)loadStatus{
294   -#pragma mark - TODO:请求路径刷新
295 318  
296 319 NSString *strUrl = CNLiveBGetServiceStatusUrl;
297 320 NSString *appId = [NSString stringWithFormat:@"%@",AppId];
... ... @@ -386,6 +409,7 @@
386 409 /// 填表页
387 410 id<CNLiveBPersonAuthentProtocol> personProtocol = [[BeeHive shareInstance] createService:@protocol(CNLiveBPersonAuthentProtocol)];
388 411 UIViewController *vc = [personProtocol pushToPersonalCertificationStatusController:dicContent];
  412 + [self setHidesBottomBarWhenPushed:YES];
389 413 [self.navigationController pushViewController:vc animated:YES];
390 414  
391 415 isEnter = YES;
... ... @@ -394,6 +418,7 @@
394 418 /// 填表页
395 419 id<CNLiveBPersonAuthentProtocol> personProtocol = [[BeeHive shareInstance] createService:@protocol(CNLiveBPersonAuthentProtocol)];
396 420 UIViewController *vc = [personProtocol pushToPersonalAuthenticationSuccessController:dicContent];
  421 + [self setHidesBottomBarWhenPushed:YES];
397 422 [self.navigationController pushViewController:vc animated:YES];
398 423  
399 424  
... ... @@ -401,6 +426,7 @@
401 426 }else if ([ischeckStatusStr isEqualToString:@"2"]) {//审核中
402 427 id<CNLiveBPersonAuthentProtocol> personProtocol = [[BeeHive shareInstance] createService:@protocol(CNLiveBPersonAuthentProtocol)];
403 428 UIViewController *vc = [personProtocol pushToPersonalCertificationStatusController:dicContent];
  429 + [self setHidesBottomBarWhenPushed:YES];
404 430 [self.navigationController pushViewController:vc animated:YES];
405 431  
406 432  
... ... @@ -409,8 +435,8 @@
409 435 }else if ([ischeckStatusStr isEqualToString:@"3"]) {//审核失败
410 436 id<CNLiveBPersonAuthentProtocol> personProtocol = [[BeeHive shareInstance] createService:@protocol(CNLiveBPersonAuthentProtocol)];
411 437 UIViewController *vc = [personProtocol pushToPersonalCertificationStatusController:dicContent];
  438 + [self setHidesBottomBarWhenPushed:YES];
412 439 [self.navigationController pushViewController:vc animated:YES];
413   -
414 440 isEnter = YES;
415 441 }
416 442  
... ... @@ -439,7 +465,7 @@
439 465  
440 466 }
441 467  
442   -
  468 +/// 检查机构认证状态
443 469 - (void)checkAccreditedInstitution {
444 470  
445 471  
... ... @@ -479,35 +505,48 @@
479 505 /// 填表页
480 506 id<CNLiveBOrganizationValidationProtocol> organizationValidationProtocol = [[BeeHive shareInstance] createService:@protocol(CNLiveBOrganizationValidationProtocol)];
481 507 UIViewController *vc = [organizationValidationProtocol getOrganizationValidationController:dicContent];
  508 + [self setHidesBottomBarWhenPushed:YES];
482 509 [self.navigationController pushViewController:vc animated:YES];
  510 +
483 511  
484 512 isEnter = YES;
485 513 }else if ([isCertificationStr isEqualToString:@"1"]) {
486 514 /// 详情页
487 515 id<CNLiveBOrganizationValidationProtocol> organizationValidationProtocol = [[BeeHive shareInstance] createService:@protocol(CNLiveBOrganizationValidationProtocol)];
488 516 UIViewController *vc = [organizationValidationProtocol getOrganizationDetailController:dicContent];
  517 +
  518 + [self setHidesBottomBarWhenPushed:YES];
489 519 [self.navigationController pushViewController:vc animated:YES];
  520 +
490 521  
491 522 isEnter = YES;
492 523 }else if ([isCertificationStr isEqualToString:@"2"]) {
493   -#pragma mark - TODO: 测试先用
494 524 /// 详情页
495 525 id<CNLiveBOrganizationValidationProtocol> organizationValidationProtocol = [[BeeHive shareInstance] createService:@protocol(CNLiveBOrganizationValidationProtocol)];
496   - UIViewController *vc = [organizationValidationProtocol getOrganizationDetailController:dicContent];
497   - [self.navigationController pushViewController:vc animated:YES];
  526 + UIViewController *vc = [organizationValidationProtocol getOrganizationAuditController:dicContent];
498 527  
  528 + [self setHidesBottomBarWhenPushed:YES];
  529 + [self.navigationController pushViewController:vc animated:YES];
499 530 isEnter = YES;
500 531 }
501 532 }
502 533 }
503 534  
504 535 if (!isEnter) {
505   -#pragma mark - TODO:弹框
506   - ///弹框
  536 + [QMUITips showError:err.domain inView:[UIApplication sharedApplication].keyWindow hideAfterDelay:0.5];//@"上传失败"
507 537 }
508 538  
509 539 }else {
510 540  
  541 + if (error) {
  542 + if (error.code == -1001 || error.code == -1009) {
  543 + [QMUITips showError:@"网络连接已断开" inView:[UIApplication sharedApplication].keyWindow hideAfterDelay:1.5];
  544 + }else {
  545 + [QMUITips showError:error.domain inView:[UIApplication sharedApplication].keyWindow hideAfterDelay:1.5];//@"上传失败"
  546 + }
  547 + return;
  548 + }
  549 +
511 550 }
512 551  
513 552 }];
... ...
Example/CNLiveServiceCenterModule/Base.lproj/LaunchScreen.storyboard
  View file @338beb9
1 1 <?xml version="1.0" encoding="UTF-8"?>
2   -<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">
3   - <device id="retina4_7" orientation="portrait">
4   - <adaptation id="fullscreen"/>
5   - </device>
  2 +<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">
  3 + <device id="retina4_7" orientation="portrait" appearance="light"/>
6 4 <dependencies>
7 5 <deployment identifier="iOS"/>
8   - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
  6 + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
9 7 <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
10 8 </dependencies>
11 9 <scenes>
... ... @@ -25,7 +23,26 @@
25 23 </viewController>
26 24 <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
27 25 </objects>
28   - <point key="canvasLocation" x="53" y="375"/>
  26 + <point key="canvasLocation" x="370" y="-933"/>
  27 + </scene>
  28 + <!--Item 2-->
  29 + <scene sceneID="F9M-VM-WxF">
  30 + <objects>
  31 + <viewController id="Rwx-eR-8bd" sceneMemberID="viewController">
  32 + <layoutGuides>
  33 + <viewControllerLayoutGuide type="top" id="TED-8L-hd6"/>
  34 + <viewControllerLayoutGuide type="bottom" id="lNi-WU-LlF"/>
  35 + </layoutGuides>
  36 + <view key="view" contentMode="scaleToFill" id="zz4-Hw-x70">
  37 + <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
  38 + <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
  39 + <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
  40 + </view>
  41 + <tabBarItem key="tabBarItem" title="Item 2" id="18v-RL-dPh"/>
  42 + </viewController>
  43 + <placeholder placeholderIdentifier="IBFirstResponder" id="JW1-RX-Gyl" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
  44 + </objects>
  45 + <point key="canvasLocation" x="-2074" y="-398"/>
29 46 </scene>
30 47 </scenes>
31 48 </document>
... ...
Example/CNLiveServiceCenterModule/Base.lproj/Main.storyboard
  View file @338beb9
1 1 <?xml version="1.0" encoding="UTF-8"?>
2   -<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">
  2 +<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">
3 3 <device id="retina4_7" orientation="portrait" appearance="light"/>
4 4 <dependencies>
5 5 <deployment identifier="iOS"/>
6   - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16086"/>
  6 + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
7 7 <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
8 8 </dependencies>
9 9 <scenes>
10   - <!--Navigation Controller-->
  10 + <!--Item-->
11 11 <scene sceneID="6pI-4V-wpA">
12 12 <objects>
13 13 <navigationController id="rWB-m7-oK9" sceneMemberID="viewController">
  14 + <tabBarItem key="tabBarItem" title="Item" id="oRi-my-umV"/>
14 15 <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="Bhs-dN-KgY">
15 16 <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
16 17 <autoresizingMask key="autoresizingMask"/>
17 18 </navigationBar>
18 19 <connections>
19   - <segue destination="whP-gf-Uak" kind="relationship" relationship="rootViewController" id="wDI-o3-N1c"/>
  20 + <segue destination="whP-gf-Uak" kind="relationship" relationship="rootViewController" id="edo-lx-dt4"/>
20 21 </connections>
21 22 </navigationController>
22 23 <placeholder placeholderIdentifier="IBFirstResponder" id="P0o-eo-7as" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
... ... @@ -42,5 +43,34 @@
42 43 </objects>
43 44 <point key="canvasLocation" x="305" y="433"/>
44 45 </scene>
  46 + <!--Item 2-->
  47 + <scene sceneID="8XJ-Z5-RDK">
  48 + <objects>
  49 + <viewController id="Llj-lD-vhl" sceneMemberID="viewController">
  50 + <tabBarItem key="tabBarItem" title="Item 2" id="hBK-1Z-tIW"/>
  51 + </viewController>
  52 + <placeholder placeholderIdentifier="IBFirstResponder" id="4gV-Pw-jyQ" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
  53 + </objects>
  54 + <point key="canvasLocation" x="-404" y="-242"/>
  55 + </scene>
  56 + <!--Tab Bar Controller-->
  57 + <scene sceneID="1S9-vg-hU8">
  58 + <objects>
  59 + <tabBarController id="GeK-gb-c05" sceneMemberID="viewController">
  60 + <navigationItem key="navigationItem" id="YHU-Bh-Mmw"/>
  61 + <tabBar key="tabBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="fUw-0E-E46">
  62 + <rect key="frame" x="0.0" y="0.0" width="414" height="49"/>
  63 + <autoresizingMask key="autoresizingMask"/>
  64 + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
  65 + </tabBar>
  66 + <connections>
  67 + <segue destination="rWB-m7-oK9" kind="relationship" relationship="viewControllers" id="1JN-3Z-6l4"/>
  68 + <segue destination="Llj-lD-vhl" kind="relationship" relationship="viewControllers" id="mm5-3y-ckf"/>
  69 + </connections>
  70 + </tabBarController>
  71 + <placeholder placeholderIdentifier="IBFirstResponder" id="1aL-XA-E6P" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
  72 + </objects>
  73 + <point key="canvasLocation" x="-2033" y="357"/>
  74 + </scene>
45 75 </scenes>
46 76 </document>
... ...
Example/CNLiveServiceCenterModule/CNLIVEBAppDelegate.m
  View file @338beb9
... ... @@ -69,7 +69,7 @@ static NSString * uuid;
69 69 CNUserShareModel.faceUrl = @"http://yweb0.cnliveimg.com/images/headImg/2019/1211/1576034177571_small.jpg";
70 70 CNUserShareModel.nickname = @"";
71 71 CNUserShareModel.mobile = @"15027621766";
72   - CNUserShareModel.uid = @"10514581";
  72 + CNUserShareModel.uid = @"10514506";
73 73  
74 74 }
75 75 - (NSString *)appUUIDString
... ...