全面升级新版logo

boai · Sep 20, 2016 · 5a160cd · 5a160cd
1 parent 3f55a6e
commit 5a160cd
Show file tree

Hide file tree

Showing 918 changed files with 4,406 additions and 3,400 deletions.
diff --git a/BABaseProject.xcworkspace/xcuserdata/boai.xcuserdatad/UserInterfaceState.xcuserstate b/BABaseProject.xcworkspace/xcuserdata/boai.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/BABaseProject/Assets.xcassets/AppIcon.appiconset/Contents.json b/BABaseProject/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,68 +1,81 @@
 {
   "images" : [
     {
-      "idiom" : "iphone",
       "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "[email protected]",
       "scale" : "2x"
     },
     {
-      "idiom" : "iphone",
       "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "[email protected]",
       "scale" : "3x"
     },
     {
-      "idiom" : "iphone",
       "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "[email protected]",
       "scale" : "2x"
     },
     {
-      "idiom" : "iphone",
       "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "[email protected]",
       "scale" : "3x"
     },
     {
-      "idiom" : "iphone",
       "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "[email protected]",
       "scale" : "2x"
     },
     {
-      "idiom" : "iphone",
       "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "[email protected]",
       "scale" : "3x"
     },
     {
-      "idiom" : "ipad",
       "size" : "29x29",
+      "idiom" : "ipad",
+      "filename" : "[email protected]",
       "scale" : "1x"
     },
     {
-      "idiom" : "ipad",
       "size" : "29x29",
+      "idiom" : "ipad",
+      "filename" : "[email protected]",
       "scale" : "2x"
     },
     {
-      "idiom" : "ipad",
       "size" : "40x40",
+      "idiom" : "ipad",
+      "filename" : "[email protected]",
       "scale" : "1x"
     },
     {
-      "idiom" : "ipad",
       "size" : "40x40",
+      "idiom" : "ipad",
+      "filename" : "[email protected]",
       "scale" : "2x"
     },
     {
-      "idiom" : "ipad",
       "size" : "76x76",
+      "idiom" : "ipad",
+      "filename" : "[email protected]",
       "scale" : "1x"
     },
     {
-      "idiom" : "ipad",
       "size" : "76x76",
+      "idiom" : "ipad",
+      "filename" : "[email protected]",
       "scale" : "2x"
     },
     {
-      "idiom" : "ipad",
       "size" : "83.5x83.5",
+      "idiom" : "ipad",
+      "filename" : "[email protected]",
       "scale" : "2x"
     }
   ],

diff --git a/BABaseProject/Assets.xcassets/AppIcon.appiconset/[email protected] b/BABaseProject/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/BABaseProject/Assets.xcassets/AppIcon.appiconset/[email protected] b/BABaseProject/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/BABaseProject/Assets.xcassets/AppIcon.appiconset/[email protected] b/BABaseProject/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/BABaseProject/Assets.xcassets/AppIcon.appiconset/[email protected] b/BABaseProject/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/BABaseProject/Assets.xcassets/AppIcon.appiconset/[email protected] b/BABaseProject/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/BABaseProject/Assets.xcassets/AppIcon.appiconset/[email protected] b/BABaseProject/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/BABaseProject/Assets.xcassets/AppIcon.appiconset/[email protected] b/BABaseProject/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/BABaseProject/Assets.xcassets/AppIcon.appiconset/[email protected] b/BABaseProject/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/BABaseProject/Assets.xcassets/AppIcon.appiconset/[email protected] b/BABaseProject/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/BABaseProject/Assets.xcassets/AppIcon.appiconset/[email protected] b/BABaseProject/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/BABaseProject/Assets.xcassets/AppIcon.appiconset/[email protected] b/BABaseProject/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/BABaseProject/BAMainCode/BACode/Home(首页)/DemoVC/DemoVC3/DemoVC3.m b/BABaseProject/BAMainCode/BACode/Home(首页)/DemoVC/DemoVC3/DemoVC3.m
@@ -40,7 +40,10 @@ - (void)viewWillDisappear:(BOOL)animated
 
     [_headerLine stop];    
 
-    dispatch_source_cancel(self.timer2);
+    if (self.timer2)
+    {
+        dispatch_source_cancel(self.timer2);
+    }
 
 //    _timeButton2 = nil;
 //    _timeButton3 = nil;

diff --git a/BABaseProject/BAMainCode/BACode/Home(首页)/DemoVC/DemoVC4/DemoVC4.m b/BABaseProject/BAMainCode/BACode/Home(首页)/DemoVC/DemoVC4/DemoVC4.m
@@ -91,13 +91,14 @@ - (IBAction)clickShareBtn:(UIButton *)sender
     {
         BAShareManage *manger = [BAShareManage shareManage];
         manger.delegate = self;
-        [manger BA_UMLoginListWithViewControll:self];
+        [manger ba_UMLoginListWithViewControll:self];
     }
 }
 
 #pragma mark 友盟登陆BAShareManageDelegate
 - (void)getUserData:(NSDictionary *)backUserData
 {
+    [self BA_showAlert:@"登录成功！"];
     [self.view ba_showAlertView:@"温馨提示：" message:[NSString stringWithFormat:@"友盟登陆成功，返回信息: %@", backUserData]];
     BALog(@"友盟登陆成功，返回信息: %@", backUserData);
 }

