Merge branch 'dev'

Conflicts:
	ZhongJingLianMeng.xcworkspace/xcuserdata/youke.xcuserdatad/UserInterfaceState.xcuserstate

ZhongJingLianMeng/main/activity(活动)/ActivityTableController.m

@@ -263,6 +263,7 @@
         activityDetail.titleStr = model.title;
         activityDetail.shareTitle = model.title;
         activityDetail.activityStatus = model.status;
+         activityDetail.ImgUrl = model.img_path;
         activityDetail.index =@"0";
         activityDetail.urlStr = [NSString stringWithFormat:@"%@/applyDetail?id=%@&move=ios",baseH5,model.news_Id];
         activityDetail.shareUrl = [NSString stringWithFormat:@"%@/applyDetail?id=%@",baseH5,model.news_Id];
@@ -275,7 +276,7 @@
         newsDetail.newsId = model.news_Id;
         newsDetail.titleStr = model.title;
         newsDetail.shareTitle = model.title;
-        
+        newsDetail.ImgUrl = model.img_path;
         newsDetail.typeStr = @"2";
         newsDetail.index =@"0";
         newsDetail.urlStr = [NSString stringWithFormat:@"%@/reviewDetail?id=%@",baseH5,model.news_Id];

ZhongJingLianMeng/main/activity(活动)/activityDetailVController.h

@@ -26,4 +26,6 @@
 
 @property(nonatomic,strong)NSString *activityStatus;
 
+@property(nonatomic,strong)NSString *ImgUrl;
+
 @end

ZhongJingLianMeng/main/activity(活动)/activityDetailVController.m

