Skip to content

M
Macalline
Commit c97a34da authored by Sandy's avatar Sandy
Browse files
Options

增加联合营销

parent 4b7ee334
Hide whitespace changes
Inline Side-by-side
Showing with 108 additions and 56 deletions
Launch Screen.storyboard
View file @ c97a34da
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9531" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
</dependencies>
<scenes>
......
Macalline.xcodeproj/project.pbxproj
View file @ c97a34da
......@@ -1273,15 +1273,17 @@
baseConfigurationReference = 9DF2AE748F48D7C21F3300FE /* Pods.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_IDENTITY = "iPhone Distribution";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: jie zhang (9V9955H2BK)";
ENABLE_BITCODE = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "Macalline/Macalline-Prefix.pch";
INFOPLIST_FILE = "Macalline/Macalline-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
LIBRARY_SEARCH_PATHS = "$(inherited)";
PRODUCT_BUNDLE_IDENTIFIER = com.gomore.macalline;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE = "1167b943-9098-47a9-b05a-c0dd6682858f";
"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
SDKROOT = iphoneos;
VALID_ARCHS = "arm64 armv7";
......@@ -1294,15 +1296,17 @@
baseConfigurationReference = 416BF2437F5E4BB7D7F8A2AF /* Pods.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_IDENTITY = "";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
ENABLE_BITCODE = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "Macalline/Macalline-Prefix.pch";
INFOPLIST_FILE = "Macalline/Macalline-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
LIBRARY_SEARCH_PATHS = "$(inherited)";
PRODUCT_BUNDLE_IDENTIFIER = com.gomore.macalline;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE = "1167b943-9098-47a9-b05a-c0dd6682858f";
"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
SDKROOT = iphoneos;
VALID_ARCHS = "arm64 armv7";
......
Macalline/AppDelegate.m
View file @ c97a34da
......@@ -64,7 +64,7 @@
- (void)setDefaultUserDefaultValues
{
// if ([[UIApplication getObjectType:String key:kServerAddress] isEqualToString:@""]) {
// [UIApplication saveObject:@"192.168.32.140" type:String key:kServerAddress];
// [UIApplication saveObject:@"192.168.199.197" type:String key:kServerAddress];
// }
// if ([[UIApplication getObjectType:String key:kServerPort] isEqualToString:@""]) {
// [UIApplication saveObject:@"8080" type:String key:kServerPort];
......@@ -90,6 +90,7 @@
// [UIApplication saveObject:@"YES" type:String key:kLocalNotifySoundEnable];
// }
//
if ([[UIApplication getObjectType:String key:kServerAddress] isEqualToString:@""]) {
[UIApplication saveObject:@"219.235.234.227" type:String key:kServerAddress];
}
......
Macalline/Classes/DAL/BaseDao.m
View file @ c97a34da
......@@ -7,6 +7,7 @@
//
#import "BaseDao.h"
#import <sqlite3.h>
#import "NSObject+Customized.h"
@implementation BaseDao
......
Macalline/Classes/Utilities/BRNetworkMgr.m
View file @ c97a34da
......@@ -84,7 +84,7 @@
manager.responseSerializer = [AFJSONResponseSerializer serializer];
break;
}
manager.responseSerializer.acceptableContentTypes = [NSSet setWithObject:@"text/html"];
AFHTTPRequestOperation *operation = nil;
switch (method) {
case BRNetMgrMethodGet:
......@@ -131,6 +131,7 @@
switch (type) {
case BRNetMgrDataTypeJSON:
manager.responseSerializer = [AFJSONResponseSerializer serializer];
break;
case BRNetMgrDataTypeXML:
case BRNetMgrDataTypeSoap:
......
Macalline/Classes/ViewControllers/BigArea/BASystem/BANewHomeViewController.m
View file @ c97a34da
......@@ -687,8 +687,8 @@
lblName.text = @"小促销";
}
if (num == 2) {
[btn setBackgroundImage:[UIImage imageNamed:@"NavBar/no_icon_bg.png"] forState:UIControlStateNormal];
btn.enabled = NO;
images.image = [UIImage imageNamed:@"NavBar/icon_home_LianHeSales"];
lblName.text = @"联合营销";
}
}
[btn addTarget:self action:@selector(btnSelcted:) forControlEvents:UIControlEventTouchUpInside];
......@@ -737,6 +737,7 @@
}
if (num == 2) {
vc.btnType = kXiaocuxiaocode;
vc.isLianHeYingXiao = @"YES";
}
}
vc.dayCount = _dayCount;
......
Macalline/Classes/ViewControllers/BigArea/BATask/BATaskListViewController.h
View file @ c97a34da
......@@ -11,4 +11,6 @@
@interface BATaskListViewController : BaseScrollTableViewController
@property(nonatomic,strong)NSString* btnType;
@property(nonatomic,strong)NSString* dayCount;
@property (nonatomic, strong) NSString *isLianHeYingXiao; //判断是否联合营销
@end
Macalline/Classes/ViewControllers/BigArea/BATask/BATaskListViewController.m
View file @ c97a34da
......@@ -85,6 +85,9 @@ static NSString *cellIdentifier = @"TaskListCell";
}
if ([_btnType isEqualToString:kXiaocuxiaocode]) {
titles = @"小促销";
if ([self.isLianHeYingXiao isEqualToString: @"YES"]) {
titles = @"联合营销";
}
}
self.title = [NSString stringWithFormat:@"任务一览-%@",titles];
UIView* headView = [[UIView alloc] init];
......@@ -243,7 +246,15 @@ static NSString *cellIdentifier = @"TaskListCell";
[UIApplication showLoadingView:@"正在加载数据..."];
NSDictionary *dicParam = @{@"typeCode":_btnType,@"startDate":startDateStr,@"endDate":endDateStr};
AFHTTPRequestOperation *operation = [self.networkMgr operationWithURL:kBaseEXURL(interface)
NSString *requestUrl;
if ([self.isLianHeYingXiao isEqualToString: @"YES"]) {
requestUrl = kBaseWithLianHeYingXiaoEXURL(interface);
}else{
requestUrl = kBaseEXURL(interface);
}
AFHTTPRequestOperation *operation = [self.networkMgr operationWithURL:requestUrl
interface:interface
params:dicParam
dataType:BRNetMgrDataTypeJSON
......
Macalline/Classes/ViewControllers/SmallArea/SASystem/SANewHomeViewController.m
View file @ c97a34da
......@@ -655,7 +655,7 @@
}
if ([type isEqualToString:@"cx"]) {
btn.tag = 200+num;
btn.tag = 200 + num;
lblUndoneNum.tag = 250+num;
if (num == 0) {
images.image = [UIImage imageNamed:@"NavBar/icon_home_bigSales.png"];
......@@ -666,8 +666,8 @@
lblName.text = @"小促销";
}
if (num == 2) {
[btn setBackgroundImage:[UIImage imageNamed:@"NavBar/no_icon_bg.png"] forState:UIControlStateNormal];
btn.enabled = NO;
images.image = [UIImage imageNamed:@"NavBar/icon_home_LianHeSales"];
lblName.text = @"联合营销";
}
}
......@@ -718,6 +718,7 @@
}
if (num == 2) {
vc.btnType = kXiaocuxiaocode;
vc.isLianHeYingXiao = @"YES";
}
}
vc.dayCount = _dayCount;
......
Macalline/Classes/ViewControllers/SmallArea/SATaskListViewController.h
View file @ c97a34da
......@@ -11,4 +11,5 @@
@interface SATaskListViewController : BaseScrollTableViewController
@property(nonatomic,strong)NSString* btnType;
@property(nonatomic,strong)NSString* dayCount;
@property (nonatomic, strong) NSString *isLianHeYingXiao; //判断是否联合营销
@end
Macalline/Classes/ViewControllers/SmallArea/SATaskListViewController.m
View file @ c97a34da
......@@ -101,6 +101,9 @@
if ([_btnType isEqualToString:kXiaocuxiaocode]) {
self.title = @"小促销-任务一览";
titles=@"小促销";
if ([self.isLianHeYingXiao isEqualToString: @"YES"]) {
titles = @"联合营销";
}
}
self.title=[[NSString alloc] initWithFormat:@"任务一览-%@",titles];
......@@ -254,8 +257,19 @@
[UIApplication showLoadingView:@"正在加载数据..."];
NSString *interface = @"queryActivityListEX";
// 状态有未完成，已完成，过期 对应01，02，03
NSDictionary *dicParam = @{@"typeCode":_btnType,@"startDate":startDateStr,@"endDate":endDateStr};
AFHTTPRequestOperation *operation = [self.networkMgr operationWithURL:kBaseEXURL(interface)
NSDictionary *dicParam = @{@"typeCode":_btnType,
@"startDate":startDateStr,
@"endDate":endDateStr};
NSString *requestUrl;
if ([self.isLianHeYingXiao isEqualToString: @"YES"]) {
requestUrl = kBaseWithLianHeYingXiaoEXURL(interface);
}else{
requestUrl = kBaseEXURL(interface);
}
AFHTTPRequestOperation *operation = [self.networkMgr operationWithURL:requestUrl
interface:interface
params:dicParam
dataType:BRNetMgrDataTypeJSON
......
Macalline/Classes/ViewControllers/System/NewHomeViewController.m
View file @ c97a34da
......@@ -684,8 +684,8 @@
lblName.text = @"小促销";
}
if (num == 2) {
[btn setBackgroundImage:[UIImage imageNamed:@"NavBar/no_icon_bg.png"] forState:UIControlStateNormal];
btn.enabled = NO;
images.image = [UIImage imageNamed:@"NavBar/icon_home_LianHeSales"];
lblName.text = @"联合营销";
}
}
......@@ -741,6 +741,8 @@
if (num == 2) {
vc.btnType = kXiaocuxiaocode;
vc.title=@"任务一览－小促销";
vc.isLianHeYingXiao = @"YES";
}
}
......
Macalline/Classes/ViewControllers/Task/TaskListViewController.h
View file @ c97a34da
......@@ -10,5 +10,6 @@
@interface TaskListViewController : BaseScrollTableViewController
@property(nonatomic,strong)NSString* btnType;
@property (nonatomic, strong) NSString *isLianHeYingXiao;
@end
Macalline/Classes/ViewControllers/Task/TaskListViewController.m
View file @ c97a34da
......@@ -143,6 +143,10 @@
if ([Name isEqualToString:@"xiaocuxiao"]) {
str=@"小促销";
_btnType = kXiaocuxiaocode;
if ([self.isLianHeYingXiao isEqualToString: @"YES"]) {
str = @"联合营销";
}
}
self.title=[[NSString alloc] initWithFormat:@"任务一览-%@",str];
[self reRequestTableViewDatas];
......@@ -193,7 +197,15 @@
[UIApplication showLoadingView:@"正在加载数据..."];
// 状态有未完成，已完成，过期 对应01，02，03
NSDictionary *dicParam = @{@"status":[NSString stringWithFormat:@"%02d", (int)self.lastIndexOfItem+1],@"type":self.btnType};
AFHTTPRequestOperation *operation = [self.networkMgr operationWithURL:kBaseEXURL(interface)
NSString *requestUrl;
if ([self.isLianHeYingXiao isEqualToString: @"YES"]) {
requestUrl = kBaseWithLianHeYingXiaoEXURL(interface);
}else{
requestUrl = kBaseEXURL(interface);
}
AFHTTPRequestOperation *operation = [self.networkMgr operationWithURL:requestUrl
interface:interface
params:dicParam
dataType:BRNetMgrDataTypeJSON
......
Macalline/Classes/ViewControllers/Task/TaskUploadViewController.m
View file @ c97a34da
......@@ -16,8 +16,6 @@
UIAlertViewDelegate, UITextFieldDelegate, UIActionSheetDelegate >
{
BOOL hasDataChanged;
}
@property (copy,nonatomic)NSString *hasSaved;
......@@ -795,6 +793,8 @@ UIAlertViewDelegate, UITextFieldDelegate, UIActionSheetDelegate >
}
return _btnUpload;
}
#pragma =====================自定义按钮=================
-(UIButton *)btnAdd
......
Macalline/Constants.h
View file @ c97a34da
......@@ -57,6 +57,8 @@
#define kBaseEXURL(interface) [NSString stringWithFormat:@"http://%@:%@/hxxc/interfaceEX/%@.do",[UIApplication getObjectType:String key:kServerAddress], [UIApplication getObjectType:String key:kServerPort], interface]
#define kBaseWithLianHeYingXiaoEXURL(interface) [NSString stringWithFormat:@"http://%@:%@/hxxc/interfaceEX/%@.do?deptId=2",[UIApplication getObjectType:String key:kServerAddress], [UIApplication getObjectType:String key:kServerPort], interface]
//#define kBaseURL(interface, sessionid) [NSString stringWithFormat:@"http://%@:%@/hxxc/interface/%@.do;JSESSIONID=%@",[UIApplication getObjectType:String key:kServerAddress], [UIApplication getObjectType:String key:kServerPort], interface, sessionid]
//颜色
......
Macalline/Macalline-Info.plist
View file @ c97a34da
......@@ -9,7 +9,7 @@
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIdentifier</key>
<string>com.bestrun.app.macalline</string>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
......
Podfile.lock
View file @ c97a34da
PODS:
- AFNetworking (2.5.0):
- AFNetworking/NSURLConnection (= 2.5.0)
- AFNetworking/NSURLSession (= 2.5.0)
- AFNetworking/Reachability (= 2.5.0)
- AFNetworking/Security (= 2.5.0)
- AFNetworking/Serialization (= 2.5.0)
- AFNetworking/UIKit (= 2.5.0)
- AFNetworking/NSURLConnection (2.5.0):
- AFNetworking (2.5.4):
- AFNetworking/NSURLConnection (= 2.5.4)
- AFNetworking/NSURLSession (= 2.5.4)
- AFNetworking/Reachability (= 2.5.4)
- AFNetworking/Security (= 2.5.4)
- AFNetworking/Serialization (= 2.5.4)
- AFNetworking/UIKit (= 2.5.4)
- AFNetworking/NSURLConnection (2.5.4):
- AFNetworking/Reachability
- AFNetworking/Security
- AFNetworking/Serialization
- AFNetworking/NSURLSession (2.5.0):
- AFNetworking/NSURLSession (2.5.4):
- AFNetworking/Reachability
- AFNetworking/Security
- AFNetworking/Serialization
- AFNetworking/Reachability (2.5.0)
- AFNetworking/Security (2.5.0)
- AFNetworking/Serialization (2.5.0)
- AFNetworking/UIKit (2.5.0):
- AFNetworking/Reachability (2.5.4)
- AFNetworking/Security (2.5.4)
- AFNetworking/Serialization (2.5.4)
- AFNetworking/UIKit (2.5.4):
- AFNetworking/NSURLConnection
- AFNetworking/NSURLSession
- DACircularProgress (2.2.0)
- FMDB (2.4):
- FMDB/standard (= 2.4)
- FMDB/common (2.4)
- FMDB/standard (2.4):
- FMDB/common
- DACircularProgress (2.3.1)
- FMDB (2.6):
- FMDB/standard (= 2.6)
- FMDB/standard (2.6)
- FMDBHelpers (0.0.7):
- FMDB (~> 2.3)
- GexinSDK (1.1.1)
- MBProgressHUD (0.9)
- MBProgressHUD (0.9.2)
- MD5Digest (0.1.0)
- MPNotificationView (1.1.1)
- MWPhotoBrowser (1.4.1):
......@@ -38,11 +36,11 @@ PODS:
- PSTCollectionView (~> 1.2)
- SDWebImage (~> 3.7)
- PSTCollectionView (1.2.3)
- PureLayout (2.0.4)
- RDVTabBarController (1.1.8)
- SDWebImage (3.7.1):
- SDWebImage/Core (= 3.7.1)
- SDWebImage/Core (3.7.1)
- PureLayout (2.0.6)
- RDVTabBarController (1.1.9)
- SDWebImage (3.7.5):
- SDWebImage/Core (= 3.7.5)
- SDWebImage/Core (3.7.5)
- SwipeView (1.3.2)
- Toast (2.4)
- XMLDictionary (1.4)
......@@ -64,19 +62,19 @@ DEPENDENCIES:
- XMLDictionary (~> 1.4)
SPEC CHECKSUMS:
AFNetworking: 96ac9bf3eda33582701cb1fcc5b896aa1e20311e
DACircularProgress: 0f92b77239d5f3c612fc66185e2998391ac8e054
FMDB: d274d9ff773415735022ac57bfba9f6002f9fed8
AFNetworking: 05edc0ac4c4c8cf57bcf4b84be5b0744b6d8e71e
DACircularProgress: 4dd437c0fc3da5161cb289e07ac449493d41db71
FMDB: c1968bab3ab0aed38f66cb778ae1e7fa9a652b6e
FMDBHelpers: c6bd06c59049d51d9072180f253b6ee53f695bf3
GexinSDK: 184796e4506134301278008bef718da676f84d6a
MBProgressHUD: d8e7ea388dc1549a42e0d219067cf5f2c898fb66
MBProgressHUD: 1569cf7ace17a8bac47aabfbb8580a49690386d1
MD5Digest: 99bcccfc389c5b7a0edaf66beb80fbc7596a3b65
MPNotificationView: 0f342a4a5211f75ba9b395552af6c121b4730249
MWPhotoBrowser: 2531e682860d62b8a7ba8659de02eb9040e431e5
PSTCollectionView: 6749df92885353521f55279a7ce2b293762e2be4
PureLayout: 39ab7d09edec14750ba3982bf19126916861bba5
RDVTabBarController: 9d8505895ecf58df153d5babae93788276316f9f
SDWebImage: ed3095af2ff88b436426037444979b917f6c5575
PureLayout: f25f0bb904d5ccfe6e31da3cb869185259f02e0d
RDVTabBarController: 67794f7a7a37f8e32f046f85ac67d06ab92d624a
SDWebImage: 69c6303e3348fba97e03f65d65d4fbc26740f461
SwipeView: bd67cfaf7760c036438446b3ccb28a3b84fce009
Toast: 0773b8fc0e97352ca6054517bec7ebdd4110029d
XMLDictionary: f9f51601ba76678b594ab485f2b00ec1fed23724
......
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