Merge branch 'master' into learningCenter

# Conflicts:
#	Tools/ShareGoodsViewController.m

Lighting/AppDelegate.m

@@ -10,6 +10,7 @@
 #import "LoginViewController.h"
 #import "DeviceDirectionManager.h"
 #import <Bugly/Bugly.h>
+#import "UMMobClick/MobClick.h"
 
 @interface AppDelegate ()
 
@@ -121,12 +122,15 @@
 {
     // 友盟分享初始化
     [UMSocialData setAppKey:@"57425f2467e58e645f00210a"];
-    
     // 设置微信AppId、appSecret，分享url
     [UMSocialWechatHandler setWXAppId:@"wxab385878d9441f23" appSecret:@"58b85af13973bdf597fa807208ac0dff " url:@"http://www.umeng.com/social"];
-    
     // 设置微博的AppKey、appSecret，分享url
     [UMSocialSinaSSOHandler openNewSinaSSOWithAppKey:@"1111393286" secret:@"5d011c05122b5539ec9592372f944d3c" RedirectURL:@"http://sns.whalecloud.com/sina2/callback"];
+    
+    
+    UMConfigInstance.appKey = @"57425f2467e58e645f00210a";
+    UMConfigInstance.channelId = @"蒲公英";
+    [MobClick startWithConfigure:UMConfigInstance];
 }
 
 

Tools/ExperienceCentreViewController.m

@@ -21,7 +21,7 @@
 #define RIGHTWIDTH 200
 #define TOPWIDTH 300
 
-@interface ExperienceCentreViewController ()<AddImagesDelegate,UICollectionViewDelegate,UICollectionViewDataSource,UITableViewDelegate,UITableViewDataSource,UIGestureRecognizerDelegate,SharePicturedelegate,UIImagePickerControllerDelegate,UINavigationControllerDelegate>
+@interface ExperienceCentreViewController ()<AddImagesDelegate,UICollectionViewDelegate,UICollectionViewDataSource,UITableViewDelegate,UITableViewDataSource,UIGestureRecognizerDelegate,UIImagePickerControllerDelegate,UINavigationControllerDelegate>
 
 
 
@@ -272,7 +272,6 @@
     }
     shareController.goodsIds = goodsID;
     shareController.shareImage = [self capture];
-    shareController.delegate = self;
     shareController.preferredContentSize = CGSizeMake(290, 120);
     shareController.modalPresentationStyle = UIModalPresentationPopover;
     UIPopoverPresentationController *popover = shareController.popoverPresentationController;
@@ -558,33 +557,6 @@
     }
 }
 
