增加人物形象选择0.5.0

yanglingyu
1 parent dc4d22fc
Showing 6 changed files with 53 additions and 15 deletions
CNLiveCMineModule.podspec
CNLiveCMineModule/Assets/CNLiveCMineModule.xcassets/Mine/mine_image.imageset/Contents.json
CNLiveCMineModule/Assets/CNLiveCMineModule.xcassets/Mine/mine_image.imageset/wodexingxiang@2x.png
CNLiveCMineModule/Assets/CNLiveCMineModule.xcassets/Mine/mine_image.imageset/wodexingxiang@3x.png
CNLiveCMineModule/Classes/CNCMine/View/CNTopImageView.m
CNLiveCMineModule/Classes/CNLiveCMineProtocol.h
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveCMineModule'
-  s.version          = '0.4.9'
+  s.version          = '0.5.0'
   s.summary          = '网家家C端个人中心'
 # This description is used to generate tags and improve search results.
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "wodexingxiang@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "wodexingxiang@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
@@ -19,6 +19,7 @@
 @property (nonatomic, strong) UIButton *unionBtn;//我的工会
 @property (nonatomic, strong) UIButton *homelandBtn;//我的家园
 @property (nonatomic, strong) UIButton *myCommuintyBtn;//我的社区
+@property (nonatomic, strong) UIButton *myImage;
 @property (nonatomic, strong) CNListCollectionView *mineListView;//我的视频、我的收藏、生活圈、付费记录
 @end
@@ -38,6 +39,7 @@
             [self addSubview:self.myCommuintyBtn];
         }else{
             [self addSubview:self.backBtn];
+            [self addSubview:self.myImage];
         }
         [self addSubview:self.mineListView];
         [self uploadViewLayout];
@@ -55,6 +57,11 @@
         make.left.equalTo(self).offset(DS_adapt_length(12));
         make.width.height.mas_equalTo(DS_adapt_length(60));
     }];
+    [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_equalTo(DS_adapt_length(82.5));
+        make.right.equalTo(self).offset(-10);
+        make.top.mas_equalTo(kStatusHeight+DS_adapt_length(39));
+    }];
     if ([CNLiveEnvironmentManager manager].isNewHomePage) {
         [self.codesView mas_makeConstraints:^(MASConstraintMaker *make) {
             make.top.equalTo(self).offset(kStatusHeight);
@@ -68,17 +75,18 @@
             make.width.mas_equalTo(DS_adapt_length(11));
             make.height.mas_equalTo(DS_adapt_length(18));
         }];
-        [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.left.mas_equalTo(DS_adapt_length(82.5));
-            make.right.equalTo(self).offset(-10);
-            make.top.mas_equalTo(kStatusHeight+DS_adapt_length(53));
-        }];
         [self.mineListView mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.top.equalTo(self.titleLabel.mas_bottom).offset(DS_adapt_length(25));
+            make.top.equalTo(self.myImage.mas_bottom).offset(DS_adapt_length(15));
             make.left.equalTo(self).offset(DS_adapt_length(10));
             make.right.equalTo(self).offset(-DS_adapt_length(10));
             make.height.mas_equalTo(DS_adapt_length(70));
         }];
+        [self.myImage mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.left.equalTo(self.titleLabel);
+            make.top.mas_equalTo(kStatusHeight+DS_adapt_length( 35+30));
+            make.height.mas_equalTo(DS_adapt_length(26));
+            make.width.mas_equalTo(DS_adapt_length(86.5));
+        }];
     }else{
         [self.codesView mas_makeConstraints:^(MASConstraintMaker *make) {
             make.top.equalTo(self).offset(kStatusHeight);
@@ -86,12 +94,6 @@
             make.height.mas_equalTo(DS_adapt_length(35));
             make.width.mas_equalTo(DS_adapt_length(105));
         }];
-      
-        [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.left.mas_equalTo(DS_adapt_length(82.5));
-            make.right.equalTo(self).offset(-10);
-            make.top.mas_equalTo(kStatusHeight+DS_adapt_length(39));
-        }];
         [self.homelandBtn mas_makeConstraints:^(MASConstraintMaker *make) {
             make.left.equalTo(self.titleLabel);
             make.top.mas_equalTo(kStatusHeight+DS_adapt_length( 35+30));
@@ -162,7 +164,10 @@
             [[BaseAppDelegate sharedAppDelegate] popViewController];
         }
             break;
-            
+        case 4:{
+            [[CNLiveCMineService shareMineProtocol] pushCMineContentForCMainPlatWithType:27 param:@{} contentVC:[self displayViewController]];
+            break;
+        }
         default:
             break;
     };
@@ -236,6 +241,17 @@
     }
     return _myCommuintyBtn;
 }
+- (UIButton *)myImage
+{
+    if (!_myImage) {
+        _myImage = [UIButton buttonWithType:UIButtonTypeCustom];
+        _myImage.exclusiveTouch = YES;
+        _myImage.tag = 1005;
+        [_myImage setBackgroundImage:[UIImage imageNamed:@"mine_image"] forState:UIControlStateNormal];
+        [_myImage addTarget:self action:@selector(buttonAction:) forControlEvents:UIControlEventTouchUpInside];
+    }
+    return _myImage;
+}
 - (UILabel *)titleLabel{
     if (!_titleLabel) {
         _titleLabel = [[UILabel alloc] init];
@@ -72,7 +72,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)sendMessageWithCodeType:(CNLiveMobileType) type mobile:(NSString *)pNumber contryCode:(NSString *)contryCode verificationCode:(NSString *)verifiCode success:(void(^)(id result))success failure:(void(^)(NSDictionary *errorDic))failure;
 /// 交互跳转
-/// @param type 跳转类型1.协议信息h5页面 2.我的视频 3.生活圈 4付费记录 5.电商订单 6投诉 7听见中国 8扫描二维码 9设置背景图片 10用户信息页 11通信录黑名单 12活动h5页面 13小家音响页面跳转 14通讯录界面 15点播页面 16聊天界面 17达人主页 18我的家园 19我的工会 20我的社区 21我的礼盒 22我的话题 23赛事活动 24徒步记录 25路径工具 26第三方绑定 
+/// @param type 跳转类型1.协议信息h5页面 2.我的视频 3.生活圈 4付费记录 5.电商订单 6投诉 7听见中国 8扫描二维码 9设置背景图片 10用户信息页 11通信录黑名单 12活动h5页面 13小家音响页面跳转 14通讯录界面 15点播页面 16聊天界面 17达人主页 18我的家园 19我的工会 20我的社区 21我的礼盒 22我的话题 23赛事活动 24徒步记录 25路径工具 26第三方绑定 27选择人物形象
 /// @param param 跳转传参
 - (void)pushCMineContentForCMainPlatWithType:(NSInteger)type param:(NSDictionary *)param contentVC:(UIViewController *)contetVC;