diff --git a/BABaseProject/BAMainCode/BATools(工具类)/BACategory(分类)/AppDelegate+BACategory.m b/BABaseProject/BAMainCode/BATools(工具类)/BACategory(分类)/AppDelegate+BACategory.m
@@ -49,15 +49,22 @@ - (void)isBATabVC:(BOOL)is
     {
         /*! 此处使用自定义TabBarController，此处暂时有问题，大家慎用！先使用第三方的tabbar */
         self.window.rootViewController = [BATabBarController new];
+        [self.window makeKeyAndVisible];
     }
     else
     {
         /*! 此处使用RDVTabBarController */
-            [self setupViewControllers];
-            self.window.rootViewController = self.viewController;
+//            [self setupViewControllers];
+//            self.window.rootViewController = self.viewController;
+        self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
+        self.window.backgroundColor = [UIColor whiteColor];
+        [self setupViewControllers];
+        [self.window setRootViewController:self.viewController];
+        [self.window makeKeyAndVisible];
+
+        [self customizeInterface];
     }
 
-    [self.window makeKeyAndVisible];
 }
 
 - (void)isBATabVC2:(BOOL)is
@@ -298,7 +305,7 @@ - (void)setupViewControllers
     RDVTabBarController *tabBarController = [[RDVTabBarController alloc] init];
     [tabBarController setViewControllers:@[firstNavigationController, secondNavigationController, thirdNavigationController, fourNavigationController]];
     self.viewController = tabBarController;
-    
+
     [self customizeTabBarForController:tabBarController];
 }
 
@@ -326,8 +333,7 @@ - (void)customizeTabBarForController:(RDVTabBarController *)tabBarController
     }
 }
 
