no message

zhangxiaowen
1 parent 396a99a2
Showing 13 changed files with 72 additions and 9 deletions
CNLiveServices/Classes/Classification/CNLiveClassificationServiceProtocol.h
CNLiveServices/Classes/Found/CNLiveFoundServiceProtocol.h
CNLiveServices/Classes/Home/CNLiveHomeServiceProtocol.h
CNLiveServices/Classes/Login/CNLiveLoginServiceProtocol.h
CNLiveServices/Classes/My/CNLiveMyServiceProtocol.h
Example/CNLiveServices/CNLiveAppDelegate.m
Example/CNLiveServices/Found/CNLiveFoundService.m
Example/CNLiveServices/Found/CNLiveFoundViewController.h
Example/CNLiveServices/Home/CNLiveHomeService.m
Example/CNLiveServices/Home/CNLiveHomeViewController.m
Example/CNLiveServices/Login/Controller/CNLoginViewController.m
Example/CNLiveServices/Login/Module/CNLiveLoginService.m
Example/Podfile
@@ -10,8 +10,6 @@
 #import "BHServiceProtocol.h"
 @protocol CNLiveClassificationServiceProtocol <NSObject, BHServiceProtocol>
-//传值
-@property (nonatomic, strong) NSString *itemId;
 @end
@@ -10,11 +10,11 @@
 #import "BHServiceProtocol.h"
 @protocol CNLiveFoundServiceProtocol <NSObject, BHServiceProtocol>
-//传值
+// 传值
 @property (nonatomic, strong) NSString *itemId;
+
 - (UIViewController *)getFoundViewController;
 - (void)pushToFoundViewController;
-
 - (void)pushToFoundViewControllerByName:(NSString *)name url:(NSString *)url delegate:(id)delegate;
 @end
@@ -16,4 +16,8 @@
 - (void)pushToHomeViewController;
+//详情
+- (UIViewController *)getDetailsViewController;
+- (void)pushToDetailsViewController;
+
 @end
@@ -10,6 +10,9 @@
 #import "BHServiceProtocol.h"
 @protocol CNLiveLoginServiceProtocol <NSObject, BHServiceProtocol>
+// 传值
+@property (nonatomic, strong) NSString *itemId;
+
 //登录
 - (UIViewController *)getLoginViewController;
 - (void)pushToLoginViewController;
@@ -10,8 +10,6 @@
 #import "BHServiceProtocol.h"
 @protocol CNLiveMyServiceProtocol <NSObject, BHServiceProtocol>
-//传值
-@property (nonatomic, strong) NSString *itemId;
 @end
@@ -8,6 +8,7 @@
 #import "CNLiveAppDelegate.h"
 #import "CNLiveServices.h"
+
 #import "BHTimeProfiler.h"
 #import <mach-o/dyld.h>
 #import "BHModuleManager.h"
@@ -27,7 +28,10 @@
     [[BHTimeProfiler sharedTimeProfiler] recordEventTime:@"BeeHive::super start launch"];
     [super application:application didFinishLaunchingWithOptions:launchOptions];
-        
+    
+//    id<CNLiveEnvironmentServiceProtocol> environment = [[BeeHive shareInstance] createService:@protocol(CNLiveEnvironmentServiceProtocol)];
+//    [environment setEnvironment:CNLiveProductionAppStore];
+
     id<CNLiveLoginServiceProtocol> login = [[BeeHive shareInstance] createService:@protocol(CNLiveLoginServiceProtocol)];
     UINavigationController *navCtrl = [[UINavigationController alloc] initWithRootViewController:[login getLoginViewController]];
     self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
@@ -34,10 +34,13 @@
 - (void)pushToFoundViewControllerByName:(NSString *)name url:(NSString *)url delegate:(id)delegate{
     UINavigationController *nav = (UINavigationController *)[UIApplication sharedApplication].delegate.window.rootViewController;
     CNLiveFoundViewController *vc = [CNLiveFoundViewController new];
+    _itemId = name;
+    vc.ID = _itemId;
     vc.url = url;
     vc.name = name;
     vc.delegate = delegate;
     [nav pushViewController:vc animated:YES];
+    NSLog(@"------%@------",self.itemId);
 }
@@ -13,6 +13,7 @@ NS_ASSUME_NONNULL_BEGIN
 @interface CNLiveFoundViewController : UIViewController
 @property (nonatomic, weak) id <CNLiveFoundProtocol> delegate;
+@property (nonatomic, copy) NSString *ID;
 @property (nonatomic, copy) NSString *name;
 @property (nonatomic, copy) NSString *url;
