王奥东 лет назад: 6
Родитель
Сommit
611e161dcc

BIN
FirstLink.xcworkspace/xcuserdata/wangaodong.xcuserdatad/UserInterfaceState.xcuserstate


+ 10 - 10
FirstLink.xcworkspace/xcuserdata/wangaodong.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -10,7 +10,7 @@
10 10
             ignoreCount = "0"
11 11
             continueAfterRunningActions = "No"
12 12
             filePath = "loan/HuaJiangHu/Home/View/KXHuaJiangHuMainPageTopCell.m"
13
-            timestampString = "562159492.083367"
13
+            timestampString = "562159665.421641"
14 14
             startingColumnNumber = "9223372036854775807"
15 15
             endingColumnNumber = "9223372036854775807"
16 16
             startingLineNumber = "305"
@@ -26,13 +26,13 @@
26 26
             ignoreCount = "0"
27 27
             continueAfterRunningActions = "No"
28 28
             filePath = "loan/HuaJiangHu/Home/View/KXHuaJiangHuMainPageTopCell.m"
29
-            timestampString = "562159492.083461"
29
+            timestampString = "562159665.421733"
30 30
             startingColumnNumber = "9223372036854775807"
31 31
             endingColumnNumber = "9223372036854775807"
32 32
             startingLineNumber = "286"
33 33
             endingLineNumber = "286"
34
-            landmarkName = "-getNetWorkerWithBannerCycle"
35
-            landmarkType = "7">
34
+            landmarkName = "KXHuaJiangHuMainPageTopCell"
35
+            landmarkType = "3">
36 36
          </BreakpointContent>
37 37
       </BreakpointProxy>
38 38
       <BreakpointProxy
@@ -42,7 +42,7 @@
42 42
             ignoreCount = "0"
43 43
             continueAfterRunningActions = "No"
44 44
             filePath = "loan/HuaJiangHu/Home/View/KXHuaJiangHuMainPageTopCell.m"
45
-            timestampString = "562159492.083528"
45
+            timestampString = "562159665.421804"
46 46
             startingColumnNumber = "9223372036854775807"
47 47
             endingColumnNumber = "9223372036854775807"
48 48
             startingLineNumber = "290"
@@ -58,13 +58,13 @@
58 58
             ignoreCount = "0"
59 59
             continueAfterRunningActions = "No"
60 60
             filePath = "loan/HuaJiangHu/Home/View/KXHuaJiangHuMainPageTopCell.m"
61
-            timestampString = "562159492.0835921"
61
+            timestampString = "562159665.421872"
62 62
             startingColumnNumber = "9223372036854775807"
63 63
             endingColumnNumber = "9223372036854775807"
64 64
             startingLineNumber = "337"
65 65
             endingLineNumber = "337"
66
-            landmarkName = "KXHuaJiangHuMainPageTopCell"
67
-            landmarkType = "3">
66
+            landmarkName = "-clickmiddleViewWithIndex:"
67
+            landmarkType = "7">
68 68
          </BreakpointContent>
69 69
       </BreakpointProxy>
70 70
       <BreakpointProxy
@@ -74,7 +74,7 @@
74 74
             ignoreCount = "0"
75 75
             continueAfterRunningActions = "No"
76 76
             filePath = "loan/HuaJiangHu/Home/View/Collect/KXHuaJiangHuCollectCell.m"
77
-            timestampString = "562159492.083657"
77
+            timestampString = "562159665.4219429"
78 78
             startingColumnNumber = "9223372036854775807"
79 79
             endingColumnNumber = "9223372036854775807"
80 80
             startingLineNumber = "84"
@@ -90,7 +90,7 @@
90 90
             ignoreCount = "0"
91 91
             continueAfterRunningActions = "No"
92 92
             filePath = "loan/HuaJiangHu/Home/View/Collect/FirstLinkTableViewCellNoData.m"
93
-            timestampString = "562159492.083708"
93
+            timestampString = "562159665.421998"
94 94
             startingColumnNumber = "9223372036854775807"
95 95
             endingColumnNumber = "9223372036854775807"
96 96
             startingLineNumber = "51"

+ 1 - 2
loan/HuaJiangHu/Home/View/KXHuaJiangHuMainPageNineButton.m

@@ -68,9 +68,8 @@
68 68
             make.right.mas_equalTo(self);
69 69
             make.left.mas_equalTo(self).mas_offset(Fitsize(8));
70 70
         }];
71
-        self.rateLabel.textColor = [UIColor KXColorWithHex:0x422E2E];
72 71
         self.rateLabel.font = [UIFont systemFontOfSize:Fitsize(11)];
