ios / YH_LivePush · Commits

Go to a project

Authored by 盖剑秋
Commit b1a9969b293df09d6c76f0b47c358b3010b82204 1 parent 968d058e

New file for secret.

Inline Side-by-side
Showing 4 changed files with 79 additions and 7 deletions
@@ -169,6 +169,7 @@ @@ -169,6 +169,7 @@
169 2ED76ACF1D2F449B00562235 /* libiconv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 2ED76ACE1D2F449B00562235 /* libiconv.tbd */; }; 169 2ED76ACF1D2F449B00562235 /* libiconv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 2ED76ACE1D2F449B00562235 /* libiconv.tbd */; };
170 2EEAD4BE1D112D04003EE0E9 /* GCDAsyncSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = 2EEAD4BB1D112D04003EE0E9 /* GCDAsyncSocket.m */; }; 170 2EEAD4BE1D112D04003EE0E9 /* GCDAsyncSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = 2EEAD4BB1D112D04003EE0E9 /* GCDAsyncSocket.m */; };
171 2EEAD4BF1D112D04003EE0E9 /* GCDAsyncSocket+SocketHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 2EEAD4BD1D112D04003EE0E9 /* GCDAsyncSocket+SocketHandler.m */; }; 171 2EEAD4BF1D112D04003EE0E9 /* GCDAsyncSocket+SocketHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 2EEAD4BD1D112D04003EE0E9 /* GCDAsyncSocket+SocketHandler.m */; };
  172 + 2EFAE0AA1D740EDD00D489BD /* YH_RoomSecretViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2EFAE0A91D740EDD00D489BD /* YH_RoomSecretViewController.m */; };
172 31CCA53A1D26138700ADF9F0 /* M16HUDUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 31CCA5391D26138700ADF9F0 /* M16HUDUtil.m */; }; 173 31CCA53A1D26138700ADF9F0 /* M16HUDUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 31CCA5391D26138700ADF9F0 /* M16HUDUtil.m */; };
173 31CCA53D1D2613D800ADF9F0 /* UIViewAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 31CCA53C1D2613D800ADF9F0 /* UIViewAdditions.m */; }; 174 31CCA53D1D2613D800ADF9F0 /* UIViewAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 31CCA53C1D2613D800ADF9F0 /* UIViewAdditions.m */; };
174 A09B25771CE57CAF00E68E28 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A09B25761CE57CAF00E68E28 /* SystemConfiguration.framework */; }; 175 A09B25771CE57CAF00E68E28 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A09B25761CE57CAF00E68E28 /* SystemConfiguration.framework */; };
@@ -460,6 +461,8 @@ @@ -460,6 +461,8 @@
460 2EEAD4BB1D112D04003EE0E9 /* GCDAsyncSocket.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GCDAsyncSocket.m; sourceTree = "<group>"; }; 461 2EEAD4BB1D112D04003EE0E9 /* GCDAsyncSocket.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GCDAsyncSocket.m; sourceTree = "<group>"; };
461 2EEAD4BC1D112D04003EE0E9 /* GCDAsyncSocket+SocketHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GCDAsyncSocket+SocketHandler.h"; sourceTree = "<group>"; }; 462 2EEAD4BC1D112D04003EE0E9 /* GCDAsyncSocket+SocketHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GCDAsyncSocket+SocketHandler.h"; sourceTree = "<group>"; };
462 2EEAD4BD1D112D04003EE0E9 /* GCDAsyncSocket+SocketHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GCDAsyncSocket+SocketHandler.m"; sourceTree = "<group>"; }; 463 2EEAD4BD1D112D04003EE0E9 /* GCDAsyncSocket+SocketHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GCDAsyncSocket+SocketHandler.m"; sourceTree = "<group>"; };
  464 + 2EFAE0A81D740EDD00D489BD /* YH_RoomSecretViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YH_RoomSecretViewController.h; sourceTree = "<group>"; };
  465 + 2EFAE0A91D740EDD00D489BD /* YH_RoomSecretViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YH_RoomSecretViewController.m; sourceTree = "<group>"; };
463 31CCA5341D26111D00ADF9F0 /* DimensMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DimensMacros.h; sourceTree = "<group>"; }; 466 31CCA5341D26111D00ADF9F0 /* DimensMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DimensMacros.h; sourceTree = "<group>"; };
464 31CCA5371D26133100ADF9F0 /* YohoLive.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YohoLive.pch; sourceTree = SOURCE_ROOT; }; 467 31CCA5371D26133100ADF9F0 /* YohoLive.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YohoLive.pch; sourceTree = SOURCE_ROOT; };
465 31CCA5381D26138700ADF9F0 /* M16HUDUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = M16HUDUtil.h; sourceTree = "<group>"; }; 468 31CCA5381D26138700ADF9F0 /* M16HUDUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = M16HUDUtil.h; sourceTree = "<group>"; };
@@ -592,6 +595,8 @@ @@ -592,6 +595,8 @@
592 2E2E2D7B1D0E8BD90067D118 /* NSString+M16String.m */, 595 2E2E2D7B1D0E8BD90067D118 /* NSString+M16String.m */,
593 2E4D5FC01D057C6100D508BB /* YH_RootViewController.h */, 596 2E4D5FC01D057C6100D508BB /* YH_RootViewController.h */,
594 2E4D5FC11D057C6100D508BB /* YH_RootViewController.m */, 597 2E4D5FC11D057C6100D508BB /* YH_RootViewController.m */,
  598 + 2EFAE0A81D740EDD00D489BD /* YH_RoomSecretViewController.h */,
  599 + 2EFAE0A91D740EDD00D489BD /* YH_RoomSecretViewController.m */,
