iOS Team / CNLiveMineModule · Commits

Commit a6a276a0ffdafed8979a81e2bf94a221eb05dcee

Authored by zhangxiaowen
1 parent 0e983e5a

no message

Inline Side-by-side
Showing 7 changed files with 36 additions and 8 deletions
CNLiveMineModule/Assets/CNLiveMineModule.xcassets/mine_topic.imageset/Contents.json 0 → 100644
  View file @a6a276a
  1 +{
  2 + "images" : [
  3 + {
  4 + "idiom" : "universal",
  5 + "scale" : "1x"
  6 + },
  7 + {
  8 + "idiom" : "universal",
  9 + "filename" : "mine_topic@2x.png",
  10 + "scale" : "2x"
  11 + },
  12 + {
  13 + "idiom" : "universal",
  14 + "filename" : "mine_topic@3x.png",
  15 + "scale" : "3x"
  16 + }
  17 + ],
  18 + "info" : {
  19 + "version" : 1,
  20 + "author" : "xcode"
  21 + }
  22 +}
0 \ No newline at end of file 23 \ No newline at end of file
CNLiveMineModule/Assets/CNLiveMineModule.xcassets/mine_topic.imageset/mine_topic@2x.png 0 → 100644
View file @a6a276a

2.11 KB
CNLiveMineModule/Assets/CNLiveMineModule.xcassets/mine_topic.imageset/mine_topic@3x.png 0 → 100644
View file @a6a276a

5.58 KB
CNLiveMineModule/Classes/Controller/CNLiveMineController.m
  View file @a6a276a
@@ -96,6 +96,9 @@ static const CGFloat timeValue = 1.5; @@ -96,6 +96,9 @@ static const CGFloat timeValue = 1.5;
96 @"title":@"我的礼盒", 96 @"title":@"我的礼盒",
97 @"image":@"mine_gift_box" 97 @"image":@"mine_gift_box"
98 },@{ 98 },@{
  99 + @"title":@"我的话题",
  100 + @"image":@"mine_topic"
  101 + },@{
99 @"title":@"路径工具", 102 @"title":@"路径工具",
100 @"image":@"mine_tool_map" 103 @"image":@"mine_tool_map"
101 } 104 }
@@ -340,6 +343,10 @@ static const CGFloat timeValue = 1.5; @@ -340,6 +343,10 @@ static const CGFloat timeValue = 1.5;
340 [service pushToGiftBoxViewController]; 343 [service pushToGiftBoxViewController];
341 } 344 }
342 else if(item == 8){ 345 else if(item == 8){
  346 + // 我的话题
  347 + NSLog(@"我的话题");
  348 + }
  349 + else if(item == 9){
343 // 路径工具 350 // 路径工具
344 NSLog(@"路径工具"); 351 NSLog(@"路径工具");
345 } 352 }
CNLiveMineModule/Classes/UserInfo/CNLiveInfoUpdateController.m
  View file @a6a276a
