Skip to content

A
ALand
Commit ba144473 authored by Sandy's avatar Sandy
Browse files
Options

正式版

parent 01c2a5f6
Hide whitespace changes
Inline Side-by-side
Showing with 74 additions and 93 deletions
ALand.xcodeproj/project.pbxproj
View file @ ba144473
......@@ -2926,8 +2926,8 @@
baseConfigurationReference = AAF51B5D53AE9938C03065C3 /* Pods.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_IDENTITY = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
ENABLE_BITCODE = NO;
GCC_PREFIX_HEADER = Aland/PrefixHeader.pch;
HEADER_SEARCH_PATHS = (
......
ALand/Application/AppDelegate.m
View file @ ba144473
......@@ -49,19 +49,6 @@
[UMSocialWechatHandler setWXAppId:@"wx2e218a9fb84928fa" appSecret:@"400c1925383f36f7768de707c69035e2" url:@"http://www.umeng.com/social"];
[MobClick startWithAppkey:@"573ed34ae0f55a408c000018" reportPolicy:(REALTIME) channelId:nil];
[MobClick setLogEnabled:YES];
Class cls = NSClassFromString(@"UMANUtil");
SEL deviceIDSelector = @selector(openUDIDString);
NSString *deviceID = nil;
if(cls && [cls respondsToSelector:deviceIDSelector]){
deviceID = [cls performSelector:deviceIDSelector];
}
NSData* jsonData = [NSJSONSerialization dataWithJSONObject:@{@"oid" : deviceID}
options:NSJSONWritingPrettyPrinted
error:nil];
NSLog(@"%@", [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding]);
}
......
ALand/CodeClass/Home/ViewController/StoreManagerment/StoreManagermentViewController.m
View file @ ba144473
......@@ -190,7 +190,7 @@
//生成上传图片URL的参数
- (NSDictionary *)getParamsWithImageUrl:(NSString *)imageUrl {
self.shopModel.pictures = [NSString stringWithFormat:@"http://7xtefo.com2.z0.glb.qiniucdn.com/%@", imageUrl];
self.shopModel.pictures = [NSString stringWithFormat:@"http://o93sl2fym.bkt.clouddn.com/%@", imageUrl];
UserInfo *user = [UserInfo shareInstance];
NSDictionary *dicShop = [self.shopModel dictionaryRepresentation];
NSDictionary *params = @{@"operCtx" : @{@"time" : [[NSDate date] timeStampNumber],
......
ALand/CodeClass/MIne/ViewController/AboutViewController.m
View file @ ba144473
......@@ -10,6 +10,7 @@
#import "UIImage+Helper.h"
@interface AboutViewController ()
@property (weak, nonatomic) IBOutlet UIImageView *imgViewTop;
@property (weak, nonatomic) IBOutlet UILabel *labelVersion;
@end
......@@ -21,6 +22,8 @@
self.imgViewTop.layer.masksToBounds = YES;
self.imgViewTop.layer.cornerRadius = 10;
self.imgViewTop.image = [UIImage appIcon];
NSString *version = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleShortVersionString"];
self.labelVersion.text = [NSString stringWithFormat:@"版本:%@",version];
// Do any additional setup after loading the view from its nib.
}
......
ALand/CodeClass/MIne/ViewController/AboutViewController.xib
View file @ ba144473
......@@ -8,6 +8,7 @@
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="AboutViewController">
<connections>
<outlet property="imgViewTop" destination="GUS-nD-bR6" id="Mzq-BJ-Fmc"/>
<outlet property="labelVersion" destination="PIk-Fj-Tp4" id="hTn-4c-Tes"/>
<outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
</connections>
</placeholder>
......
ALand/CodeClass/MIne/ViewController/SettingViewController.m
View file @ ba144473
......@@ -193,7 +193,7 @@
WS(weakSelf)
[[JavenQNManager shareInstance] upLoadImage:image isMD5Name:YES name:nil commpelete:^(NSString *key) {
self.reseller.portrait = [NSString stringWithFormat:@"http://7xtefo.com2.z0.glb.qiniucdn.com/%@", key];
self.reseller.portrait = [NSString stringWithFormat:@"http://o93sl2fym.bkt.clouddn.com/%@", key];
NSDictionary *params = [self getParamsWithReseller:self.reseller];
//上传成功之后把URL传给aland服务器
......
ALand/CodeClass/MIne/ViewController/SettingViewController.xib
View file @ ba144473
......@@ -30,7 +30,7 @@
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="rightIcon" translatesAutoresizingMaskIntoConstraints="NO" id="Tr7-KF-NsW">
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="rightIcon" translatesAutoresizingMaskIntoConstraints="NO" id="Tr7-KF-NsW">
<rect key="frame" x="357" y="30" width="10" height="30"/>
<constraints>
<constraint firstAttribute="width" constant="10" id="21S-TV-ZBG"/>
......@@ -70,7 +70,7 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Tgc-3e-TQr" userLabel="个性签名">
<rect key="frame" x="0.0" y="98" width="375" height="50"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="rightIcon" translatesAutoresizingMaskIntoConstraints="NO" id="q4e-UX-9Iq">
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="rightIcon" translatesAutoresizingMaskIntoConstraints="NO" id="q4e-UX-9Iq">
<rect key="frame" x="357" y="10" width="10" height="30"/>
<constraints>
<constraint firstAttribute="width" constant="10" id="gS6-OO-7Wj"/>
......@@ -118,7 +118,7 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="g2a-cQ-j4f" userLabel="消息设置">
<rect key="frame" x="0.0" y="156" width="375" height="50"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="rightIcon" translatesAutoresizingMaskIntoConstraints="NO" id="ODV-9G-WcV">
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="rightIcon" translatesAutoresizingMaskIntoConstraints="NO" id="ODV-9G-WcV">
<rect key="frame" x="357" y="10" width="10" height="30"/>
<constraints>
<constraint firstAttribute="width" constant="10" id="CWA-MV-hPn"/>
......@@ -164,7 +164,7 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7De-WQ-TBD" userLabel="登录密码">
<rect key="frame" x="0.0" y="214" width="375" height="50"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="rightIcon" translatesAutoresizingMaskIntoConstraints="NO" id="wt1-KT-vOJ">
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="rightIcon" translatesAutoresizingMaskIntoConstraints="NO" id="wt1-KT-vOJ">
<rect key="frame" x="357" y="10" width="10" height="30"/>
<constraints>
<constraint firstAttribute="width" constant="10" id="q7S-WT-utc"/>
......@@ -226,7 +226,7 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wea-du-rfh" userLabel="手机号码">
<rect key="frame" x="0.0" y="264" width="375" height="50"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="rightIcon" translatesAutoresizingMaskIntoConstraints="NO" id="i3E-Tf-yvZ">
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="rightIcon" translatesAutoresizingMaskIntoConstraints="NO" id="i3E-Tf-yvZ">
<rect key="frame" x="357" y="10" width="10" height="30"/>
<constraints>
<constraint firstAttribute="width" constant="10" id="NwH-25-OHc"/>
......@@ -285,7 +285,7 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="MiY-le-eXG" userLabel="提现密码">
<rect key="frame" x="0.0" y="314" width="375" height="50"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="rightIcon" translatesAutoresizingMaskIntoConstraints="NO" id="48E-sg-B55">
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="rightIcon" translatesAutoresizingMaskIntoConstraints="NO" id="48E-sg-B55">
<rect key="frame" x="357" y="10" width="10" height="30"/>
<constraints>
<constraint firstAttribute="width" constant="10" id="did-6Q-ZDB"/>
......@@ -344,7 +344,7 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3T0-bi-6UQ" userLabel="清空数据缓存">
<rect key="frame" x="0.0" y="372" width="375" height="50"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="rightIcon" translatesAutoresizingMaskIntoConstraints="NO" id="Lsf-Uu-0IB">
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="rightIcon" translatesAutoresizingMaskIntoConstraints="NO" id="Lsf-Uu-0IB">
<rect key="frame" x="357" y="10" width="10" height="30"/>
<constraints>
<constraint firstAttribute="width" constant="10" id="3TR-ju-sDy"/>
......@@ -403,7 +403,7 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2q7-xh-PXY" userLabel="关于">
<rect key="frame" x="0.0" y="422" width="375" height="50"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="rightIcon" translatesAutoresizingMaskIntoConstraints="NO" id="7eQ-EI-HIu">
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="rightIcon" translatesAutoresizingMaskIntoConstraints="NO" id="7eQ-EI-HIu">
<rect key="frame" x="357" y="10" width="10" height="30"/>
<constraints>
<constraint firstAttribute="width" constant="10" id="VeP-AK-Ucr"/>
......
ALand/Global/HTTPCilent.m
View file @ ba144473
......@@ -24,7 +24,8 @@
return cilent;
}
- (AFHTTPSessionManager *)manager {
- (AFHTTPSessionManager *)manager
{
if (!_manager) {
_manager = [[AFHTTPSessionManager alloc] initWithBaseURL:[NSURL URLWithString:REST_BASE_URL]];
_manager.responseSerializer = [AFJSONResponseSerializer serializer];
......@@ -89,75 +90,49 @@
- (void)checkUpdateOnVC:(UIViewController *)vc{
//版本号 取的是build
NSString *version = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleShortVersionString"];
//版本号 取的是build
NSString *version = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleShortVersionString"];
NSDictionary *params = @{@"domain": kDomain,
@"version": version,
@"type": @"ipa"
};
[[[self class] shareCilent] POST:@"app/getUpgrade" parameters:params success:^(NSURLSessionDataTask *task, id responseObject) {
NSDictionary *params = @{@"domain": kDomain,
@"version": version,
@"type": @"ipa"
};
[[[self class] shareCilent] POST:@"app/getUpgrade" parameters:params success:^(NSURLSessionDataTask *task, id responseObject) {
if (kIsResponseSuccess(responseObject)) {
NSDictionary *dic = responseObject[@"upgradeInfo"];
NSString *lastestVersion = dic[@"version"];
BOOL isForceUpdate = [dic[@"forceUpdate"] boolValue];
NSString *trackViewUrl = dic[@"url"];
if (kIsResponseSuccess(responseObject)) {
NSDictionary *dic = responseObject[@"upgradeInfo"];
NSString *lastestVersion = dic[@"version"];
BOOL isForceUpdate = [dic[@"forceUpdate"] boolValue];
#ifdef DEBUG
lastestVersion = @"2.0.1";
isForceUpdate = [JV_TestTool randomBool];
#else
#endif
if (lastestVersion) {
NSArray *arrVersion = [version componentsSeparatedByString:@"."];
NSArray *arrLatestVersion = [lastestVersion componentsSeparatedByString:@"."];
UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"提示" message:@"已经有新版本可以下载了哟！" preferredStyle:UIAlertControllerStyleAlert];
[alert addAction:({
UIAlertAction *action = [UIAlertAction actionWithTitle:@"前往更新" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
[[UIApplication sharedApplication] openURL:[NSURL URLWithString:trackViewUrl]];
}];
action;
})];
NSURL *trackViewUrl = [NSURL URLWithString:@"https://itunes.apple.com/us/app/xin-ying-yang-bu-luo/id1116490021?mt=8&uo=4"];
if (![arrVersion[0] isEqualToString: arrLatestVersion[0]]) {
CLog(@"大版本号有更新");
if (isForceUpdate) {
UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"提示" message:@"已经有新版本可以下载\n不更新将会软件将无法正常使用！！" preferredStyle:UIAlertControllerStyleAlert];
[alert addAction:({
UIAlertAction *action = [UIAlertAction actionWithTitle:@"前往更新" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
[[UIApplication sharedApplication] openURL:trackViewUrl];
[vc PresentModalViewController:alert animated:YES];
}];
action;
})];
[vc PresentModalViewController:alert animated:YES];
return ;
}
if (!isForceUpdate) {
[alert addAction:({
UIAlertAction *action = [UIAlertAction actionWithTitle:@"暂不更新" style:UIAlertActionStyleDefault handler:nil];
action;
})];
}
for (int i = 0; i < 3; i++) {
if (![arrVersion[i] isEqualToString:arrLatestVersion[i]]) {
CLog(@"小版本号有更新");
UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"提示" message:@"已经有新版本可以下载了哟！" preferredStyle:UIAlertControllerStyleAlert];
[alert addAction:({
UIAlertAction *action = [UIAlertAction actionWithTitle:@"前往更新" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
[[UIApplication sharedApplication] openURL:trackViewUrl];
}];
action;
})];
[alert addAction:({
UIAlertAction *action = [UIAlertAction actionWithTitle:@"暂不更新" style:UIAlertActionStyleDefault handler:nil];
action;
})];
[vc PresentModalViewController:alert animated:YES];
return ;
}
}
[vc PresentModalViewController:alert animated:YES];
}
CLog(@"d");
} failure:^(NSURLSessionDataTask *task, NSError *error) {
}];
}
} failure:^(NSURLSessionDataTask *task, NSError *error) {
}];
}
......
ALand/Global/JavenQNManager.m
View file @ ba144473
......@@ -12,6 +12,15 @@
#include <CommonCrypto/CommonCrypto.h>
#import "NSData+EncodeAdditions.h"
#import "UIImage+Helper.h"
//测试key
//#define kAK @"mRX5pK-bCChgNMxeiC_VlRgSFLuz_WbLT3OyViuh"
//#define kSK @"m8XQ8FjLiUY38pgDUzjHApdJ4YpgdlpmRT6FAwAg"
//正式key
#define kAK @"ufPuIR1b_gWCgaIjD_R1ujfl7Djy1VpKoCrHXBxc"
#define kSK @"2JR4SjeRpQp7rxroympYg3iglFB08nEojHGae80c"
@interface JavenQNManager ()
@property (nonatomic, strong) QNUploadManager *upManager;
@property (nonatomic, strong) QNUploadOption *option;
......@@ -37,8 +46,11 @@
- (void)upLoadImage:(UIImage *)image isMD5Name:(BOOL)isMD5Name name:(NSString *)imageName commpelete:(void(^)(NSString *key))commpelete {
NSString *AK =@"mRX5pK-bCChgNMxeiC_VlRgSFLuz_WbLT3OyViuh";
NSString *SK = @"m8XQ8FjLiUY38pgDUzjHApdJ4YpgdlpmRT6FAwAg";
NSString *AK =kAK;
NSString *SK = kSK;
self.token = [self makeToken:AK secretKey:SK];
UIImage *imgNewWidth = [image scaledToWidth:200];
......@@ -106,7 +118,7 @@
//按七牛“上传策略”的描述： <bucket>:<key>，表示只允许用户上传指定key的文件。在这种格式下文件默认允许“修改”，若已存在同名资源则会被覆盖。如果只希望上传指定key的文件，并且不允许修改，那么可以将下面的 insertOnly 属性值设为 1。
//所以如果参数只传users的话，下次上传key还是aaa的文件会提示存在同名文件，不能上传。
//传users:aaa的话，可以覆盖更新，但实测延迟较长，我上传同名新文件上去，下载下来的还是老文件。
[dic setObject:@"aland" forKey:@"scope"];//根据
[dic setObject:@"aland244" forKey:@"scope"];//根据
[dic setObject:deadlineNumber forKey:@"deadline"];
......
ALand/Info.plist
View file @ ba144473
......@@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.0.1</string>
<string>1.0.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
......@@ -42,7 +42,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>1.0.1</string>
<string>0</string>
<key>LSApplicationQueriesSchemes</key>
<array>
<string>wechat</string>
......
ALand/Macro/UrlHeader.h
View file @ ba144473
......@@ -9,7 +9,10 @@
#ifndef UrlHeader_h
#define UrlHeader_h
#define REST_BASE_URL @"http://139.196.195.30:8080/aland-server/rest"
#define REST_BASE_URL @"http://139.196.173.244:8080/aland-server/rest" //正式环境
//#define REST_BASE_URL @"http://139.196.195.30:8080/aland-server/rest" //测试环境
#define kDomain @"0001" //组织代码
......
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