595 2E5FA88F1D06D2FD00920FB4 /* YH_ChannelModel.h */, 600 2E5FA88F1D06D2FD00920FB4 /* YH_ChannelModel.h */,
596 2E5FA8901D06D2FD00920FB4 /* YH_ChannelModel.m */, 601 2E5FA8901D06D2FD00920FB4 /* YH_ChannelModel.m */,
597 31CCA53B1D2613D800ADF9F0 /* UIViewAdditions.h */, 602 31CCA53B1D2613D800ADF9F0 /* UIViewAdditions.h */,
@@ -1005,7 +1010,6 @@ @@ -1005,7 +1010,6 @@
1005 TargetAttributes = { 1010 TargetAttributes = {
1006 EF14E52A1C884C71002F1BEF = { 1011 EF14E52A1C884C71002F1BEF = {
1007 CreatedOnToolsVersion = 7.2.1; 1012 CreatedOnToolsVersion = 7.2.1;
1008 - DevelopmentTeam = 6U82P566A4;  
1009 SystemCapabilities = { 1013 SystemCapabilities = {
1010 com.apple.BackgroundModes = { 1014 com.apple.BackgroundModes = {
1011 enabled = 1; 1015 enabled = 1;
@@ -1235,6 +1239,7 @@ @@ -1235,6 +1239,7 @@
1235 2EB66FF81D18EF2F00E91AAE /* MTLManagedObjectAdapter.m in Sources */, 1239 2EB66FF81D18EF2F00E91AAE /* MTLManagedObjectAdapter.m in Sources */,
1236 2E487B0D1D66B05F009DBB6D /* YH_H5URLProtocol.m in Sources */, 1240 2E487B0D1D66B05F009DBB6D /* YH_H5URLProtocol.m in Sources */,
1237 2EB66FFB1D18EF2F00E91AAE /* MTLReflection.m in Sources */, 1241 2EB66FFB1D18EF2F00E91AAE /* MTLReflection.m in Sources */,
  1242 + 2EFAE0AA1D740EDD00D489BD /* YH_RoomSecretViewController.m in Sources */,
1238 2E487AD71D66AA94009DBB6D /* NSMutableArray+QueueAdditions.m in Sources */, 1243 2E487AD71D66AA94009DBB6D /* NSMutableArray+QueueAdditions.m in Sources */,
1239 2EB66FA71D18EEB100E91AAE /* YH_BarrageModel.m in Sources */, 1244 2EB66FA71D18EEB100E91AAE /* YH_BarrageModel.m in Sources */,
1240 2EB66FB71D18EEC700E91AAE /* YH_BarrageTableView.m in Sources */, 1245 2EB66FB71D18EEC700E91AAE /* YH_BarrageTableView.m in Sources */,
@@ -1391,9 +1396,9 @@ @@ -1391,9 +1396,9 @@
1391 "$(PROJECT_DIR)/YohoLive/yoho/Vendors/Zine", 1396 "$(PROJECT_DIR)/YohoLive/yoho/Vendors/Zine",
1392 "$(PROJECT_DIR)/YohoLive/yoho/Vendors/Zipzap", 1397 "$(PROJECT_DIR)/YohoLive/yoho/Vendors/Zipzap",
1393 ); 1398 );
1394 - PRODUCT_BUNDLE_IDENTIFIER = cn.yoho.live.ent; 1399 + PRODUCT_BUNDLE_IDENTIFIER = com.kennaki.live;
1395 PRODUCT_NAME = YohoLive; 1400 PRODUCT_NAME = YohoLive;
1396 - PROVISIONING_PROFILE = "a054e3fc-ce5a-4cd0-a13b-21f70ebeab79"; 1401 + PROVISIONING_PROFILE = "";
1397 USER_HEADER_SEARCH_PATHS = ./YohoLive/TXRTMPSDK.framework/Headers; 1402 USER_HEADER_SEARCH_PATHS = ./YohoLive/TXRTMPSDK.framework/Headers;
1398 VALID_ARCHS = "arm64 armv7 armv7s i386"; 1403 VALID_ARCHS = "arm64 armv7 armv7s i386";
1399 }; 1404 };
@@ -1542,9 +1547,9 @@ @@ -1542,9 +1547,9 @@
1542 "$(PROJECT_DIR)/YohoLive/yoho/Vendors/Zine", 1547 "$(PROJECT_DIR)/YohoLive/yoho/Vendors/Zine",
1543 "$(PROJECT_DIR)/YohoLive/yoho/Vendors/Zipzap", 1548 "$(PROJECT_DIR)/YohoLive/yoho/Vendors/Zipzap",
1544 ); 1549 );
1545 - PRODUCT_BUNDLE_IDENTIFIER = cn.yoho.live.ent; 1550 + PRODUCT_BUNDLE_IDENTIFIER = com.kennaki.live;
1546 PRODUCT_NAME = YohoLive; 1551 PRODUCT_NAME = YohoLive;
1547 - PROVISIONING_PROFILE = "a054e3fc-ce5a-4cd0-a13b-21f70ebeab79"; 1552 + PROVISIONING_PROFILE = "";
1548 USER_HEADER_SEARCH_PATHS = ./YohoLive/TXRTMPSDK.framework/Headers; 1553 USER_HEADER_SEARCH_PATHS = ./YohoLive/TXRTMPSDK.framework/Headers;
1549 VALID_ARCHS = "arm64 armv7 armv7s i386"; 1554 VALID_ARCHS = "arm64 armv7 armv7s i386";
1550 }; 1555 };
@@ -1604,9 +1609,9 @@ @@ -1604,9 +1609,9 @@
1604 "$(PROJECT_DIR)/YohoLive/yoho/Vendors/Zine", 1609 "$(PROJECT_DIR)/YohoLive/yoho/Vendors/Zine",
1605 "$(PROJECT_DIR)/YohoLive/yoho/Vendors/Zipzap", 1610 "$(PROJECT_DIR)/YohoLive/yoho/Vendors/Zipzap",
1606 ); 1611 );
1607 - PRODUCT_BUNDLE_IDENTIFIER = cn.yoho.live.ent; 1612 + PRODUCT_BUNDLE_IDENTIFIER = com.kennaki.live;
1608 PRODUCT_NAME = YohoLive; 1613 PRODUCT_NAME = YohoLive;
1609 - PROVISIONING_PROFILE = "a054e3fc-ce5a-4cd0-a13b-21f70ebeab79"; 1614 + PROVISIONING_PROFILE = "";
1610 USER_HEADER_SEARCH_PATHS = ./YohoLive/TXRTMPSDK.framework/Headers; 1615 USER_HEADER_SEARCH_PATHS = ./YohoLive/TXRTMPSDK.framework/Headers;
1611 VALID_ARCHS = "arm64 armv7 armv7s i386"; 1616 VALID_ARCHS = "arm64 armv7 armv7s i386";
1612 }; 1617 };
  1 +//
  2 +// YH_RoomSecretViewController.h
  3 +// YohoLive
  4 +//
  5 +// Created by 盖剑秋 on 16/8/29.
  6 +// Copyright © 2016年 YOHO!. All rights reserved.
  7 +//
  8 +
  9 +#import <UIKit/UIKit.h>
  10 +
  11 +@interface YH_RoomSecretViewController : UIViewController
  12 +
  13 ++ (void)showInController:(UIViewController *)aController completionBlock:(void(^)(NSDictionary *dic, BOOL success))block;
  14 +
  15 +- (void)setCompletionBlock:(void(^)(NSDictionary *dic, BOOL success))block;
  16 +
  17 +@end
  1 +//
  2 +// YH_RoomSecretViewController.m
  3 +// YohoLive
  4 +//
  5 +// Created by 盖剑秋 on 16/8/29.
  6 +// Copyright © 2016年 YOHO!. All rights reserved.
  7 +//
  8 +
  9 +#import "YH_RoomSecretViewController.h"
  10 +
  11 +@implementation YH_RoomSecretViewController
  12 +{
  13 + void (^completionBlock)(NSDictionary *dic, BOOL success);
  14 +}
  15 +
  16 ++ (void)showInController:(UIViewController *)aController completionBlock:(void (^)(NSDictionary *, BOOL))block {
  17 + YH_RoomSecretViewController *ctrler = [YH_RoomSecretViewController new];
  18 + [ctrler setCompletionBlock:block];
  19 + [aController.view addSubview:ctrler.view];
  20 + [aController addChildViewController:ctrler];
  21 +}
  22 +
  23 +- (instancetype)init {
  24 + if (self = [super init]) {
  25 + }
  26 + return self;
  27 +}
  28 +
  29 +- (void)viewDidLoad {
  30 + [super viewDidLoad];
  31 + self.view.backgroundColor = [UIColor colorWithWhite:0 alpha:0];
  32 + UIView *bg = [UIView new];
  33 + [self.view addSubview:bg];
  34 + bg.frame = CGRectMake(0, 0, 280, 250);
  35 + bg.center = self.view.center;
  36 + CGRect frame = bg.frame;
  37 + frame.origin.y = 170;
  38 + bg.frame = frame;
  39 +
  40 + UILabel *titleLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, 50, 280, 19)];
  41 + titleLabel.font = [UIFont systemFontOfSize:18];
  42 + titleLabel.textAlignment = NSTextAlignmentCenter;
  43 + titleLabel.text = @"房间秘钥";
  44 +}
  45 +
  46 +- (void)setCompletionBlock:(void (^)(NSDictionary *, BOOL))block {
  47 + completionBlock = [block copy];
  48 +}
  49 +
  50 +@end