Skip to content

G
GeliBusinessPlatform
Commit fe252789 authored by lujunye's avatar lujunye
Browse files
Options

上架版1.2

parent 04298c4f
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 18 deletions
GeliBusinessPlatform.xcodeproj/project.pbxproj
View file @ fe252789
......@@ -3295,7 +3295,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = GeliBusinessPlatform/GeliBusinessPlatform.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1.10;
CURRENT_PROJECT_VERSION = 1.20;
DEFINES_MODULE = NO;
DEVELOPMENT_ASSET_PATHS = "\"GeliBusinessPlatform/Preview Content\"";
DEVELOPMENT_TEAM = K48346UACH;
......@@ -3340,7 +3340,7 @@
"$(PROJECT_DIR)/GeliBusinessPlatform/Define/融云",
"$(PROJECT_DIR)/GeliBusinessPlatform/Other/JPush/Lib",
);
MARKETING_VERSION = 1.1;
MARKETING_VERSION = 1.2;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
......@@ -3427,7 +3427,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = GeliBusinessPlatform/GeliBusinessPlatform.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1.10;
CURRENT_PROJECT_VERSION = 1.20;
DEFINES_MODULE = NO;
DEVELOPMENT_ASSET_PATHS = "\"GeliBusinessPlatform/Preview Content\"";
DEVELOPMENT_TEAM = K48346UACH;
......@@ -3472,7 +3472,7 @@
"$(PROJECT_DIR)/GeliBusinessPlatform/Define/融云",
"$(PROJECT_DIR)/GeliBusinessPlatform/Other/JPush/Lib",
);
MARKETING_VERSION = 1.1;
MARKETING_VERSION = 1.2;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
......
GeliBusinessPlatform/Define/Define.swift
View file @ fe252789
......@@ -27,10 +27,10 @@ let systemVersion = (UIDevice.current.systemVersion as String)
//接口地址
//test
let SERVERCE_ImageHost = "https://z.gelifood.com/"
let SERVERCE_HOST = "https://z.gelifood.com/admin/"
//let SERVERCE_ImageHost = "https://zx.gelifood.com/"
//let SERVERCE_HOST = "https://zx.gelifood.com/admin/"
//let SERVERCE_ImageHost = "https://z.gelifood.com/"
//let SERVERCE_HOST = "https://z.gelifood.com/admin/"
let SERVERCE_ImageHost = "https://zx.gelifood.com/"
let SERVERCE_HOST = "https://zx.gelifood.com/admin/"
//online
//let SERVERCE_ImageHost = "https://api.laigewan.com/upload/images/"
//let SERVERCE_HOST = "http://a.gelifood.com/apia"
......
GeliBusinessPlatform/Other/LMNote/LMNoteViewController.m
View file @ fe252789
......@@ -317,8 +317,8 @@
[self.imgIndexArr addObject:index];
}
NSString *imgSrc = @"https://c.gelifood.com/";
// NSString *imgSrc = @"https://cms.gelifood.com/";
// NSString *imgSrc = @"https://c.gelifood.com/";
NSString *imgSrc = @"https://cms.gelifood.com/";
NSString *imgurl = [src stringByReplacingOccurrencesOfString:imgSrc withString:@""];
[self.imgUrlArr addObject:imgurl];
}
......
GeliBusinessPlatform/Other/LMNote/OtherViews/LMNImageView.m
View file @ fe252789
......@@ -81,8 +81,8 @@ static CGFloat const kVerticalMargin = kVerticalInset + kMargin;
}
- (void)setImageUrl:(NSString *)imageUrl {
_imageUrl = imageUrl;
NSString *imgSrc = @"https://c.gelifood.com/";
// NSString *imgSrc = @"https://cms.gelifood.com/";
// NSString *imgSrc = @"https://c.gelifood.com/";
NSString *imgSrc = @"https://cms.gelifood.com/";
[self.imageView sd_setImageWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@%@",imgSrc,imageUrl]]
placeholderImage:[UIImage imageNamed:@"lmn_tool_image"] options:(SDWebImageRetryFailed) completed:^(UIImage *image, NSError *error, SDImageCacheType cacheType, NSURL *imageURL) {
......
GeliBusinessPlatform/Other/LMNote/TextView/LMNTextStorage+Export.m
View file @ fe252789
......@@ -32,8 +32,8 @@
if ([line isKindOfMode:LMNLineModeModeImage]) {
// TODO: 图片部分逻辑未处理。
NSString *imgSrc = @"https://c.gelifood.com/";
// NSString *imgSrc = @"https://cms.gelifood.com/";
// NSString *imgSrc = @"https://c.gelifood.com/";
NSString *imgSrc = @"https://cms.gelifood.com/";
NSString *imgUrl = self.imgArr[i];
i += 1;
......
GeliBusinessPlatform/View/Cell/MsgCenterCell.xib
View file @ fe252789
......@@ -21,10 +21,10 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="uwl-m3-ngX">
<rect key="frame" x="15" y="15" width="345" height="105"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2020.04.26 12:26:42" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2eA-AH-8xd">
<rect key="frame" x="210" y="18.5" width="120" height="11"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2020.04.26 12:26:42" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2eA-AH-8xd">
<rect key="frame" x="220" y="18.5" width="110" height="11"/>
<constraints>
<constraint firstAttribute="width" constant="120" id="e4R-JE-YiJ"/>
<constraint firstAttribute="width" constant="110" id="e4R-JE-YiJ"/>
<constraint firstAttribute="height" constant="11" id="nxW-7d-8Z8"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="11"/>
......@@ -35,7 +35,7 @@
</userDefinedRuntimeAttributes>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="系统信息" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Uyq-HU-Mhn">
<rect key="frame" x="15" y="15" width="180" height="16"/>
<rect key="frame" x="15" y="15" width="190" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
......
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