no message

iOS-Xiaowen
1 parent 129e6436
Showing 17 changed files with 63 additions and 67 deletions
CNLiveBMineModule.podspec
CNLiveBMineModule/Classes/Controller/CNLiveMineController.h
CNLiveBMineModule/Classes/Controller/CNLiveMineController.m
CNLiveBMineModule/Classes/Module/CNLiveBMineModule.m
CNLiveBMineModule/Classes/Module/CNLiveBMineService.m
CNLiveBMineModule/Classes/Setting/AboutUs/CNLiveAboutUsController.h
CNLiveBMineModule/Classes/Setting/AboutUs/CNLiveAboutUsController.m
CNLiveBMineModule/Classes/Setting/BindingManage/CNLiveBindingManageController.h
CNLiveBMineModule/Classes/Setting/Cancellation/CNLiveCancellationController.h
CNLiveBMineModule/Classes/Setting/Controller/CNLiveSettingController.h
CNLiveBMineModule/Classes/Setting/Controller/CNLiveSettingController.m
CNLiveBMineModule/Classes/Setting/UpdateTel/CNLiveUpdateTelController.h
CNLiveBMineModule/Classes/UserInfo/CNLiveInfoUpdateController.h
CNLiveBMineModule/Classes/UserInfo/CNLiveUserInfoController.h
CNLiveBMineModule/Classes/UserInfo/CNLiveUserInfoController.m
Example/CNLiveBMineModule.xcodeproj/project.pbxproj
Example/CNLiveBMineModule/CNLIVEAppDelegate.m
@@ -79,15 +79,16 @@ TODO: 网家家企业版-我的模块.
   s.dependency 'CNLiveTripartiteManagement/Masonry'
   s.dependency 'CNLiveTripartiteManagement/MJExtension'
   s.dependency 'CNLiveTripartiteManagement/AFNetworking'
+  s.dependency 'CNLiveTripartiteManagement/YYKit'
   # 服务层
-  s.dependency 'CNLiveServices'
+  s.dependency 'CNLiveBServices'
   # 环境
-  s.dependency 'CNLiveBEnvironment'
+  s.dependency 'CNLiveEnvironment'
   # 基类
-  s.dependency 'CNLiveCommonClass'
+  s.dependency 'CNLiveBaseClass'
   # IM
   s.dependency 'CNLiveIMBaseSDK'
@@ -96,7 +97,7 @@ TODO: 网家家企业版-我的模块.
   s.dependency 'CNLiveCategory'
   # 用户信息本地化
-#  s.dependency 'CNLiveUserManagement'
+  s.dependency 'CNLiveUserManagement'
   # 分享工具库
   s.dependency 'CNLiveShareToolKit'
@@ -10,11 +10,11 @@
  * 我的
  */
-#import "CNCommonViewController.h"
+#import "CNLiveBaseViewController.h"
 NS_ASSUME_NONNULL_BEGIN
-@interface CNLiveMineController : CNCommonViewController
+@interface CNLiveMineController : CNLiveBaseViewController
 @end
@@ -11,10 +11,10 @@
 #import "MJExtension.h"
 #import "QMUIKit.h"
-#import "CNLiveServices.h"
+#import "CNLiveBServices.h"
 #import <CNLiveRequestBastKit/CNLiveNetworking.h>
 #import "CNUserInfoManager.h"
-//#import "CNLiveEnvironment.h"
+#import "CNLiveEnvironment.h"
 #import "CNLiveCategory.h"
 #import "CNLiveMineHeaderView.h"
@@ -267,10 +267,6 @@ static const CGFloat timeValue = 1.5;
 }
 #pragma mark - 响应方法
-- (void)soccerDidClicked:(UIButton *)btn{
-    id<CNLiveIntegralServiceProtocol> service = [[BeeHive shareInstance] createService:@protocol(CNLiveIntegralServiceProtocol)];
-    [service pushToTaskListViewController];
-}
 #pragma mark - 懒加载
 - (NSMutableArray *)data {
@@ -7,7 +7,7 @@
 //
 #import "CNLiveBMineModule.h"
-#import "CNLiveServices.h"
+#import "CNLiveBServices.h"
 @BeeHiveMod(CNLiveBMineModule)
 @interface CNLiveBMineModule()<BHModuleProtocol>
@@ -7,17 +7,16 @@
 //
 #import "CNLiveBMineService.h"
-#import "CNLiveServices.h"
+#import "CNLiveBServices.h"
 #import "CNLivePageJumpManager.h"
 #import "CNLiveMineController.h"
 #import "CNLiveUserInfoController.h"
-//@BeeHiveService(CNLiveBMineServiceProtocol,CNLiveBMineService)
-////@interface CNLiveBMineService ()<CNLiveBMineServiceProtocol>
-//@interface CNLiveBMineService ()
-//
-//@end
+@BeeHiveService(CNLiveBMineServiceProtocol,CNLiveBMineService)
+@interface CNLiveBMineService ()<CNLiveBMineServiceProtocol>
+
+@end
 @implementation CNLiveBMineService
@@ -11,11 +11,11 @@
  */
 #import <UIKit/UIKit.h>
-#import "CNCommonViewController.h"
+#import "CNLiveBaseViewController.h"
 NS_ASSUME_NONNULL_BEGIN
-@interface CNLiveAboutUsController : CNCommonViewController
+@interface CNLiveAboutUsController : CNLiveBaseViewController
 @end
@@ -10,7 +10,6 @@
 #import "MJExtension.h"
 #import "QMUIKit.h"
-#import "CNLiveServices.h"
 #import "CNLiveUserAgreementManager.h"
 #import "CNLiveEnvironment.h"
 #import "CNLiveCategory.h"
@@ -6,11 +6,11 @@
 //  Copyright © 2019 cnlive. All rights reserved.
 //
 // 绑定管理
-#import "CNCommonViewController.h"
+#import "CNLiveBaseViewController.h"
 NS_ASSUME_NONNULL_BEGIN
-@interface CNLiveBindingManageController : CNCommonViewController
+@interface CNLiveBindingManageController : CNLiveBaseViewController
 @end
@@ -8,11 +8,11 @@
 // 注销账号
-#import "CNCommonViewController.h"
+#import "CNLiveBaseViewController.h"
 NS_ASSUME_NONNULL_BEGIN
-@interface CNLiveCancellationController : CNCommonViewController
+@interface CNLiveCancellationController : CNLiveBaseViewController
 @end
@@ -11,11 +11,11 @@
  */
 #import <UIKit/UIKit.h>
-#import "CNCommonViewController.h"
+#import "CNLiveBaseViewController.h"
 NS_ASSUME_NONNULL_BEGIN
-@interface CNLiveSettingController : CNCommonViewController
+@interface CNLiveSettingController : CNLiveBaseViewController
 @end
@@ -16,7 +16,7 @@
 #import "CNLiveSettingModel.h"
 #import "CNLiveSettingCell.h"
-#import "CNLiveServices.h"
+#import "CNLiveBServices.h"
 #import "CNLiveNavigationBar.h"
 #import "CNLiveUpdateTelController.h"//修改手机号
@@ -279,7 +279,7 @@ static const NSInteger timeValue = 1.5;
     QMUIAlertAction *sure = [QMUIAlertAction actionWithTitle:@"退出登录" style:QMUIAlertActionStyleDefault handler:^(__kindof QMUIAlertController *aAlertController, QMUIAlertAction *action) {
         [UIApplication sharedApplication].delegate.window.rootViewController = nil;
         [self cleanLocalCache];
-        id<CNLiveLoginServiceProtocol> login = [[BeeHive shareInstance] createService:@protocol(CNLiveLoginServiceProtocol)];
+        id<CNLiveBLoginServiceProtocol> login = [[BeeHive shareInstance] createService:@protocol(CNLiveBLoginServiceProtocol)];
         UINavigationController *nav = [[UINavigationController alloc] initWithRootViewController:[login getLoginViewController]];
         [UIApplication sharedApplication].delegate.window.rootViewController = nav;
     }];
@@ -6,8 +6,8 @@
 //  Copyright (c) 2019 153993236@qq.com. All rights reserved.
 //
-#import "CNCommonViewController.h"
+#import "CNLiveBaseViewController.h"
-@interface CNLiveUpdateTelController : CNCommonViewController
+@interface CNLiveUpdateTelController : CNLiveBaseViewController
 @end
@@ -6,12 +6,12 @@
 //  Copyright (c) 2019 153993236@qq.com. All rights reserved.
 //
-#import "CNCommonViewController.h"
+#import "CNLiveBaseViewController.h"
 NS_ASSUME_NONNULL_BEGIN
 @class CNLiveUserInfoModel;
-@interface CNLiveInfoUpdateController : CNCommonViewController
+@interface CNLiveInfoUpdateController : CNLiveBaseViewController
 /**
  *  @abstract 对象方法 初始化方法
@@ -11,11 +11,11 @@
  */
 #import <UIKit/UIKit.h>
-#import "CNCommonViewController.h"
+#import "CNLiveBaseViewController.h"
 NS_ASSUME_NONNULL_BEGIN
-@interface CNLiveUserInfoController : CNCommonViewController
+@interface CNLiveUserInfoController : CNLiveBaseViewController
 @end
@@ -11,7 +11,7 @@
 #import "QMUIKit.h"
 #import "CNUserInfoManager.h"
-#import "CNLiveServices.h"
+//#import "CNLiveBServices.h"
 #import "CNLiveNavigationBar.h"
 #import "CNLiveUserInfoCell.h"
@@ -131,8 +131,7 @@
     switch (model.dataType) {
         case CNLiveUserInfoDataTypeCode:
         {
-            id<CNLiveQrCodeServiceProtocol> service = [[BeeHive shareInstance] createService:@protocol(CNLiveQrCodeServiceProtocol)];
-            [service pushToMyQrCodeController:NO];
+
         }
             break;
         default:
@@ -207,8 +207,8 @@
 				6003F586195388D20070C39A /* Sources */,
 				6003F587195388D20070C39A /* Frameworks */,
 				6003F588195388D20070C39A /* Resources */,
-				0736C861350FED0E8B7ED07D /* [CP] Embed Pods Frameworks */,
-				03FA66881D6C81031648A678 /* [CP] Copy Pods Resources */,
+				74D7B4BA2B5F765420699403 /* [CP] Embed Pods Frameworks */,
+				B4C8572D83613CAC1310A418 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -299,29 +299,29 @@
 /* End PBXResourcesBuildPhase section */
 /* Begin PBXShellScriptBuildPhase section */
-		03FA66881D6C81031648A678 /* [CP] Copy Pods Resources */ = {
+		2A8336772A36DEB07525BA2F /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
+			inputFileListPaths = (
+			);
 			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-CNLiveBMineModule_Example/Pods-CNLiveBMineModule_Example-resources.sh",
-				"${PODS_CONFIGURATION_BUILD_DIR}/CNLiveBMineModule/CNLiveBMineModule.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/CNLiveShareToolKit/CNLiveShareToolKit.bundle",
-				"${PODS_ROOT}/WeiboSDK/libWeiboSDK/WeiboSDK.bundle",
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
 			);
-			name = "[CP] Copy Pods Resources";
 			outputPaths = (
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveBMineModule.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveShareToolKit.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/WeiboSDK.bundle",
+				"$(DERIVED_FILE_DIR)/Pods-CNLiveBMineModule_Example-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveBMineModule_Example/Pods-CNLiveBMineModule_Example-resources.sh\"\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		0736C861350FED0E8B7ED07D /* [CP] Embed Pods Frameworks */ = {
+		74D7B4BA2B5F765420699403 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -330,7 +330,7 @@
 				"${PODS_ROOT}/Target Support Files/Pods-CNLiveBMineModule_Example/Pods-CNLiveBMineModule_Example-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveAVCamera/CNLiveAVCamera.framework",
-				"${BUILT_PRODUCTS_DIR}/CNLiveBEnvironment/CNLiveBEnvironment.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveBaseClass/CNLiveBaseClass.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveBaseKit/CNLiveBaseKit.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveBaseTools/CNLiveBaseTools.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveBeeHive/CNLiveBeeHive.framework",
@@ -339,7 +339,6 @@
 				"${BUILT_PRODUCTS_DIR}/CNLiveCategory/CNLiveCategory.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveChooseCountry/CNLiveChooseCountry.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCommonCategory/CNLiveCommonCategory.framework",
-				"${BUILT_PRODUCTS_DIR}/CNLiveCommonClass/CNLiveCommonClass.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCustomControl/CNLiveCustomControl.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveImagePickerController/CNLiveImagePickerController.framework",
@@ -357,13 +356,14 @@
 				"${BUILT_PRODUCTS_DIR}/SDAutoLayout/SDAutoLayout.framework",
 				"${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
 				"${PODS_ROOT}/TXIMSDK_iOS/ImSDK.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}/CNLiveBEnvironment.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}/CNLiveBeeHive.framework",
@@ -372,7 +372,6 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCategory.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveChooseCountry.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonCategory.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonClass.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",
@@ -390,6 +389,7 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDAutoLayout.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ImSDK.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WebViewJavascriptBridge.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYKit.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -397,26 +397,28 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveBMineModule_Example/Pods-CNLiveBMineModule_Example-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		2A8336772A36DEB07525BA2F /* [CP] Check Pods Manifest.lock */ = {
+		B4C8572D83613CAC1310A418 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
-			inputFileListPaths = (
-			);
 			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
-			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-CNLiveBMineModule_Example/Pods-CNLiveBMineModule_Example-resources.sh",
+				"${PODS_CONFIGURATION_BUILD_DIR}/CNLiveBMineModule/CNLiveBMineModule.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/CNLiveShareToolKit/CNLiveShareToolKit.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/CNLiveUserAgreementManager/CNLiveUserAgreementManager.bundle",
+				"${PODS_ROOT}/WeiboSDK/libWeiboSDK/WeiboSDK.bundle",
 			);
+			name = "[CP] Copy Pods Resources";
 			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-CNLiveBMineModule_Example-checkManifestLockResult.txt",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveBMineModule.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveShareToolKit.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveUserAgreementManager.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/WeiboSDK.bundle",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveBMineModule_Example/Pods-CNLiveBMineModule_Example-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		C07FCC71144256C0D7D38641 /* [CP] Check Pods Manifest.lock */ = {
@@ -36,7 +36,7 @@
     // Override point for customization after application launch.
     self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
-    [CNLiveEnvironmentManager setAppType:CNLiveAppTypeBusiness environmentType:CNLiveProductionAppStore];
+    [CNLiveEnvironmentManager setAppType:CNLiveAppTypeBLive environmentType:CNLiveProductionAppStore];
    [CNLiveUserSystemCenter setAppId:AppId appKey:APPKey appSecret:AppSecret isTestEnvironment:TestEnvironment];
     if ([CNUserShareManager isLogin]) {
         [CNLiveUserSystemCenter setUserId:CNUserShareModel.uid];