@@ -354,10 +354,12 @@
         _shareTitle = @"";
     }
     if (arr) {
-        
+       if (IsStrEmpty(self.ImgUrl)){
+                 self.ImgUrl = @"https://img2018.cnblogs.com/blog/1058389/201812/1058389-20181211200433415-1810829224.png";
+             }
         NSMutableDictionary *shareParams = [NSMutableDictionary dictionary];
         [shareParams SSDKSetupShareParamsByText:@"中经联盟"
-                                         images:arr
+                                         images:self.ImgUrl
                                             url:[NSURL URLWithString:[NSString stringWithFormat:@"%@",_shareUrl]]
                                           title:_shareTitle
                                            type:SSDKContentTypeAuto];

ZhongJingLianMeng/main/alliance(联盟)/allianceListVController.m

@@ -192,6 +192,7 @@
     newsDetail.titleStr = model.committee_name;
 //    newsDetail.shareTitle = model.committee_name;
     newsDetail.index =@"2";
+//    newsDetail.ImgUrl =
     newsDetail.urlStr = [NSString stringWithFormat:@"%@/allianceTwo?id=%@&move=ios",baseH5,model.committee_id];
 //    newsDetail.shareUrl = [NSString stringWithFormat:@"%@/newsInfo?id=%@",baseH5,model.committee_id];
     [self.navigationController pushViewController:newsDetail animated:YES];

ZhongJingLianMeng/main/home(首页)/allianceNewsVController.m

@@ -220,6 +220,7 @@
     newsDetail.newsId = model.news_Id;
     newsDetail.titleStr = model.title;
     newsDetail.shareTitle = model.title;
+    newsDetail.ImgUrl = model.img_path;
     newsDetail.typeStr = @"0";
     newsDetail.index =@"0";
     newsDetail.urlStr = [NSString stringWithFormat:@"%@/newsInfo?id=%@&move=ios",baseH5,model.news_Id];

ZhongJingLianMeng/main/home(首页)/homePageViewController.m

@@ -376,6 +376,8 @@
     
     newsDetail.typeStr = @"0";
     
+    newsDetail.ImgUrl = model.img_path;
+    
     newsDetail.index =@"0";
     
     newsDetail.urlStr = [NSString stringWithFormat:@"%@/newsInfo?id=%@&move=ios",baseH5,model.news_Id];
@@ -397,6 +399,8 @@
         webVC.titleStr = model.title;
 
         webVC.shareTitle = model.title;
+        
+        webVC.ImgUrl = model.img_path;
 
         webVC.index = @"1";
 
@@ -413,6 +417,8 @@
         newsDetail.titleStr = model.title;
 
         newsDetail.shareTitle = model.title;
+        
+        newsDetail.ImgUrl = model.img_path;
 
         newsDetail.typeStr = @"0";
 
@@ -430,6 +436,7 @@
         newsDetail.newsId = model.banner_url;
         newsDetail.titleStr = model.title;
         newsDetail.shareTitle = model.title;
+         newsDetail.ImgUrl = model.img_path;
         newsDetail.typeStr = @"2";
         newsDetail.index =@"0";
         newsDetail.urlStr = [NSString stringWithFormat:@"%@/reviewDetail?id=%@",baseH5,model.banner_url];
@@ -446,6 +453,8 @@
         
         webVC.shareTitle = model.title;
         
+         webVC.ImgUrl = model.img_path;
+        
         webVC.urlStr = [NSString stringWithFormat:@"%@?move=ios",model.banner_url];
         
         webVC.shareUrl = [NSString stringWithFormat:@"%@",model.banner_url];
@@ -459,6 +468,7 @@
         activityDetail.newsId = model.banner_url;
         activityDetail.titleStr = model.title;
         activityDetail.shareTitle = model.title;
+        activityDetail.ImgUrl = model.img_path;
         activityDetail.index =@"0";
         activityDetail.urlStr = [NSString stringWithFormat:@"%@/applyDetail?id=%@&move=ios",baseH5,model.banner_url];
         activityDetail.shareUrl = [NSString stringWithFormat:@"%@/applyDetail?id=%@",baseH5,model.banner_url];

ZhongJingLianMeng/main/home(首页)/newsDetailVController.h

@@ -25,4 +25,6 @@
 @property(nonatomic,strong)NSString *typeStr;
 
 
+@property(nonatomic,strong)NSString *ImgUrl;
+
 @end

ZhongJingLianMeng/main/home(首页)/newsDetailVController.m

@@ -345,10 +345,13 @@
     }
     
     if (arr) {
+       if (IsStrEmpty(self.ImgUrl)){
+                 self.ImgUrl = @"https://img2018.cnblogs.com/blog/1058389/201812/1058389-20181211200433415-1810829224.png";
+             }
         
         NSMutableDictionary *shareParams = [NSMutableDictionary dictionary];
         [shareParams SSDKSetupShareParamsByText:@"中经联盟资讯"
-                                         images:arr
+                                         images:self.ImgUrl
                                             url:[NSURL URLWithString:[NSString stringWithFormat:@"%@",_shareUrl]]
                                           title:_shareTitle
                                            type:SSDKContentTypeWebPage];

ZhongJingLianMeng/main/me(我的)/controller/MyActivityController.m

@@ -217,6 +217,7 @@
     activityDetailVController *activityDetail = [[activityDetailVController alloc]init];
     activityDetail.newsId = _MyActivityModel.ActivityId;
     activityDetail.titleStr = _MyActivityModel.title;
+    activityDetail.ImgUrl = _MyActivityModel.img_path;
     activityDetail.shareTitle = _MyActivityModel.title;
     activityDetail.index =@"0";
     activityDetail.activityStatus = _MyActivityModel.activityStatus;

ZhongJingLianMeng/main/me(我的)/controller/MyCollectController.m

@@ -212,6 +212,7 @@
         newsDetail.titleStr = _MyClollectModel.title;
         newsDetail.shareTitle = _MyClollectModel.title;
         newsDetail.typeStr = _MyClollectModel.collect_type;
+        newsDetail.ImgUrl = _MyClollectModel.img_path;
         newsDetail.index =@"0";
         newsDetail.urlStr = [NSString stringWithFormat:@"%@/newsInfo?id=%@&move=ios",baseH5,_MyClollectModel.collect_id];
         newsDetail.shareUrl = [NSString stringWithFormat:@"%@/newsInfo?id=%@",baseH5,_MyClollectModel.collect_id];
@@ -219,6 +220,7 @@
     }else if ([_MyClollectModel.collect_type isEqualToString:@"1"]){
         activityDetailVController *activityDetail = [[activityDetailVController alloc]init];
         activityDetail.newsId = _MyClollectModel.collect_id;
+        activityDetail.ImgUrl = _MyClollectModel.img_path;
         activityDetail.titleStr = _MyClollectModel.title;
         activityDetail.shareTitle = _MyClollectModel.title;
         activityDetail.index =@"0";
@@ -231,6 +233,7 @@
         newsDetail.titleStr = _MyClollectModel.title;
         newsDetail.shareTitle = _MyClollectModel.title;
         newsDetail.typeStr = _MyClollectModel.collect_type;
+        newsDetail.ImgUrl = _MyClollectModel.img_path;
         newsDetail.index =@"0";
         newsDetail.urlStr = [NSString stringWithFormat:@"%@/reviewDetail?id=%@",baseH5,_MyClollectModel.collect_id];
         newsDetail.shareUrl = [NSString stringWithFormat:@"%@/reviewDetail?id=%@",baseH5,_MyClollectModel.collect_id];

ZhongJingLianMeng/main/me(我的)/controller/newsViewController.m

@@ -317,6 +317,8 @@
             newsDetail.titleStr = _NewsModel.title;
             newsDetail.shareTitle = _NewsModel.title;
             newsDetail.typeStr = _NewsModel.type;
+            newsDetail.ImgUrl = _NewsModel.img_path;
+            
             newsDetail.index =@"0";
             newsDetail.urlStr = [NSString stringWithFormat:@"%@&move=ios",_NewsModel.base_url_ios];
             newsDetail.shareUrl = [NSString stringWithFormat:@"%@",_NewsModel.base_url_ios];
@@ -326,6 +328,7 @@
             activityDetail.newsId = _NewsModel.message_id;
             activityDetail.titleStr = _NewsModel.title;
             activityDetail.shareTitle = _NewsModel.title;
+            activityDetail.ImgUrl = _NewsModel.img_path;
             activityDetail.index =@"0";
             activityDetail.activityStatus = _NewsModel.activity;
             activityDetail.urlStr = [NSString stringWithFormat:@"%@&move=ios",_NewsModel.base_url_ios];
@@ -337,6 +340,7 @@
             newsDetail.titleStr = _NewsModel.title;
             newsDetail.shareTitle = _NewsModel.title;
             newsDetail.typeStr = _NewsModel.type;
+            newsDetail.ImgUrl = _NewsModel.img_path;
             newsDetail.index =@"0";
             newsDetail.urlStr = [NSString stringWithFormat:@"%@",_NewsModel.base_url_ios];
             newsDetail.shareUrl = [NSString stringWithFormat:@"%@",_NewsModel.base_url_ios];

ZhongJingLianMeng/main/me(我的)/model/Model/MyActivityModel.h

@@ -0,0 +1,21 @@
+//
+//  MyActivityModel.h
+//  ZhongJingLianMeng
+//
+//  Created by vinDesel on 2018/12/6.
+//  Copyright © 2018年 youke. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface MyActivityModel : NSObject
+@property (nonatomic, copy) NSString *cost;
+@property (nonatomic, copy) NSString *create_time;
+@property (nonatomic, copy) NSString *title;
+@property (nonatomic, copy) NSString *type;
+@property (nonatomic, copy) NSString *status;
+@property (nonatomic, copy) NSString *flag;
+@property (nonatomic, copy) NSString *ActivityId;
+@property (nonatomic, copy) NSString *activityStatus;
+
+@end

ZhongJingLianMeng/main/me(我的)/model/Model/MyActivityModel.m

@@ -0,0 +1,22 @@
+//
+//  MyActivityModel.m
+//  ZhongJingLianMeng
+//
+//  Created by vinDesel on 2018/12/6.
+//  Copyright © 2018年 youke. All rights reserved.
+//
+
+#import "MyActivityModel.h"
+
+@implementation MyActivityModel
++ (NSDictionary *)mj_replacedKeyFromPropertyName
+{
+    return @{
+             @"ActivityId" : @"id",
+             };
+}
+
+MJExtensionCodingImplementation
+// 容错处理
+- (void)setValue:(id)value forUndefinedKey:(NSString *)key {}
+@end

ZhongJingLianMeng/main/me(我的)/model/Model/activityModel.h

@@ -0,0 +1,24 @@
+//
+//  activityModel.h
+//  ZhongJingLianMeng
+//
+//  Created by youke on 2018/11/19.
+//  Copyright © 2018 youke. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface activityModel : NSObject
+@property (nonatomic, copy) NSString *img_path;
+@property (nonatomic, copy) NSString *news_Id;
+@property (nonatomic, copy) NSString *title;
+@property (nonatomic, copy) NSString *create_time;
+@property (nonatomic, copy) NSString *status;
+@end
+
+@interface activity_Model : NSObject
+@property (nonatomic, copy) NSString *img_path;
+@property (nonatomic, copy) NSString *news_Id;
+@property (nonatomic, copy) NSString *title;
+@property (nonatomic, copy) NSString *create_time;
+@end

ZhongJingLianMeng/main/me(我的)/model/Model/activityModel.m

@@ -0,0 +1,35 @@
+//
+//  activityModel.m
+//  ZhongJingLianMeng
+//
+//  Created by youke on 2018/11/19.
+//  Copyright © 2018 youke. All rights reserved.
+//
+
+#import "activityModel.h"
+
+@implementation activityModel
++ (NSDictionary *)mj_replacedKeyFromPropertyName
+{
+    return @{
+             @"news_Id" : @"id"
+             };
+}
+
+MJExtensionCodingImplementation
+// 容错处理
+- (void)setValue:(id)value forUndefinedKey:(NSString *)key {}
+@end
+
+@implementation activity_Model
++ (NSDictionary *)mj_replacedKeyFromPropertyName
+{
+    return @{
+             @"news_Id" : @"id"
+             };
+}
+
+MJExtensionCodingImplementation
+// 容错处理
+- (void)setValue:(id)value forUndefinedKey:(NSString *)key {}
+@end

ZhongJingLianMeng/main/me(我的)/model/Model/newModel.h

@@ -0,0 +1,18 @@
+//
+//  newModel.h
+//  ZhongJingLianMeng
+//
+//  Created by youke on 2018/11/15.
+//  Copyright © 2018 youke. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface newModel : NSObject
+
+@property (nonatomic, copy) NSString *img_path;
+@property (nonatomic, copy) NSString *news_Id;
+@property (nonatomic, copy) NSString *title;
+@property (nonatomic, copy) NSString *createTime;
+
+@end

ZhongJingLianMeng/main/me(我的)/model/Model/newModel.m

@@ -0,0 +1,25 @@
+//
+//  newModel.m
+//  ZhongJingLianMeng
+//
+//  Created by youke on 2018/11/15.
+//  Copyright © 2018 youke. All rights reserved.
+//
+
+#import "newModel.h"
+
+@implementation newModel
+
++ (NSDictionary *)mj_replacedKeyFromPropertyName
+{
+    return @{
+             @"news_Id" : @"id"
+             };
+}
+
+MJExtensionCodingImplementation
+// 容错处理
+- (void)setValue:(id)value forUndefinedKey:(NSString *)key {}
+
+
+@end

ZhongJingLianMeng/main/me(我的)/model/MyActivityModel.h

@@ -17,5 +17,8 @@
 @property (nonatomic, copy) NSString *flag;
 @property (nonatomic, copy) NSString *ActivityId;
 @property (nonatomic, copy) NSString *activityStatus;
+@property (nonatomic, copy) NSString *img_path;
+
+
 
 @end

ZhongJingLianMeng/main/me(我的)/model/MyClollectModel.h

@@ -15,5 +15,7 @@
 @property (nonatomic, copy) NSString *collect_type;
 @property (nonatomic, copy) NSString *createTime;
 @property (nonatomic, copy) NSString *title;
+@property (nonatomic, copy) NSString *img_path;
+
 
 @end

ZhongJingLianMeng/main/me(我的)/model/NewsModel.h

@@ -18,5 +18,6 @@
 @property (nonatomic, copy) NSString *base_url_android;
 @property (nonatomic, copy) NSString *updateId;
 @property (nonatomic, copy) NSString *activity;
+@property (nonatomic, copy) NSString *img_path;
 
 @end