-- (void)customizeInterface
-{
+- (void)customizeInterface {
     UINavigationBar *navigationBarAppearance = [UINavigationBar appearance];
 
     UIImage *backgroundImage = nil;
@@ -337,9 +343,20 @@ - (void)customizeInterface
         backgroundImage = [UIImage imageNamed:@"navigationbar_background_tall"];
 
         textAttributes = @{
-                           NSFontAttributeName: [UIFont boldSystemFontOfSize:12],
+                           NSFontAttributeName: [UIFont boldSystemFontOfSize:18],
                            NSForegroundColorAttributeName: [UIColor blackColor],
                            };
+    } else {
+#if __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_7_0
+        backgroundImage = [UIImage imageNamed:@"navigationbar_background"];
+
+        textAttributes = @{
+                           UITextAttributeFont: [UIFont boldSystemFontOfSize:18],
+                           UITextAttributeTextColor: [UIColor blackColor],
+                           UITextAttributeTextShadowColor: [UIColor clearColor],
+                           UITextAttributeTextShadowOffset: [NSValue valueWithUIOffset:UIOffsetZero],
+                           };
+#endif
     }
 
     [navigationBarAppearance setBackgroundImage:backgroundImage

diff --git a/BABaseProject/BAMainCode/BATools(工具类)/BAKit(工具类)/BACustom/BASharManager/BAShareManage.h b/BABaseProject/BAMainCode/BATools(工具类)/BAKit(工具类)/BACustom/BASharManager/BAShareManage.h
@@ -96,24 +96,24 @@
 
 #pragma mark - ***** 友盟登录
 /*！友盟 QQ 登录 */
-- (void)BA_QQLogin:(UIViewController *)viewController;
+- (void)ba_QQLogin:(UIViewController *)viewController;
 
 /*！友盟 Qzone 登录 */
-- (void)BA_QzoneLogin:(UIViewController *)viewController;
+- (void)ba_QzoneLogin:(UIViewController *)viewController;
 
 /*！友盟 新浪微博登录 */
-- (void)BA_SinaLogin:(UIViewController *)viewController;
+- (void)ba_SinaLogin:(UIViewController *)viewController;
 /*！删除新浪微博登陆授权调用下面的方法 */
 - (void)deleteSinaLogin;
 
 /*！友盟 微信 登录 */
-- (void)BA_WechatSessionLogin:(UIViewController *)viewController;
+- (void)ba_WechatSessionLogin:(UIViewController *)viewController;
 
 /*!
  *  友盟登录列表
  *
  *  @param viewController viewController
  */
-- (void)BA_UMLoginListWithViewControll:(UIViewController *)viewController;
+- (void)ba_UMLoginListWithViewControll:(UIViewController *)viewController;
 
 @end
diff --git a/BABaseProject/BAMainCode/BATools(工具类)/BAKit(工具类)/BACustom/BASharManager/BAShareManage.m b/BABaseProject/BAMainCode/BATools(工具类)/BAKit(工具类)/BACustom/BASharManager/BAShareManage.m
@@ -58,7 +58,10 @@ - (void)ba_setupShareConfig
 
     // 打开新浪微博的SSO开关
     // 将在新浪微博注册的应用appkey、redirectURL替换下面参数，并在info.plist的URL Scheme中相应添加wb+appkey，如"wb3112175844"，详情请参考官方文档。
+//    [UMSocialSinaSSOHandler openNewSinaSSOWithAppKey:BA_Sina_AppKey
+//                                         RedirectURL:@"http://sns.whalecloud.com/sin"];
     [UMSocialSinaSSOHandler openNewSinaSSOWithAppKey:BA_Sina_AppKey
+                                              secret:BA_SinaAppSecret
                                          RedirectURL:@"http://sns.whalecloud.com/sin"];
     //  添加微信分享授权
     // 设置微信AppId、appSecret，分享url
@@ -334,7 +337,7 @@ -(void)didFinishGetUMSocialDataInViewController:(UMSocialResponseEntity *)respon
 
 #pragma mark - 友盟登录
 /**友盟 QQ 登录**/
-- (void)BA_QQLogin:(UIViewController *)viewController
+- (void)ba_QQLogin:(UIViewController *)viewController
 {
     UMSocialSnsPlatform *snsPlatform = [UMSocialSnsPlatformManager getSocialPlatformWithName:UMShareToQQ];
 
@@ -362,7 +365,7 @@ - (void)BA_QQLogin:(UIViewController *)viewController
 }
 
 /**友盟 Qzone 登录**/
-- (void)BA_QzoneLogin:(UIViewController *)viewController
+- (void)ba_QzoneLogin:(UIViewController *)viewController
 {
     UMSocialSnsPlatform *snsPlatform = [UMSocialSnsPlatformManager getSocialPlatformWithName:UMShareToQzone];
     BA_Weak;
@@ -389,7 +392,7 @@ - (void)BA_QzoneLogin:(UIViewController *)viewController
 }
 
 /**友盟 新浪微博 登录**/
-- (void)BA_SinaLogin:(UIViewController *)viewController
+- (void)ba_SinaLogin:(UIViewController *)viewController
 {
     UMSocialSnsPlatform *snsPlatform = [UMSocialSnsPlatformManager getSocialPlatformWithName:UMShareToSina];
     BA_Weak;
@@ -424,7 +427,7 @@ - (void)deleteSinaLogin
 }
 
 /**友盟 微信 登录**/
-- (void)BA_WechatSessionLogin:(UIViewController *)viewController
+- (void)ba_WechatSessionLogin:(UIViewController *)viewController
 {
     UMSocialSnsPlatform *snsPlatform = [UMSocialSnsPlatformManager getSocialPlatformWithName:UMShareToWechatSession];
     BA_Weak;
@@ -451,7 +454,7 @@ - (void)BA_WechatSessionLogin:(UIViewController *)viewController
 }
 
 /**友盟登录列表**/
-- (void)BA_UMLoginListWithViewControll:(UIViewController *)viewController
+- (void)ba_UMLoginListWithViewControll:(UIViewController *)viewController
 {
 //    NSMutableArray *titarray = [NSMutableArray arrayWithObjects:@"微信", @"微博",  @"QQ", @"空间",nil];
 //    NSMutableArray *picarray = [NSMutableArray arrayWithObjects:@"BASharManager.bundle/微信好友", @"BASharManager.bundle/新浪微博",  @"BASharManager.bundle/qq好友", @"BASharManager.bundle/qq空间",nil];
@@ -493,16 +496,16 @@ - (void)BA_UMLoginListWithViewControll:(UIViewController *)viewController
             switch (index)
             {
                     case 1:
-                    [weakSelf BA_WechatSessionLogin:viewController];
+                    [weakSelf ba_WechatSessionLogin:viewController];
                     break;
                     case 2:
-                    [weakSelf BA_SinaLogin:viewController];
+                    [weakSelf ba_SinaLogin:viewController];
                     break;
                     case 3:
-                    [weakSelf BA_QQLogin:viewController];
+                    [weakSelf ba_QQLogin:viewController];
                     break;
                     case 4:
-                    [weakSelf BA_QzoneLogin:viewController];
+                    [weakSelf ba_QzoneLogin:viewController];
                     break;
 
                 default:
@@ -514,13 +517,13 @@ - (void)BA_UMLoginListWithViewControll:(UIViewController *)viewController
             switch (index)
             {
                     case 1:
-                    [weakSelf BA_SinaLogin:viewController];
+                    [weakSelf ba_SinaLogin:viewController];
                     break;
                     case 2:
-                    [weakSelf BA_QQLogin:viewController];
+                    [weakSelf ba_QQLogin:viewController];
                     break;
                     case 3:
-                    [weakSelf BA_QzoneLogin:viewController];
+                    [weakSelf ba_QzoneLogin:viewController];
                     break;
 
                 default:
@@ -532,10 +535,10 @@ - (void)BA_UMLoginListWithViewControll:(UIViewController *)viewController
             switch (index)
             {
                     case 1:
-                    [weakSelf BA_WechatSessionLogin:viewController];
+                    [weakSelf ba_WechatSessionLogin:viewController];
                     break;
                     case 2:
-                    [weakSelf BA_SinaLogin:viewController];
+                    [weakSelf ba_SinaLogin:viewController];
                     break;
 
                 default:
@@ -547,7 +550,7 @@ - (void)BA_UMLoginListWithViewControll:(UIViewController *)viewController
             switch (index)
             {
                     case 1:
-                    [weakSelf BA_SinaLogin:viewController];
+                    [weakSelf ba_SinaLogin:viewController];
                     break;
 
                 default:

diff --git a/BABaseProject/BAMainCode/BATools(工具类)/BAMacros(宏)/BADefin.h b/BABaseProject/BAMainCode/BATools(工具类)/BAMacros(宏)/BADefin.h
@@ -66,7 +66,8 @@
 
 /*! 友盟分享SDK：接入自己项目时需要更改各个属性值 */
 #define BA_Umeng_Appkey     @"56f217d467e58e513a000434"
-#define BA_Sina_AppKey       @"2447331824"
+#define BA_Sina_AppKey      @"2447331824"
+#define BA_SinaAppSecret    @"4ee72cf1958fa92b88570d1b99328718"
 #define BA_WX_APPKEY        @"wx19d8c52e02fa7556"
 #define BA_WX_APPSECRET     @"90eeb0c9ef2a1c99fb473890809f7f19"
 #define BA_QQKey            @"wrGGgg89e0lqqoXT"

diff --git a/BABaseProject/BAMainCode/Resources(资源)/Plist/en.lproj/InfoPlist.strings b/BABaseProject/BAMainCode/Resources(资源)/Plist/en.lproj/InfoPlist.strings
@@ -6,4 +6,4 @@
   Copyright © 2016年 博爱之家. All rights reserved.
 */
 
-CFBundleDisplayName = "BABlog";
+CFBundleDisplayName = "Boai";
diff --git a/BABaseProject/BAMainCode/Resources(资源)/Plist/zh-Hans.lproj/InfoPlist.strings b/BABaseProject/BAMainCode/Resources(资源)/Plist/zh-Hans.lproj/InfoPlist.strings
@@ -6,4 +6,4 @@
   Copyright © 2016年 博爱之家. All rights reserved.
 */
 
-CFBundleDisplayName = "博爱博客";
+CFBundleDisplayName = "博爱";
diff --git a/Podfile b/Podfile
@@ -48,8 +48,9 @@ target 'BABaseProject' do
 #    pod 'MWPhotoBrowser'
 
     # 友盟分享
-    pod 'UMengSocial', '~> 4.4'
-
+#    pod 'UMengSocial', '~> 4.4'
+    pod 'UMengSocialCOM', '~> 5.2.1'
+
     # 二维码
     #pod 'LBXScan','~> 1.1.1'
 #    pod 'LBXAlertAction'