73
-
72
+        self.rateLabel.textColor = [UIColor KXColorWithHex:0x666666];
74 73
         self.layer.cornerRadius = Fitsize(4);
75 74
         [self.layer masksToBounds];
76 75
         

+ 6 - 4
loan/HuaJiangHu/Home/View/KXHuaJiangHuMainPageTopCell.m

@@ -94,9 +94,10 @@
94 94
     UIButton *tempButton;
95 95
     
96 96
     //    CGFloat width = (SCREEN_WIDTH - 20 - distance*(count-1))/self.h5ListModelArray.count;
97
+//    CGSize stringFrame = [@"要五个字符" boundingRectWithSize:CGSizeMake(MAXFLOAT, 17) options:<#(NSStringDrawingOptions)#> attributes:<#(nullable NSDictionary<NSAttributedStringKey,id> *)#> context:<#(nullable NSStringDrawingContext *)#>]
97 98
     CGFloat count = self.h5ListModelArray.count;
98
-    CGFloat distance = (SCREEN_WIDTH - 20 - 60*count) /self.h5ListModelArray.count;
99
-    CGFloat width = Fitsize(60);
99
+    CGFloat distance = (SCREEN_WIDTH - 20 - 70*count) /self.h5ListModelArray.count;
100
+    CGFloat width = Fitsize(70);
100 101
     for (int i = 0; i < self.h5ListModelArray.count; i++) {
101 102
         XJADTopIconBottomLabelButton *button = [[XJADTopIconBottomLabelButton alloc] init];
102 103
         [self.contentView addSubview:button];
@@ -111,10 +112,10 @@
111 112
         }else {
112 113
             
113 114
             [button mas_makeConstraints:^(MASConstraintMaker *make) {
114
-                make.width.mas_equalTo(width);
115
+               
115 116
                 make.top.mas_equalTo(self.topLine.mas_bottom).mas_offset(Fitsize(13));
116 117
                 make.height.mas_equalTo(Fitsize(60));
117
-                make.left.mas_equalTo(self.containerView).mas_offset(Fitsize(10));
118
+                make.width.mas_equalTo(width); make.left.mas_equalTo(self.containerView).mas_offset(Fitsize(10));
118 119
             }];
119 120
             
120 121
         }
@@ -142,6 +143,7 @@
142 143
         }];
143 144
         _verticleView.delegate = self;
144 145
         _verticleView.imageName = @"xiahuazhunews";
146
+        _verticleView.isHuaJiangHu = YES;
145 147
         NSMutableArray *contentArray = [NSMutableArray arrayWithCapacity:0];
146 148
         
147 149
         [KXMainPageViewModel requestVerticleHuaJiangHu:^(NSArray *notice) {

+ 1 - 0
loan/Main/MainPage/View/KXMainVerticleCycleView.h

@@ -20,4 +20,5 @@
20 20
 @property (nonatomic,assign)id<KXMainVerticleCycleViewDelegate>delegate;
21 21
 @property (nonatomic,strong)NSString *imageName;
22 22
 
23
+@property (nonatomic,assign)BOOL isHuaJiangHu;
23 24
 @end

+ 18 - 0
loan/Main/MainPage/View/KXMainVerticleCycleView.m

@@ -14,6 +14,7 @@
14 14
 
15 15
 {
16 16
     UIImageView *imageView;
17
+    UIView *lineView;
17 18
 }
18 19
 @property (nonatomic,weak)UIScrollView *scrollView;
19 20
 @property (nonatomic,weak)NSTimer *scrollTimer;
@@ -192,4 +193,21 @@
192 193
     [_delegate clickmiddleViewWithIndex:tap.view.tag-2346];
193 194
 }
194 195
 
196
+-(void)setIsHuaJiangHu:(BOOL)isHuaJiangHu {
197
+    _isHuaJiangHu = isHuaJiangHu;
198
+    if (isHuaJiangHu) {
199
+        lineView = [[UIView alloc] init];
200
+        [self addSubview:lineView];
201
+        [lineView mas_makeConstraints:^(MASConstraintMaker *make) {
202
+            make.top.bottom.mas_equalTo(imageView);
203
+            make.left.mas_equalTo(imageView.mas_right).mas_offset(Fitsize(5));
204
+            make.width.mas_equalTo(Fitsize(1));
205
+        }];
206
+        lineView.backgroundColor = [UIColor KXColorWithHex:0xF4F4F4];
207
+    }else {
208
+        [lineView removeFromSuperview];
209
+        lineView = nil;
210
+    }
211
+}
212
+
195 213
 @end