@@ -9,6 +9,7 @@
 #import "CNLiveHomeService.h"
 #import "CNLiveServices.h"
 #import "CNLiveHomeViewController.h"
+#import "CNLiveDetailsViewController.h"
 @BeeHiveService(CNLiveHomeServiceProtocol,CNLiveHomeService)
 @interface CNLiveHomeService ()<CNLiveHomeServiceProtocol>
@@ -24,9 +25,27 @@
 }
 - (void)pushToHomeViewController{
+//    UITabBarController *tab = (UITabBarController *)[UIApplication sharedApplication].delegate.window.rootViewController;
+//    UINavigationController *nav = tab.selectedViewController;
+//    CNLiveHomeViewController *vc = [CNLiveHomeViewController new];
+//    [nav pushViewController:vc animated:YES];
+    
+    UINavigationController *nav = (UINavigationController *)[UIApplication sharedApplication].delegate.window.rootViewController;
+    CNLiveHomeViewController *vc = [CNLiveHomeViewController new];
+    [nav pushViewController:vc animated:YES];
+    
+}
+
+- (UIViewController *)getDetailsViewController{
+    CNLiveDetailsViewController *vc = [CNLiveDetailsViewController new];
+    return vc;
+    
+}
+
+- (void)pushToDetailsViewController{
     UITabBarController *tab = (UITabBarController *)[UIApplication sharedApplication].delegate.window.rootViewController;
     UINavigationController *nav = tab.selectedViewController;
-    CNLiveHomeViewController *vc = [CNLiveHomeViewController new];
+    CNLiveDetailsViewController *vc = [CNLiveDetailsViewController new];
     [nav pushViewController:vc animated:YES];
 }
@@ -24,7 +24,7 @@
     [super viewDidLoad];
     // Do any additional setup after loading the view.
-    self.title = self.name;
+    self.title = @"首页";
     self.view.backgroundColor = [UIColor whiteColor];
     UIButton *btn0 = [UIButton buttonWithType:UIButtonTypeCustom];
@@ -46,6 +46,8 @@
         }
     }];
+//    id<CNLiveFoundServiceProtocol> found = [[BeeHive shareInstance] createService:@protocol(CNLiveFoundServiceProtocol)];
+//    [found pushToFoundViewControllerByName:@"itemID" url:@"" delegate:self];
 }
 /*
@@ -7,6 +7,7 @@
 //
 #import "CNLoginViewController.h"
+#import "CNLiveServices.h"
 @interface CNLoginViewController ()
@@ -29,8 +30,35 @@
     // Do any additional setup after loading the view.
     self.view.backgroundColor = [UIColor whiteColor];
     self.title = @"登录";
+    
+    UIButton *btn0 = [UIButton buttonWithType:UIButtonTypeCustom];
+    btn0.frame = CGRectMake(0, 0, 100, 100);
+    btn0.center = self.view.center;
+    btn0.backgroundColor = [UIColor redColor];
+    [btn0 setTitle:@"进入首页" forState:UIControlStateNormal];
+    [btn0 addTarget:self action:@selector(testButtonClicked) forControlEvents:UIControlEventTouchUpInside];
+    [self.view addSubview:btn0];
+    
+    
+    UIButton *btn1 = [UIButton buttonWithType:UIButtonTypeCustom];
+    btn1.frame = CGRectMake([UIScreen mainScreen].bounds.size.width/2.0-50, 100, 100, 100);
+    btn1.backgroundColor = [UIColor redColor];
+    [btn1 setTitle:@"登录" forState:UIControlStateNormal];
+    [btn1 addTarget:self action:@selector(testButtonClicked1) forControlEvents:UIControlEventTouchUpInside];
+    [self.view addSubview:btn1];
 }
+- (void)testButtonClicked {
+    id<CNLiveHomeServiceProtocol> home = [[BeeHive shareInstance] createService:@protocol(CNLiveHomeServiceProtocol)];
+    [home pushToHomeViewController];
+}
+
+- (void)testButtonClicked1 {
+    [self dismissViewControllerAnimated:YES completion:^{
+        self.completeBlock? self.completeBlock(YES):@"";
+
+    }];
+}
 /*
 #pragma mark - Navigation
@@ -16,6 +16,7 @@
 @end
 @implementation CNLiveLoginService
+@synthesize itemId = _itemId;
 - (UIViewController *)getLoginViewController{
     return [CNLoginViewController new];
 use_frameworks!
+source 'https://github.com/CocoaPods/Specs.git'
+source 'http://bj.gitlab.cnlive.com/ios-team/CNLiveRepos.git'
 platform :ios, '9.0'