@@ -610,7 +610,6 @@ static const CGFloat timeValue = 1.5; @@ -610,7 +610,6 @@ static const CGFloat timeValue = 1.5;
610 [weakSelf goBack]; 610 [weakSelf goBack];
611 }; 611 };
612 _navigationBar.onClickRightButton = ^{ 612 _navigationBar.onClickRightButton = ^{
613 -  
614 [self.textField resignFirstResponder]; 613 [self.textField resignFirstResponder];
615 [self.textView resignFirstResponder]; 614 [self.textView resignFirstResponder];
616 615
CNLiveMineModule/Classes/View/CNLiveMineHeaderView.m
  View file @a6a276a
@@ -82,7 +82,7 @@ static const NSInteger margin = 20; @@ -82,7 +82,7 @@ static const NSInteger margin = 20;
82 [_witness mas_remakeConstraints:^(MASConstraintMaker *make) { 82 [_witness mas_remakeConstraints:^(MASConstraintMaker *make) {
83 make.left.equalTo(self.mas_left).with.offset(1.5*margin); 83 make.left.equalTo(self.mas_left).with.offset(1.5*margin);
84 make.right.equalTo(self.mas_right).with.offset(-1.5*margin); 84 make.right.equalTo(self.mas_right).with.offset(-1.5*margin);
85 - make.width.height.offset(60); 85 + make.height.offset(60);
86 make.bottom.equalTo(self.mas_bottom).with.offset(-0.5*margin); 86 make.bottom.equalTo(self.mas_bottom).with.offset(-0.5*margin);
87 87
88 }]; 88 }];
@@ -126,8 +126,8 @@ static const NSInteger margin = 20; @@ -126,8 +126,8 @@ static const NSInteger margin = 20;
126 }]; 126 }];
127 127
128 [_sign mas_remakeConstraints:^(MASConstraintMaker *make) { 128 [_sign mas_remakeConstraints:^(MASConstraintMaker *make) {
129 - make.right.equalTo(self.mas_right).with.offset(0);  
130 - make.centerY.equalTo(self.header.mas_centerY).with.offset(0); 129 + make.right.equalTo(self.mas_right);
  130 + make.centerY.equalTo(self.header.mas_centerY);
131 make.width.mas_equalTo(105); 131 make.width.mas_equalTo(105);
132 make.height.mas_equalTo(32); 132 make.height.mas_equalTo(32);
133 133
Example/CNLiveMineModule.xcodeproj/project.pbxproj
  View file @a6a276a
@@ -222,8 +222,8 @@ @@ -222,8 +222,8 @@
222 6003F586195388D20070C39A /* Sources */, 222 6003F586195388D20070C39A /* Sources */,
223 6003F587195388D20070C39A /* Frameworks */, 223 6003F587195388D20070C39A /* Frameworks */,
224 6003F588195388D20070C39A /* Resources */, 224 6003F588195388D20070C39A /* Resources */,
225 - 9A3442385D2451688403927E /* [CP] Embed Pods Frameworks */,  
226 - 710471D807CA1F76BEA1AD6D /* [CP] Copy Pods Resources */, 225 + 9545F0F329E43E67825FEE43 /* [CP] Embed Pods Frameworks */,
  226 + 7061EC168890A931272660EB /* [CP] Copy Pods Resources */,
227 ); 227 );
228 buildRules = ( 228 buildRules = (
229 ); 229 );
@@ -314,7 +314,7 @@ @@ -314,7 +314,7 @@
314 /* End PBXResourcesBuildPhase section */ 314 /* End PBXResourcesBuildPhase section */
315 315
316 /* Begin PBXShellScriptBuildPhase section */ 316 /* Begin PBXShellScriptBuildPhase section */
317 - 710471D807CA1F76BEA1AD6D /* [CP] Copy Pods Resources */ = { 317 + 7061EC168890A931272660EB /* [CP] Copy Pods Resources */ = {
318 isa = PBXShellScriptBuildPhase; 318 isa = PBXShellScriptBuildPhase;
319 buildActionMask = 2147483647; 319 buildActionMask = 2147483647;
320 files = ( 320 files = (
@@ -338,7 +338,7 @@ @@ -338,7 +338,7 @@
338 shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveMineModule_Example/Pods-CNLiveMineModule_Example-resources.sh\"\n"; 338 shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveMineModule_Example/Pods-CNLiveMineModule_Example-resources.sh\"\n";
339 showEnvVarsInLog = 0; 339 showEnvVarsInLog = 0;
340 }; 340 };
341 - 9A3442385D2451688403927E /* [CP] Embed Pods Frameworks */ = { 341 + 9545F0F329E43E67825FEE43 /* [CP] Embed Pods Frameworks */ = {
342 isa = PBXShellScriptBuildPhase; 342 isa = PBXShellScriptBuildPhase;
343 buildActionMask = 2147483647; 343 buildActionMask = 2147483647;
344 files = ( 344 files = (