-#pragma mark ---SharePicturedelegate
-#pragma mark -上传图片进度
-- (void)UploadImageProgress:(double)progress
-{
-    [self ShowProgressView:progress];
-}
-
-#pragma mark -上传图片完成
-- (void)UploadImageSuccess
-{
-    self.TCHud.labelText = @"上传完成";
-    [self RemoveMBProgressHUDLoding];
-}
-
-#pragma mark -上传图片失败
-- (void)UploadImageFailue
-{
-    self.TCHud.labelText = @"上传失败";
-    [self RemoveMBProgressHUDLoding];
-}
-
-#pragma mark -分享失败
-- (void)CodeNotEqualZERO:(NSString *)message
-{
-    [self ErrorMBProgressView:message];
-}
-
 #pragma mark -切换灯图片
 - (IBAction)changeLampImageClickAction:(UIButton *)sender {
 

Tools/NetworkRequestClassManager.m

@@ -48,7 +48,7 @@ static NetworkRequestClassManager *manager = nil;
     AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
     manager.responseSerializer = [AFJSONResponseSerializer serializer];
     manager.requestSerializer = [AFJSONRequestSerializer serializer];
-    manager.requestSerializer.timeoutInterval = 60.0f;
+    manager.requestSerializer.timeoutInterval = 10.0f;
     [manager.requestSerializer setValue:@"application/json;charset=utf-8" forHTTPHeaderField: @"Content-Type"];
     [manager.requestSerializer setValue:[[[NSBundle mainBundle] infoDictionary]
                                          objectForKey:@"CFBundleShortVersionString"] forHTTPHeaderField: @"version"];

Tools/ShareGoodsViewController.h

@@ -8,37 +8,6 @@
 
 #import "BaseViewController.h"
 
-@protocol SharePicturedelegate <NSObject>
-
-@optional
-
-//回调
-- (void)ShareProductImage:(UIImage *)image ;
-
-/**
- *  上传图片进度(显示)
- */
-- (void)UploadImageProgress:(double)progress;
-
-/**
- *  上传完成
- */
-- (void)UploadImageSuccess;
-
-/**
- *  上传失败
- */
-- (void)UploadImageFailue;
-
-
-/**
- *  code不为0
- */
-- (void)CodeNotEqualZERO:(NSString *)message;
-
-@end
-
-
 @interface ShareGoodsViewController : BaseViewController
 
 
@@ -52,11 +21,6 @@
  */
 @property (nonatomic,copy) NSString *goodsIds;
 
-/**
- *  代理
- */
-@property (nonatomic,assign) id<SharePicturedelegate> delegate;
-
 /**
  *  分享订单、分享商品
  */

Tools/ShareGoodsViewController.m

@@ -28,9 +28,10 @@
     
     WS(weakSelf);
     if (self.isShareOrderbill) {//分享订单
+         [self dismissViewControllerAnimated:YES completion:nil];
         [weakSelf CreateMBProgressHUDLoding];
         NSString *shareOrderString = [NSString stringWithFormat:@"%@/%@",SHAREORDERBILL,self.orderBillNumber];
-        [[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:SERVERREQUESTURL(shareOrderString) WithCallClass:weakSelf WithRequestType:0 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
+        [[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:SERVERREQUESTURL(shareOrderString) WithCallClass:weakSelf WithRequestType:ZERO WithParameter:nil WithReturnValueBlock:^(id returnValue) {
             
             [weakSelf RemoveMBProgressHUDLoding];
             if ([returnValue[@"code"] isEqualToNumber:@0]) {
@@ -53,33 +54,26 @@
         NSDictionary *parameterDict = [NSDictionary dictionaryWithObjectsAndKeys:[goodsID substringToIndex:self.goodsIds.length-1],@"goodsIds",@"",@"title",@"",@"remark",nil];
         //上传图片
         [[NetworkRequestClassManager Manager] UploadImageWithURL:SERVERREQUESTURL(SHARE) WithRequestType:ZERO WithImageDatas:imageData WithParameter:parameterDict WithReturnValueBlock:^(id returnValue) {
+            
             if ([returnValue[@"code"] isEqualToNumber:@0]) {
                 NSString *shareWeb = returnValue[@"data"][@"url"];
                 [weakSelf callSharePlatform:shareWeb withPlatformTag:sender withTitle:ShareTitle];
             }else
             {
-                if ([weakSelf.delegate respondsToSelector:@selector(CodeNotEqualZERO:)]) {
-                    [weakSelf.delegate CodeNotEqualZERO:returnValue[@"message"]];
-                }
+                [weakSelf ErrorMBProgressView:returnValue[@"message"]];
             }
-            
         }WithprogressBlock:^(double progress) {
             if (progress >= 1) {
-                if ([weakSelf.delegate respondsToSelector:@selector(UploadImageSuccess)]) {
-                    [weakSelf.delegate UploadImageSuccess];
-                }
-            }else
-            {
-                if ([weakSelf.delegate respondsToSelector:@selector(UploadImageProgress:)]) {
-                    [weakSelf.delegate UploadImageProgress:progress];
-                }
+                weakSelf.TCHud.labelText = @"上传完成";
+                [weakSelf RemoveMBProgressHUDLoding];
+            }else{
+                [weakSelf ShowProgressView:progress];
             }
+            
         } WithErrorCodeBlock:^(id errorCodeValue) {
             [weakSelf ErrorMBProgressView:NETWORK];
         } WithFailureBlock:^(NSError *error) {
-            if ([weakSelf.delegate respondsToSelector:@selector(UploadImageFailue)]) {
-                [weakSelf.delegate UploadImageFailue];
-            }
+            weakSelf.TCHud.labelText = @"上传失败";
             [weakSelf ErrorMBProgressView:error.localizedDescription];
         }];
     }
@@ -88,16 +82,15 @@
 #pragma mark - 调用分享
 - (void)callSharePlatform:(NSString *)shareWeb withPlatformTag:(UIButton *)sender withTitle:(NSString *)title
 {
+    WS(weakSelf);
     switch (sender.tag) {
         case 100: //微信好友
         {//自定义样式
-            
             //使用UMShareToWechatSession,UMShareToWechatTimeline,UMShareToWechatFavorite分别代表微信好友、微信朋友圈、微信收藏
             [UMSocialData defaultData].extConfig.wechatSessionData.url = shareWeb;
             [[UMSocialDataService defaultDataService]  postSNSWithTypes:@[UMShareToWechatSession] content:title image:self.shareImage location:nil urlResource:nil presentedController:self completion:^(UMSocialResponseEntity *response){
                 if (response.responseCode == UMSResponseCodeSuccess) {
-                    
-                    [self SuccessMBProgressView:@"分享微信好友成功"];
+                    [weakSelf SuccessMBProgressView:@"分享微信好友成功"];
                 }
             }];
         }
@@ -108,25 +101,21 @@
             [UMSocialData defaultData].extConfig.wechatTimelineData.url = shareWeb;
             [[UMSocialDataService defaultDataService]  postSNSWithTypes:@[UMShareToWechatTimeline] content:title image:self.shareImage location:nil urlResource:nil presentedController:self completion:^(UMSocialResponseEntity *response){
                 if (response.responseCode == UMSResponseCodeSuccess) {
-                    
-                    [self SuccessMBProgressView:@"分享微信朋友圈成功"];
+                    [weakSelf SuccessMBProgressView:@"分享微信朋友圈成功"];
                 }
             }];
         }
             break;
         case 102://新浪微博
         {
-            
             //自定义分享样式
             [UMSocialData defaultData].extConfig.sinaData.shareText = [NSString stringWithFormat:@"%@%@",@"欧普照明",shareWeb];
             [[UMSocialDataService defaultDataService]  postSNSWithTypes:@[UMShareToSina] content:title image:self.shareImage location:nil urlResource:nil presentedController:self completion:^(UMSocialResponseEntity *shareResponse){
                 if (shareResponse.responseCode == UMSResponseCodeSuccess) {
-                    
-                    [self SuccessMBProgressView:@"分享新浪微博成功"];
+                    [weakSelf SuccessMBProgressView:@"分享新浪微博成功"];
                 }
             }];
         }
-            
             break;
         default:
             break;