Skip to content

红
红星美凯龙管理在线APP IOS
Commit 7cf61ae6 authored by admin's avatar admin
Browse files
Options

更新jPush 首页优化

parent e101e22a
Hide whitespace changes
Inline Side-by-side
Showing with 960 additions and 999 deletions
Podfile.lock
View file @ 7cf61ae6
......@@ -44,4 +44,4 @@ SPEC CHECKSUMS:
RATreeView: abb5e11bb2f955c7f58b1295d2b0eab1de7c2920
SDWebImage: 71b7cdc1d1721d6a82ed62889030225f2c249e29
COCOAPODS: 0.39.0
COCOAPODS: 0.38.2
Pods/Manifest.lock
View file @ 7cf61ae6
......@@ -44,4 +44,4 @@ SPEC CHECKSUMS:
RATreeView: abb5e11bb2f955c7f58b1295d2b0eab1de7c2920
SDWebImage: 71b7cdc1d1721d6a82ed62889030225f2c249e29
COCOAPODS: 0.39.0
COCOAPODS: 0.38.2
Pods/Pods.xcodeproj/project.pbxproj
View file @ 7cf61ae6
This source diff could not be displayed because it is too large. You can view the blob instead.
Pods/Pods.xcodeproj/xcuserdata/admin.xcuserdatad/xcschemes/AFNetworking.xcscheme
View file @ 7cf61ae6
......@@ -14,7 +14,7 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "31805CC1CF27E8C7755D8815"
BlueprintIdentifier = "06233FDD99F2013F83A398F3"
BuildableName = "libAFNetworking.a"
BlueprintName = "AFNetworking"
ReferencedContainer = "container:Pods.xcodeproj">
......
Pods/Pods.xcodeproj/xcuserdata/admin.xcuserdatad/xcschemes/Pods.xcscheme
View file @ 7cf61ae6
......@@ -14,7 +14,7 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "EDCF6CB78FDFACBCABC012BC"
BlueprintIdentifier = "9AD3B25BF8427F9674B17662"
BuildableName = "libPods.a"
BlueprintName = "Pods"
ReferencedContainer = "container:Pods.xcodeproj">
......
Pods/Pods.xcodeproj/xcuserdata/admin.xcuserdatad/xcschemes/SDWebImage.xcscheme
View file @ 7cf61ae6
......@@ -14,7 +14,7 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "0A64513C1B78725A36C743FF"
BlueprintIdentifier = "10477AB8861E6E46A25DFBCD"
BuildableName = "libSDWebImage.a"
BlueprintName = "SDWebImage"
ReferencedContainer = "container:Pods.xcodeproj">
......
Pods/Pods.xcodeproj/xcuserdata/admin.xcuserdatad/xcschemes/xcschememanagement.plist
View file @ 7cf61ae6
......@@ -37,32 +37,32 @@
</dict>
<key>SuppressBuildableAutocreation</key>
<dict>
<key>0A84A7AEED2585FA18F182B740F5DE4C</key>
<key>5352D432641F0656C90741034E32F31E</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>5352D432641F0656C90741034E32F31E</key>
<key>8421FA013F6234E416E9E5363CB99DDB</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>BAE21A624CC684DE7190C8516D5C1D79</key>
<key>BB58AC6D7CE35348B874113DF4C0EF45</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>BB58AC6D7CE35348B874113DF4C0EF45</key>
<key>BB698F8AC1978892388DCBBBB644ACFB</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>BB698F8AC1978892388DCBBBB644ACFB</key>
<key>CB31271C2921A12D89FFCA121A02166F</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>D2622CD5BD5433C58B2785DDFB9B0573</key>
<key>F6EBA2C87F0A4CB70AF517C3E99C2E16</key>
<dict>
<key>primary</key>
<true/>
......
Pods/Target Support Files/AFNetworking/AFNetworking.xcconfig
View file @ 7cf61ae6
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/AFNetworking" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking" "${PODS_ROOT}/Headers/Public/JPushSDK" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/RATreeView" "${PODS_ROOT}/Headers/Public/SDWebImage"
OTHER_LDFLAGS = -framework "CoreGraphics" -framework "MobileCoreServices" -framework "Security" -framework "SystemConfiguration"
PODS_ROOT = ${SRCROOT}
SKIP_INSTALL = YES
\ No newline at end of file
AFNETWORKING_OTHER_LDFLAGS = -framework "CoreGraphics" -framework "MobileCoreServices" -framework "Security" -framework "SystemConfiguration"
\ No newline at end of file
Pods/Target Support Files/Pods/Pods-resources.sh
View file @ 7cf61ae6
......@@ -66,7 +66,7 @@ fi
mkdir -p "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
if [[ "${ACTION}" == "install" ]] && [[ "${SKIP_INSTALL}" == "NO" ]]; then
if [[ "${ACTION}" == "install" ]]; then
mkdir -p "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
fi
......
Pods/Target Support Files/SDWebImage/SDWebImage.xcconfig
View file @ 7cf61ae6
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/SDWebImage" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking" "${PODS_ROOT}/Headers/Public/JPushSDK" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/RATreeView" "${PODS_ROOT}/Headers/Public/SDWebImage"
OTHER_LDFLAGS = -framework "ImageIO"
PODS_ROOT = ${SRCROOT}
SKIP_INSTALL = YES
\ No newline at end of file
SDWEBIMAGE_OTHER_LDFLAGS = -framework "ImageIO"
\ No newline at end of file
redstar.xcodeproj/project.pbxproj
View file @ 7cf61ae6
......@@ -2228,7 +2228,6 @@
84970DE71BD8DD8A00C1728A /* Frameworks */,
84970DE81BD8DD8A00C1728A /* Resources */,
23955BAECB0FED236FD29A26 /* Copy Pods Resources */,
8D85C266E1CF82C4CB638DED /* Embed Pods Frameworks */,
);
buildRules = (
);
......@@ -2371,21 +2370,6 @@
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-resources.sh\"\n";
showEnvVarsInLog = 0;
};
8D85C266E1CF82C4CB638DED /* Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
BC0FD901EAA939388DD7E146 /* Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
......
redstar/Classes/Module/Home/ViewController/HomeViewController.m
View file @ 7cf61ae6
......@@ -94,7 +94,14 @@ typedef NSComparisonResult (^NSComparator)(id obj1, id obj2);
self.navigationItem.titleView = customLab;
self.titleArray = [NSMutableArray array];
self.sectionArray = [NSMutableArray array];
self.sectionArray = [NSMutableArray arrayWithObjects:@"口碑报告",@"商场风采", @"问题知识",@"口碑巡检",nil];
self.allRankListArray = [NSMutableArray array];
self.taskListDataArray = [NSMutableArray array];
self.allQuestionArray = [NSMutableArray array];
self.allPraiseListArray = [NSMutableArray array];
[self setupNav];
NSArray *permissions = [[NSUserDefaults standardUserDefaults] objectForKey:@"permissions"];
......@@ -103,10 +110,12 @@ typedef NSComparisonResult (^NSComparator)(id obj1, id obj2);
if ([permissions containsObject:@"500201"]) {
[self.titleArray addObject:@"口碑报告"];
[self requestRankingList];
} else {
[_sectionArray removeObject:@"口碑报告"];
}
[self.titleArray addObject:@"商场风采"];
//[self requestPicturePraise];
[self requestPicturePraise];
if ([permissions containsObject:@"500301"] || [permissions containsObject:@"500302"]) {
[self.titleArray addObject:@"图说口碑"];
......@@ -118,30 +127,23 @@ typedef NSComparisonResult (^NSComparator)(id obj1, id obj2);
if ([permissions containsObject:@"500501"] || [permissions containsObject:@"500502"]) {
[self.titleArray addObject:@"问题知识"];
// [self requestQuestionList];
[self requestQuestionList];
}else {
[_sectionArray removeObject:@"问题知识"];
}
if ([permissions containsObject:@"500101"] || [permissions containsObject:@"500102"]) {
[self.titleArray addObject:@"口碑巡检"];
//[self requestInspectList];
[self requestInspectList];
}else {
[_sectionArray removeObject:@"口碑巡检"];
}
[[NSUserDefaults standardUserDefaults] setObject:_titleArray forKey:@"function"];
[self setupNav];
[self setupTableView];
[MBProgressHUD showHUDAddedTo:self.view animated:YES];
self.allRankListArray = [NSMutableArray array];
self.taskListDataArray = [NSMutableArray array];
self.allQuestionArray = [NSMutableArray array];
self.allPraiseListArray = [NSMutableArray array];
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(refreshInspectList)
......@@ -319,7 +321,7 @@ typedef NSComparisonResult (^NSComparator)(id obj1, id obj2);
[httpCilent getRankingListWithParameters:parameters completion:^(id response, NSError *error) {
[self requestPicturePraise];
// [self requestPicturePraise];
NSLog(@"口碑报告response = %@", response);
NSDictionary *dataDict = response[@"data"];
......@@ -342,8 +344,8 @@ typedef NSComparisonResult (^NSComparator)(id obj1, id obj2);
rank.index = rank.score == prevRank.score ? prevRank.index: i + 1;
}
}
if (_allRankListArray.count != 0) {
[_sectionArray addObject:@"口碑报告"];
if (_allRankListArray.count == 0) {
[_sectionArray removeObject:@"口碑报告"];
}
[self.tableView reloadData];
[MBProgressHUD hideHUDForView:self.view animated:YES];
......@@ -392,8 +394,8 @@ typedef NSComparisonResult (^NSComparator)(id obj1, id obj2);
}
_taskListDataArray = [NSMutableArray arrayWithArray:tempArray];
if (_taskListDataArray.count != 0) {
[_sectionArray addObject:@"口碑巡检"];
if (_taskListDataArray.count == 0) {
[_sectionArray removeObject:@"口碑巡检"];
}
[self.tableView reloadData];
[MBProgressHUD hideHUDForView:self.view animated:YES];
......@@ -420,7 +422,7 @@ typedef NSComparisonResult (^NSComparator)(id obj1, id obj2);
// 请求问题列表
[httpClient getQuestionListWithParameters:parameters completion:^(id response, NSError *error) {
[self requestInspectList];
// [self requestInspectList];
NSDictionary *dataDict = (NSDictionary *)response[@"data"];
NSDictionary *recordsDict = (NSDictionary *)dataDict[@"records"];
......@@ -433,8 +435,8 @@ typedef NSComparisonResult (^NSComparator)(id obj1, id obj2);
[tempArray addObject:question];
}
_allQuestionArray = [NSMutableArray arrayWithArray:tempArray];
if (_allQuestionArray.count != 0) {
[_sectionArray addObject:@"问题知识"];
if (_allQuestionArray.count == 0) {
[_sectionArray removeObject:@"问题知识"];
}
[self.tableView reloadData];
......@@ -463,7 +465,7 @@ typedef NSComparisonResult (^NSComparator)(id obj1, id obj2);
// 请求问题列表
[httpClient queryPicturePraiseWithParameters:parameters completion:^(id response, NSError *error) {
[self requestQuestionList];
// [self requestQuestionList];
NSDictionary *dataDict = response[@"data"];
NSArray *dataArray = dataDict[@"records"];
NSMutableArray *tempArray = [NSMutableArray array];
......@@ -473,8 +475,8 @@ typedef NSComparisonResult (^NSComparator)(id obj1, id obj2);
[tempArray addObject:picList];
}
_allPraiseListArray = [NSMutableArray arrayWithArray:tempArray];
if (_allPraiseListArray.count != 0) {
[_sectionArray addObject:@"商场风采"];
if (_allPraiseListArray.count == 0) {
[_sectionArray removeObject:@"商场风采"];
}
[self.tableView reloadData];
[MBProgressHUD hideHUDForView:self.view animated:YES];
......@@ -504,12 +506,11 @@ typedef NSComparisonResult (^NSComparator)(id obj1, id obj2);
self.headView.scrollView.contentSize = CGSizeMake(2 * kScreenWidth, 86);
CGFloat itemW = kScreenWidth / 4;
CGFloat itemH = self.headView.scrollView.frame.size.height;
NSMutableArray *titleArray = [[NSUserDefaults standardUserDefaults] objectForKey:@"function"];
for (int i = 0; i < titleArray.count; i++) {
for (int i = 0; i < _titleArray.count; i++) {
HomeCellItem *item = [[HomeCellItem alloc] init];
item.frame = CGRectMake(i * itemW, 0, itemW, itemH);
NSString *nameStr = titleArray[i];
NSString *nameStr = _titleArray[i];
UIImage *image = [UIImage imageNamed:[NSString stringWithFormat:@"%@", nameStr]];
[item setImage:image forState:UIControlStateNormal];
[item setTitleColor:kPictureCellDetailsColor forState:UIControlStateNormal];
......@@ -526,6 +527,8 @@ typedef NSComparisonResult (^NSComparator)(id obj1, id obj2);
[self refreshAllData];
}];
[self.tableView reloadData];
}
// 更多按钮点击事件
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment