Commit 28cdf6b5 authored by 曹云霄's avatar 曹云霄

增加3D体验中心分享交互

parent d4a4f257
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
TOForumCategoryEntity *category = self.result.list[indexPath.row]; TOForumCategoryEntity *category = self.result.list[indexPath.row];
category.typeId = self.result.forumType.fid; category.typeId = self.result.forumType.fid;
itemListVc.category = category; itemListVc.category = category;
itemListVc.isPosting = [category.name isEqualToString:@"欧普问问"]; itemListVc.isPosting = 2;
[self.navigationController pushViewController:itemListVc animated:YES]; [self.navigationController pushViewController:itemListVc animated:YES];
} }
......
...@@ -48,7 +48,10 @@ ...@@ -48,7 +48,10 @@
/** /**
是否允许发帖 是否允许发帖
0 不允许发帖
1 允许发帖
2 允许提问
*/ */
@property (nonatomic,assign) BOOL isPosting; @property (nonatomic,assign) NSInteger isPosting;
@end @end
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#import "MWPhotoBrowser.h" #import "MWPhotoBrowser.h"
#import "UITableView+FDTemplateLayoutCell.h" #import "UITableView+FDTemplateLayoutCell.h"
#import "CommentTagTableViewCell.h" #import "CommentTagTableViewCell.h"
#import "UIButton+Title_Image.h"
static NSString *CELL_IDENTIFIER = @"ForumItemTableViewCell"; static NSString *CELL_IDENTIFIER = @"ForumItemTableViewCell";
static NSString *TAGCELL_IDENTIFIER = @"CommentTagTableViewCell"; static NSString *TAGCELL_IDENTIFIER = @"CommentTagTableViewCell";
...@@ -96,10 +97,13 @@ static NSString *TAGCELL_IDENTIFIER = @"CommentTagTableViewCell"; ...@@ -96,10 +97,13 @@ static NSString *TAGCELL_IDENTIFIER = @"CommentTagTableViewCell";
- (void)uiConfigAction - (void)uiConfigAction
{ {
self.classificationListTableView.backgroundColor = RGB(237, 238, 239, 1); self.classificationListTableView.backgroundColor = RGB(237, 238, 239, 1);
[self.postingButton horizontalCenterImageAndTitle:5];
self.classifyTitleLabel.text = self.category.name; self.classifyTitleLabel.text = self.category.name;
[self.classifyImageView sd_setImageWithURL:[NSURL URLWithString:self.category.attachmentBg.fileUrl] placeholderImage:REPLACEIMAGE]; [self.classifyImageView sd_setImageWithURL:[NSURL URLWithString:self.category.attachmentBg.fileUrl] placeholderImage:REPLACEIMAGE];
[self.classIconImageView sd_setImageWithURL:[NSURL URLWithString:self.category.attachment.fileUrl] placeholderImage:REPLACEIMAGE]; [self.classIconImageView sd_setImageWithURL:[NSURL URLWithString:self.category.attachment.fileUrl] placeholderImage:REPLACEIMAGE];
if ([self.category.name isEqualToString:@"欧普问问"] || self.isPosting) { if (self.isPosting) {
[self.postingButton setTitle:(self.isPosting == 1)?@"我要发帖":@"我要提问" forState:UIControlStateNormal];
}else {
self.postingButton.hidden = YES; self.postingButton.hidden = YES;
} }
} }
......
...@@ -14,10 +14,7 @@ ...@@ -14,10 +14,7 @@
@interface ForumViewController ()<UITableViewDelegate,UITableViewDataSource,DZNEmptyDataSetSource,DZNEmptyDataSetDelegate> @interface ForumViewController ()<UITableViewDelegate,UITableViewDataSource,DZNEmptyDataSetSource,DZNEmptyDataSetDelegate>
@property (nonatomic,strong) ForumCategoryResponse *category; @property (nonatomic,strong) ForumCategoryResponse *category;
/**
是否允许发帖
*/
@property (nonatomic,assign) BOOL isPosting;
@end @end
...@@ -36,7 +33,6 @@ ...@@ -36,7 +33,6 @@
self.forumTableView.tableFooterView = [UIView new]; self.forumTableView.tableFooterView = [UIView new];
self.forumTableView.rowHeight = 90; self.forumTableView.rowHeight = 90;
[Notification addObserver:self selector:@selector(refreshForumList:) name:REFRESH_FROUMLIST object:nil]; [Notification addObserver:self selector:@selector(refreshForumList:) name:REFRESH_FROUMLIST object:nil];
[Notification addObserver:self selector:@selector(isPosting:) name:POSTING object:nil];
} }
#pragma mark -选中时间轴刷新列表 #pragma mark -选中时间轴刷新列表
...@@ -46,12 +42,6 @@ ...@@ -46,12 +42,6 @@
[self.forumTableView.mj_header beginRefreshing]; [self.forumTableView.mj_header beginRefreshing];
} }
#pragma mark -是否允许发帖
- (void)isPosting:(NSNotification *)object
{
self.isPosting = [object.object boolValue];
}
#pragma mark - 设置刷新 #pragma mark - 设置刷新
- (void)setUpRefreshAction - (void)setUpRefreshAction
{ {
...@@ -105,7 +95,7 @@ ...@@ -105,7 +95,7 @@
TOForumCategoryEntity *category = self.category.categories[indexPath.row]; TOForumCategoryEntity *category = self.category.categories[indexPath.row];
category.typeId = self.typeId; category.typeId = self.typeId;
itemListVc.category = category; itemListVc.category = category;
itemListVc.isPosting = self.isPosting; itemListVc.isPosting = [category.name isEqualToString:@"欧普问问"]?0:1;
[self.navigationController pushViewController:itemListVc animated:YES]; [self.navigationController pushViewController:itemListVc animated:YES];
} }
......
...@@ -302,6 +302,7 @@ ...@@ -302,6 +302,7 @@
29E384C81CE9A8BF00888199 /* SearchCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29E384C71CE9A8BF00888199 /* SearchCollectionViewCell.m */; }; 29E384C81CE9A8BF00888199 /* SearchCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29E384C71CE9A8BF00888199 /* SearchCollectionViewCell.m */; };
29E384CB1CE9B0BB00888199 /* HotCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29E384CA1CE9B0BB00888199 /* HotCollectionViewCell.m */; }; 29E384CB1CE9B0BB00888199 /* HotCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29E384CA1CE9B0BB00888199 /* HotCollectionViewCell.m */; };
29E384D11CE9C65700888199 /* SearchViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29E384D01CE9C65700888199 /* SearchViewController.m */; }; 29E384D11CE9C65700888199 /* SearchViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29E384D01CE9C65700888199 /* SearchViewController.m */; };
29E47BD41E8E0C49004D0D00 /* UIButton+Title_Image.m in Sources */ = {isa = PBXBuildFile; fileRef = 29E47BD31E8E0C49004D0D00 /* UIButton+Title_Image.m */; };
29E9443D1DE3E0D0007CD26C /* prizeDetailsTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29E9443C1DE3E0D0007CD26C /* prizeDetailsTableViewCell.m */; }; 29E9443D1DE3E0D0007CD26C /* prizeDetailsTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29E9443C1DE3E0D0007CD26C /* prizeDetailsTableViewCell.m */; };
29E944421DE3EC7C007CD26C /* PrizeMainViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29E944411DE3EC7C007CD26C /* PrizeMainViewController.m */; }; 29E944421DE3EC7C007CD26C /* PrizeMainViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29E944411DE3EC7C007CD26C /* PrizeMainViewController.m */; };
29E944461DE3EFFE007CD26C /* PrizeListCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29E944451DE3EFFE007CD26C /* PrizeListCollectionViewCell.m */; }; 29E944461DE3EFFE007CD26C /* PrizeListCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29E944451DE3EFFE007CD26C /* PrizeListCollectionViewCell.m */; };
...@@ -912,6 +913,8 @@ ...@@ -912,6 +913,8 @@
29E384CA1CE9B0BB00888199 /* HotCollectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HotCollectionViewCell.m; sourceTree = "<group>"; }; 29E384CA1CE9B0BB00888199 /* HotCollectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HotCollectionViewCell.m; sourceTree = "<group>"; };
29E384CF1CE9C65700888199 /* SearchViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SearchViewController.h; sourceTree = "<group>"; }; 29E384CF1CE9C65700888199 /* SearchViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SearchViewController.h; sourceTree = "<group>"; };
29E384D01CE9C65700888199 /* SearchViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SearchViewController.m; sourceTree = "<group>"; }; 29E384D01CE9C65700888199 /* SearchViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SearchViewController.m; sourceTree = "<group>"; };
29E47BD21E8E0C49004D0D00 /* UIButton+Title_Image.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIButton+Title_Image.h"; sourceTree = "<group>"; };
29E47BD31E8E0C49004D0D00 /* UIButton+Title_Image.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIButton+Title_Image.m"; sourceTree = "<group>"; };
29E9443B1DE3E0D0007CD26C /* prizeDetailsTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = prizeDetailsTableViewCell.h; sourceTree = "<group>"; }; 29E9443B1DE3E0D0007CD26C /* prizeDetailsTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = prizeDetailsTableViewCell.h; sourceTree = "<group>"; };
29E9443C1DE3E0D0007CD26C /* prizeDetailsTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = prizeDetailsTableViewCell.m; sourceTree = "<group>"; }; 29E9443C1DE3E0D0007CD26C /* prizeDetailsTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = prizeDetailsTableViewCell.m; sourceTree = "<group>"; };
29E944401DE3EC7C007CD26C /* PrizeMainViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PrizeMainViewController.h; sourceTree = "<group>"; }; 29E944401DE3EC7C007CD26C /* PrizeMainViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PrizeMainViewController.h; sourceTree = "<group>"; };
...@@ -1747,6 +1750,8 @@ ...@@ -1747,6 +1750,8 @@
298111131DFE6DFC00F7EAFF /* Category */ = { 298111131DFE6DFC00F7EAFF /* Category */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
29E47BD21E8E0C49004D0D00 /* UIButton+Title_Image.h */,
29E47BD31E8E0C49004D0D00 /* UIButton+Title_Image.m */,
2962D07B1CD1E4490058829D /* NSArray+Objectwithindex.h */, 2962D07B1CD1E4490058829D /* NSArray+Objectwithindex.h */,
2962D07C1CD1E4490058829D /* NSArray+Objectwithindex.m */, 2962D07C1CD1E4490058829D /* NSArray+Objectwithindex.m */,
298111141DFE6E5000F7EAFF /* NSDate+Formatting.h */, 298111141DFE6E5000F7EAFF /* NSDate+Formatting.h */,
...@@ -3322,6 +3327,7 @@ ...@@ -3322,6 +3327,7 @@
29BB27801CD9DFD7009A0813 /* AboutViewController.m in Sources */, 29BB27801CD9DFD7009A0813 /* AboutViewController.m in Sources */,
2903F93D1DBE57F4003CC6B1 /* JDEcardViewController.m in Sources */, 2903F93D1DBE57F4003CC6B1 /* JDEcardViewController.m in Sources */,
29A419951E812E5E0064E958 /* MOFSPickerView.m in Sources */, 29A419951E812E5E0064E958 /* MOFSPickerView.m in Sources */,
29E47BD41E8E0C49004D0D00 /* UIButton+Title_Image.m in Sources */,
29F14BAA1CF6B60D0005D3E5 /* QRView.m in Sources */, 29F14BAA1CF6B60D0005D3E5 /* QRView.m in Sources */,
291D11961E790CCF001E081E /* DiscussModuleViewController.m in Sources */, 291D11961E790CCF001E081E /* DiscussModuleViewController.m in Sources */,
297BA2C61DE94D3300474F79 /* VIMediaCacheWorker.m in Sources */, 297BA2C61DE94D3300474F79 /* VIMediaCacheWorker.m in Sources */,
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES"> <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="16E195" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES">
<device id="ipad9_7" orientation="landscape"> <device id="ipad9_7" orientation="landscape">
<adaptation id="fullscreen"/> <adaptation id="fullscreen"/>
</device> </device>
...@@ -686,23 +686,31 @@ ...@@ -686,23 +686,31 @@
<rect key="frame" x="0.0" y="64" width="1024" height="100"/> <rect key="frame" x="0.0" y="64" width="1024" height="100"/>
<subviews> <subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sSD-4l-Ksh"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sSD-4l-Ksh">
<rect key="frame" x="185" y="53.5" width="0.0" height="0.0"/> <rect key="frame" x="185" y="53" width="0.0" height="0.0"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/> <fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" red="1" green="0.80303316346111109" blue="0.31435195738888894" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color key="textColor" red="1" green="0.80303316346111109" blue="0.31435195738888894" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cQA-Kq-2kO"> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cQA-Kq-2kO">
<rect key="frame" x="884" y="40.5" width="100" height="35"/> <rect key="frame" x="884" y="40" width="100" height="35"/>
<color key="backgroundColor" red="0.34901960784313724" green="0.67450980392156867" blue="0.86274509803921573" alpha="1" colorSpace="calibratedRGB"/>
<constraints> <constraints>
<constraint firstAttribute="height" constant="35" id="2wn-wa-35e"/>
<constraint firstAttribute="width" constant="100" id="vYJ-pK-0OY"/> <constraint firstAttribute="width" constant="100" id="vYJ-pK-0OY"/>
</constraints> </constraints>
<state key="normal" image="release"/> <fontDescription key="fontDescription" type="system" pointSize="15"/>
<state key="normal" title="我要发帖" image="release"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
<real key="value" value="5"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
<connections> <connections>
<action selector="releaseButtonClickAction:" destination="vh6-zj-WAp" eventType="touchUpInside" id="leE-NB-dYi"/> <action selector="releaseButtonClickAction:" destination="vh6-zj-WAp" eventType="touchUpInside" id="leE-NB-dYi"/>
</connections> </connections>
</button> </button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FuU-Is-N7n"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FuU-Is-N7n">
<rect key="frame" x="145" y="40.5" width="0.0" height="0.0"/> <rect key="frame" x="145" y="40" width="0.0" height="0.0"/>
<fontDescription key="fontDescription" type="system" pointSize="19"/> <fontDescription key="fontDescription" type="system" pointSize="19"/>
<nil key="textColor"/> <nil key="textColor"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
...@@ -715,7 +723,7 @@ ...@@ -715,7 +723,7 @@
</constraints> </constraints>
</view> </view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="帖子:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="e5v-Y5-qWA"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="帖子:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="e5v-Y5-qWA">
<rect key="frame" x="145" y="45.5" width="40" height="16"/> <rect key="frame" x="145" y="45" width="40" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/> <fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
...@@ -795,27 +803,27 @@ ...@@ -795,27 +803,27 @@
</constraints> </constraints>
</imageView> </imageView>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="comments" translatesAutoresizingMaskIntoConstraints="NO" id="dUd-RK-AJT"> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="comments" translatesAutoresizingMaskIntoConstraints="NO" id="dUd-RK-AJT">
<rect key="frame" x="948" y="7.5" width="16" height="16"/> <rect key="frame" x="948" y="8" width="16" height="16"/>
<constraints> <constraints>
<constraint firstAttribute="height" constant="16" id="SOy-h5-ZJf"/> <constraint firstAttribute="height" constant="16" id="SOy-h5-ZJf"/>
<constraint firstAttribute="width" constant="16" id="Yal-y3-XBn"/> <constraint firstAttribute="width" constant="16" id="Yal-y3-XBn"/>
</constraints> </constraints>
</imageView> </imageView>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="praise" translatesAutoresizingMaskIntoConstraints="NO" id="kDB-jN-eGQ"> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="praise" translatesAutoresizingMaskIntoConstraints="NO" id="kDB-jN-eGQ">
<rect key="frame" x="872" y="7.5" width="16" height="16"/> <rect key="frame" x="872" y="8" width="16" height="16"/>
<constraints> <constraints>
<constraint firstAttribute="width" constant="16" id="QU6-1C-deq"/> <constraint firstAttribute="width" constant="16" id="QU6-1C-deq"/>
<constraint firstAttribute="height" constant="16" id="W8k-XB-eza"/> <constraint firstAttribute="height" constant="16" id="W8k-XB-eza"/>
</constraints> </constraints>
</imageView> </imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3Wx-2q-7tj"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3Wx-2q-7tj">
<rect key="frame" x="976" y="7.5" width="8" height="15"/> <rect key="frame" x="976" y="8" width="8" height="15"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/> <fontDescription key="fontDescription" type="system" pointSize="12"/>
<color key="textColor" red="0.34509803921568627" green="0.67450980392156867" blue="0.86274509803921573" alpha="1" colorSpace="calibratedRGB"/> <color key="textColor" red="0.34509803921568627" green="0.67450980392156867" blue="0.86274509803921573" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ksH-bE-sVV"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ksH-bE-sVV">
<rect key="frame" x="900" y="7.5" width="8" height="15"/> <rect key="frame" x="900" y="8" width="8" height="15"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/> <fontDescription key="fontDescription" type="system" pointSize="12"/>
<color key="textColor" red="0.34509803921568627" green="0.67450980392156867" blue="0.86274509803921573" alpha="1" colorSpace="calibratedRGB"/> <color key="textColor" red="0.34509803921568627" green="0.67450980392156867" blue="0.86274509803921573" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
...@@ -3330,7 +3338,7 @@ ...@@ -3330,7 +3338,7 @@
<image name="praise" width="16" height="16"/> <image name="praise" width="16" height="16"/>
<image name="praised" width="24" height="23"/> <image name="praised" width="24" height="23"/>
<image name="quarte_integra" width="19" height="28"/> <image name="quarte_integra" width="19" height="28"/>
<image name="release" width="101" height="35"/> <image name="release" width="15" height="15"/>
<image name="result" width="164" height="48"/> <image name="result" width="164" height="48"/>
<image name="result-1" width="303" height="89"/> <image name="result-1" width="303" height="89"/>
<image name="shade" width="529" height="382"/> <image name="shade" width="529" height="382"/>
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<key>CFBundleName</key> <key>CFBundleName</key>
<string>欧立方</string> <string>欧立方</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>2.0.7</string> <string>2.0.9</string>
<key>CFBundleURLTypes</key> <key>CFBundleURLTypes</key>
<array> <array>
<dict> <dict>
......
...@@ -21,9 +21,9 @@ PODS: ...@@ -21,9 +21,9 @@ PODS:
- FDFullscreenPopGesture (1.1) - FDFullscreenPopGesture (1.1)
- iCarousel (1.8.3) - iCarousel (1.8.3)
- IQKeyboardManager (4.0.8) - IQKeyboardManager (4.0.8)
- JCore (1.1.0) - JCore (1.1.1)
- JPush (3.0.1): - JPush (3.0.2):
- JCore (~> 1.1.0) - JCore (~> 1.1.1)
- JSONModel (1.2.0) - JSONModel (1.2.0)
- Masonry (1.0.2) - Masonry (1.0.2)
- MBProgressHUD (0.9.2) - MBProgressHUD (0.9.2)
...@@ -90,8 +90,8 @@ SPEC CHECKSUMS: ...@@ -90,8 +90,8 @@ SPEC CHECKSUMS:
FDFullscreenPopGesture: a8a620179e3d9c40e8e00256dcee1c1a27c6d0f0 FDFullscreenPopGesture: a8a620179e3d9c40e8e00256dcee1c1a27c6d0f0
iCarousel: d782f635afac190c49bb8ee455882284cff8b85f iCarousel: d782f635afac190c49bb8ee455882284cff8b85f
IQKeyboardManager: 1a8189fa153bf09044355ee0ad36826f6767e7f7 IQKeyboardManager: 1a8189fa153bf09044355ee0ad36826f6767e7f7
JCore: 7382f2c62e6fcf08305b735e91f0fb771f448d3d JCore: 2210a789c8efb7dc2a46b1c24d2209b995b18ad2
JPush: 427daa60236d0faa9f379cd5bbeb923103162058 JPush: 01a693fafe51b93eafc2e368bbc7a7cc07e12ce4
JSONModel: 12523685c4b623553ccf844bbbf7007624317b2c JSONModel: 12523685c4b623553ccf844bbbf7007624317b2c
Masonry: 7c429b56da9d4ee0bbb3ed77a5ea710d6a5df39e Masonry: 7c429b56da9d4ee0bbb3ed77a5ea710d6a5df39e
MBProgressHUD: 1569cf7ace17a8bac47aabfbb8580a49690386d1 MBProgressHUD: 1569cf7ace17a8bac47aabfbb8580a49690386d1
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
* Copyright (c) 2011 ~ 2017 Shenzhen HXHG. All rights reserved. * Copyright (c) 2011 ~ 2017 Shenzhen HXHG. All rights reserved.
*/ */
#define JPUSH_VERSION_NUMBER 3.0.1 #define JPUSH_VERSION_NUMBER 3.0.2
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
......
...@@ -21,9 +21,9 @@ PODS: ...@@ -21,9 +21,9 @@ PODS:
- FDFullscreenPopGesture (1.1) - FDFullscreenPopGesture (1.1)
- iCarousel (1.8.3) - iCarousel (1.8.3)
- IQKeyboardManager (4.0.8) - IQKeyboardManager (4.0.8)
- JCore (1.1.0) - JCore (1.1.1)
- JPush (3.0.1): - JPush (3.0.2):
- JCore (~> 1.1.0) - JCore (~> 1.1.1)
- JSONModel (1.2.0) - JSONModel (1.2.0)
- Masonry (1.0.2) - Masonry (1.0.2)
- MBProgressHUD (0.9.2) - MBProgressHUD (0.9.2)
...@@ -90,8 +90,8 @@ SPEC CHECKSUMS: ...@@ -90,8 +90,8 @@ SPEC CHECKSUMS:
FDFullscreenPopGesture: a8a620179e3d9c40e8e00256dcee1c1a27c6d0f0 FDFullscreenPopGesture: a8a620179e3d9c40e8e00256dcee1c1a27c6d0f0
iCarousel: d782f635afac190c49bb8ee455882284cff8b85f iCarousel: d782f635afac190c49bb8ee455882284cff8b85f
IQKeyboardManager: 1a8189fa153bf09044355ee0ad36826f6767e7f7 IQKeyboardManager: 1a8189fa153bf09044355ee0ad36826f6767e7f7
JCore: 7382f2c62e6fcf08305b735e91f0fb771f448d3d JCore: 2210a789c8efb7dc2a46b1c24d2209b995b18ad2
JPush: 427daa60236d0faa9f379cd5bbeb923103162058 JPush: 01a693fafe51b93eafc2e368bbc7a7cc07e12ce4
JSONModel: 12523685c4b623553ccf844bbbf7007624317b2c JSONModel: 12523685c4b623553ccf844bbbf7007624317b2c
Masonry: 7c429b56da9d4ee0bbb3ed77a5ea710d6a5df39e Masonry: 7c429b56da9d4ee0bbb3ed77a5ea710d6a5df39e
MBProgressHUD: 1569cf7ace17a8bac47aabfbb8580a49690386d1 MBProgressHUD: 1569cf7ace17a8bac47aabfbb8580a49690386d1
......
...@@ -731,7 +731,6 @@ ...@@ -731,7 +731,6 @@
3ACAAF19B9AE70816569573A8BD60F6D /* Pods-Lighting-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-Lighting-frameworks.sh"; sourceTree = "<group>"; }; 3ACAAF19B9AE70816569573A8BD60F6D /* Pods-Lighting-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-Lighting-frameworks.sh"; sourceTree = "<group>"; };
3B1F390CBDDCA3B5420EB5DBEE4B6471 /* CAAnimation+WAnimation.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "CAAnimation+WAnimation.m"; path = "WZLBadge/CategorySupport/CAAnimation+WAnimation.m"; sourceTree = "<group>"; }; 3B1F390CBDDCA3B5420EB5DBEE4B6471 /* CAAnimation+WAnimation.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "CAAnimation+WAnimation.m"; path = "WZLBadge/CategorySupport/CAAnimation+WAnimation.m"; sourceTree = "<group>"; };
3BA21436B14AAEDFCA777EB03B9A92FB /* NSLayoutConstraint+MASDebugAdditions.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSLayoutConstraint+MASDebugAdditions.m"; path = "Masonry/NSLayoutConstraint+MASDebugAdditions.m"; sourceTree = "<group>"; }; 3BA21436B14AAEDFCA777EB03B9A92FB /* NSLayoutConstraint+MASDebugAdditions.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSLayoutConstraint+MASDebugAdditions.m"; path = "Masonry/NSLayoutConstraint+MASDebugAdditions.m"; sourceTree = "<group>"; };
3BD387A6F3F8585523CF660E4CCD7522 /* libjpush-ios-3.0.1.a */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = archive.ar; path = "libjpush-ios-3.0.1.a"; sourceTree = "<group>"; };
3CBD565CE016BBC6FBC104B3EA23672B /* LWApiMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = LWApiMessage.h; path = Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/LaiWang/LWApiMessage.h; sourceTree = "<group>"; }; 3CBD565CE016BBC6FBC104B3EA23672B /* LWApiMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = LWApiMessage.h; path = Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/LaiWang/LWApiMessage.h; sourceTree = "<group>"; };
3D9283DB9874BD9B92485848EDBC7E8F /* ViewController+MASAdditions.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "ViewController+MASAdditions.m"; path = "Masonry/ViewController+MASAdditions.m"; sourceTree = "<group>"; }; 3D9283DB9874BD9B92485848EDBC7E8F /* ViewController+MASAdditions.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "ViewController+MASAdditions.m"; path = "Masonry/ViewController+MASAdditions.m"; sourceTree = "<group>"; };
3D9E1887D97A18C47B5435346D203DAA /* JSONModelError.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = JSONModelError.m; path = JSONModel/JSONModel/JSONModelError.m; sourceTree = "<group>"; }; 3D9E1887D97A18C47B5435346D203DAA /* JSONModelError.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = JSONModelError.m; path = JSONModel/JSONModel/JSONModelError.m; sourceTree = "<group>"; };
...@@ -907,7 +906,6 @@ ...@@ -907,7 +906,6 @@
9A9A2F87674E9482E0A45F16E2F8E387 /* MASConstraintMaker.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MASConstraintMaker.h; path = Masonry/MASConstraintMaker.h; sourceTree = "<group>"; }; 9A9A2F87674E9482E0A45F16E2F8E387 /* MASConstraintMaker.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MASConstraintMaker.h; path = Masonry/MASConstraintMaker.h; sourceTree = "<group>"; };
9ABD5FAD0D88A97775FF0E12B49D3E2C /* libMJRefresh.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; name = libMJRefresh.a; path = libMJRefresh.a; sourceTree = BUILT_PRODUCTS_DIR; }; 9ABD5FAD0D88A97775FF0E12B49D3E2C /* libMJRefresh.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; name = libMJRefresh.a; path = libMJRefresh.a; sourceTree = BUILT_PRODUCTS_DIR; };
9AF3D36AB15A154137A4AE32365F8AFF /* PlayButtonOverlayLarge.png */ = {isa = PBXFileReference; includeInIndex = 1; name = PlayButtonOverlayLarge.png; path = Pod/Assets/PlayButtonOverlayLarge.png; sourceTree = "<group>"; }; 9AF3D36AB15A154137A4AE32365F8AFF /* PlayButtonOverlayLarge.png */ = {isa = PBXFileReference; includeInIndex = 1; name = PlayButtonOverlayLarge.png; path = Pod/Assets/PlayButtonOverlayLarge.png; sourceTree = "<group>"; };
9B0842FA633D00F3D4221FE5DC7D9681 /* libjcore-ios-1.1.0.a */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = archive.ar; path = "libjcore-ios-1.1.0.a"; sourceTree = "<group>"; };
9C5C85F26454649E6EB0186EA2A9313E /* libAFNetworking.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; name = libAFNetworking.a; path = libAFNetworking.a; sourceTree = BUILT_PRODUCTS_DIR; }; 9C5C85F26454649E6EB0186EA2A9313E /* libAFNetworking.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; name = libAFNetworking.a; path = libAFNetworking.a; sourceTree = BUILT_PRODUCTS_DIR; };
9CC3E37986A7FB04F905E1E39F5C2346 /* UMMobClick.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UMMobClick.framework; path = umsdk_IOS_analyics_idfa_v4.2.4/UMMobClick.framework; sourceTree = "<group>"; }; 9CC3E37986A7FB04F905E1E39F5C2346 /* UMMobClick.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UMMobClick.framework; path = umsdk_IOS_analyics_idfa_v4.2.4/UMMobClick.framework; sourceTree = "<group>"; };
9D978106A3E5D20FC1DDC99AD0B24A8D /* OSSXMLDictionary.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = OSSXMLDictionary.h; path = AliyunOSSiOS/OSSXMLDictionary.h; sourceTree = "<group>"; }; 9D978106A3E5D20FC1DDC99AD0B24A8D /* OSSXMLDictionary.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = OSSXMLDictionary.h; path = AliyunOSSiOS/OSSXMLDictionary.h; sourceTree = "<group>"; };
...@@ -969,6 +967,7 @@ ...@@ -969,6 +967,7 @@
B543E841043C8538E189959157794DED /* MJRefreshConst.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MJRefreshConst.h; path = MJRefresh/MJRefreshConst.h; sourceTree = "<group>"; }; B543E841043C8538E189959157794DED /* MJRefreshConst.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MJRefreshConst.h; path = MJRefresh/MJRefreshConst.h; sourceTree = "<group>"; };
B5BA9E6823FE046803B9026D009C0702 /* OSSIPv6Adapter.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = OSSIPv6Adapter.h; path = AliyunOSSiOS/OSSIPv6/OSSIPv6Adapter.h; sourceTree = "<group>"; }; B5BA9E6823FE046803B9026D009C0702 /* OSSIPv6Adapter.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = OSSIPv6Adapter.h; path = AliyunOSSiOS/OSSIPv6/OSSIPv6Adapter.h; sourceTree = "<group>"; };
B5C98412EE993A75CBFC67BE0D1A0FAE /* MJRefreshAutoGifFooter.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MJRefreshAutoGifFooter.h; path = MJRefresh/Custom/Footer/Auto/MJRefreshAutoGifFooter.h; sourceTree = "<group>"; }; B5C98412EE993A75CBFC67BE0D1A0FAE /* MJRefreshAutoGifFooter.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MJRefreshAutoGifFooter.h; path = MJRefresh/Custom/Footer/Auto/MJRefreshAutoGifFooter.h; sourceTree = "<group>"; };
B6C31825A0FD8FFC61F4F6A169224E55 /* libjcore-ios-1.1.1.a */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = archive.ar; path = "libjcore-ios-1.1.1.a"; sourceTree = "<group>"; };
B748CD132B16D55AE8C416A75C52CE45 /* SDWebImage.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = SDWebImage.xcconfig; sourceTree = "<group>"; }; B748CD132B16D55AE8C416A75C52CE45 /* SDWebImage.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = SDWebImage.xcconfig; sourceTree = "<group>"; };
B79CE74E6856E263DA9859FF0E2B3A82 /* MJRefreshNormalHeader.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MJRefreshNormalHeader.h; path = MJRefresh/Custom/Header/MJRefreshNormalHeader.h; sourceTree = "<group>"; }; B79CE74E6856E263DA9859FF0E2B3A82 /* MJRefreshNormalHeader.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MJRefreshNormalHeader.h; path = MJRefresh/Custom/Header/MJRefreshNormalHeader.h; sourceTree = "<group>"; };
B842391AC4B245D9153561A6DE5F61B7 /* MBProgressHUD-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "MBProgressHUD-dummy.m"; sourceTree = "<group>"; }; B842391AC4B245D9153561A6DE5F61B7 /* MBProgressHUD-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "MBProgressHUD-dummy.m"; sourceTree = "<group>"; };
...@@ -1035,6 +1034,7 @@ ...@@ -1035,6 +1034,7 @@
D22A9255648AB0C5936BF32D06F6AD46 /* UITableView+FDTemplateLayoutCell-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "UITableView+FDTemplateLayoutCell-prefix.pch"; sourceTree = "<group>"; }; D22A9255648AB0C5936BF32D06F6AD46 /* UITableView+FDTemplateLayoutCell-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "UITableView+FDTemplateLayoutCell-prefix.pch"; sourceTree = "<group>"; };
D293A7C805D7D4BF68C68D515BCEADE0 /* UMSocialTumblrHandler.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = UMSocialTumblrHandler.h; path = Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Tumblr/UMSocialTumblrHandler.h; sourceTree = "<group>"; }; D293A7C805D7D4BF68C68D515BCEADE0 /* UMSocialTumblrHandler.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = UMSocialTumblrHandler.h; path = Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Tumblr/UMSocialTumblrHandler.h; sourceTree = "<group>"; };
D3548FD4AD8F67599166BBD9D87EE8D5 /* UIScrollView+EmptyDataSet.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "UIScrollView+EmptyDataSet.h"; path = "Source/UIScrollView+EmptyDataSet.h"; sourceTree = "<group>"; }; D3548FD4AD8F67599166BBD9D87EE8D5 /* UIScrollView+EmptyDataSet.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "UIScrollView+EmptyDataSet.h"; path = "Source/UIScrollView+EmptyDataSet.h"; sourceTree = "<group>"; };
D49C86E9F38EA7C1323BB785F949FAE8 /* libjpush-ios-3.0.2.a */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = archive.ar; path = "libjpush-ios-3.0.2.a"; sourceTree = "<group>"; };
D4B8CFB0F8E9305F87CF20506F5446F1 /* AFNetworkActivityIndicatorManager.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = AFNetworkActivityIndicatorManager.h; path = "UIKit+AFNetworking/AFNetworkActivityIndicatorManager.h"; sourceTree = "<group>"; }; D4B8CFB0F8E9305F87CF20506F5446F1 /* AFNetworkActivityIndicatorManager.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = AFNetworkActivityIndicatorManager.h; path = "UIKit+AFNetworking/AFNetworkActivityIndicatorManager.h"; sourceTree = "<group>"; };
D52FC4C03DD7AF88C30BD2E28E3E439D /* MJRefreshAutoGifFooter.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MJRefreshAutoGifFooter.m; path = MJRefresh/Custom/Footer/Auto/MJRefreshAutoGifFooter.m; sourceTree = "<group>"; }; D52FC4C03DD7AF88C30BD2E28E3E439D /* MJRefreshAutoGifFooter.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MJRefreshAutoGifFooter.m; path = MJRefresh/Custom/Footer/Auto/MJRefreshAutoGifFooter.m; sourceTree = "<group>"; };
D537F883618BCB6F776BD776F5FD85EB /* PNChart.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = PNChart.h; path = PNChart/PNChart.h; sourceTree = "<group>"; }; D537F883618BCB6F776BD776F5FD85EB /* PNChart.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = PNChart.h; path = PNChart/PNChart.h; sourceTree = "<group>"; };
...@@ -1570,7 +1570,7 @@ ...@@ -1570,7 +1570,7 @@
288EB59E8B1E7FD6F2012A607BECB6ED /* JCore */ = { 288EB59E8B1E7FD6F2012A607BECB6ED /* JCore */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
31CD1F1D982ABB9A51157C5FD5150855 /* Frameworks */, 95C12B047C61076F4E29C6C5051537A8 /* Frameworks */,
); );
name = JCore; name = JCore;
path = JCore; path = JCore;
...@@ -1609,14 +1609,6 @@ ...@@ -1609,14 +1609,6 @@
name = NSURLSession; name = NSURLSession;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
31CD1F1D982ABB9A51157C5FD5150855 /* Frameworks */ = {
isa = PBXGroup;
children = (
9B0842FA633D00F3D4221FE5DC7D9681 /* libjcore-ios-1.1.0.a */,
);
name = Frameworks;
sourceTree = "<group>";
};
333D21D21CAE09497CBF15F0C1F40F42 /* YXAlertController */ = { 333D21D21CAE09497CBF15F0C1F40F42 /* YXAlertController */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
...@@ -1742,7 +1734,7 @@ ...@@ -1742,7 +1734,7 @@
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
09B0304A0911277B62953B034B3ABBB4 /* JPUSHService.h */, 09B0304A0911277B62953B034B3ABBB4 /* JPUSHService.h */,
8A6897C89A8059978E75CCFA582D10ED /* Frameworks */, B61039187589E117741D497CC0C51BD5 /* Frameworks */,
); );
name = JPush; name = JPush;
path = JPush; path = JPush;
...@@ -1956,14 +1948,6 @@ ...@@ -1956,14 +1948,6 @@
name = Frameworks; name = Frameworks;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
8A6897C89A8059978E75CCFA582D10ED /* Frameworks */ = {
isa = PBXGroup;
children = (
3BD387A6F3F8585523CF660E4CCD7522 /* libjpush-ios-3.0.1.a */,
);
name = Frameworks;
sourceTree = "<group>";
};
8B40328815CE31F14DE2A09BB5C5C58D /* Support Files */ = { 8B40328815CE31F14DE2A09BB5C5C58D /* Support Files */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
...@@ -2076,6 +2060,14 @@ ...@@ -2076,6 +2060,14 @@
name = Resources; name = Resources;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
95C12B047C61076F4E29C6C5051537A8 /* Frameworks */ = {
isa = PBXGroup;
children = (
B6C31825A0FD8FFC61F4F6A169224E55 /* libjcore-ios-1.1.1.a */,
);
name = Frameworks;
sourceTree = "<group>";
};
9DDE2663D95D1279DD0C940B7D18CA08 /* MWPhotoBrowser */ = { 9DDE2663D95D1279DD0C940B7D18CA08 /* MWPhotoBrowser */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
...@@ -2260,6 +2252,14 @@ ...@@ -2260,6 +2252,14 @@
path = "../Target Support Files/IQKeyboardManager"; path = "../Target Support Files/IQKeyboardManager";
sourceTree = "<group>"; sourceTree = "<group>";
}; };
B61039187589E117741D497CC0C51BD5 /* Frameworks */ = {
isa = PBXGroup;
children = (
D49C86E9F38EA7C1323BB785F949FAE8 /* libjpush-ios-3.0.2.a */,
);
name = Frameworks;
sourceTree = "<group>";
};
BBB4B6D7D623BF271883D79983E00395 /* AFNetworking */ = { BBB4B6D7D623BF271883D79983E00395 /* AFNetworking */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
......
...@@ -3,7 +3,7 @@ GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 ...@@ -3,7 +3,7 @@ GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking" "${PODS_ROOT}/Headers/Public/AliyunOSSiOS" "${PODS_ROOT}/Headers/Public/Bugly" "${PODS_ROOT}/Headers/Public/DACircularProgress" "${PODS_ROOT}/Headers/Public/DZNEmptyDataSet" "${PODS_ROOT}/Headers/Public/FDFullscreenPopGesture" "${PODS_ROOT}/Headers/Public/IQKeyboardManager" "${PODS_ROOT}/Headers/Public/JCore" "${PODS_ROOT}/Headers/Public/JPush" "${PODS_ROOT}/Headers/Public/JSONModel" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/MMDrawerController" "${PODS_ROOT}/Headers/Public/MWPhotoBrowser" "${PODS_ROOT}/Headers/Public/Masonry" "${PODS_ROOT}/Headers/Public/PNChart" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/UICountingLabel" "${PODS_ROOT}/Headers/Public/UITableView+FDTemplateLayoutCell" "${PODS_ROOT}/Headers/Public/UMengAnalytics" "${PODS_ROOT}/Headers/Public/UMengSocial" "${PODS_ROOT}/Headers/Public/WYPopoverController" "${PODS_ROOT}/Headers/Public/WZLBadge" "${PODS_ROOT}/Headers/Public/YXAlertController" "${PODS_ROOT}/Headers/Public/iCarousel" HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking" "${PODS_ROOT}/Headers/Public/AliyunOSSiOS" "${PODS_ROOT}/Headers/Public/Bugly" "${PODS_ROOT}/Headers/Public/DACircularProgress" "${PODS_ROOT}/Headers/Public/DZNEmptyDataSet" "${PODS_ROOT}/Headers/Public/FDFullscreenPopGesture" "${PODS_ROOT}/Headers/Public/IQKeyboardManager" "${PODS_ROOT}/Headers/Public/JCore" "${PODS_ROOT}/Headers/Public/JPush" "${PODS_ROOT}/Headers/Public/JSONModel" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/MMDrawerController" "${PODS_ROOT}/Headers/Public/MWPhotoBrowser" "${PODS_ROOT}/Headers/Public/Masonry" "${PODS_ROOT}/Headers/Public/PNChart" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/UICountingLabel" "${PODS_ROOT}/Headers/Public/UITableView+FDTemplateLayoutCell" "${PODS_ROOT}/Headers/Public/UMengAnalytics" "${PODS_ROOT}/Headers/Public/UMengSocial" "${PODS_ROOT}/Headers/Public/WYPopoverController" "${PODS_ROOT}/Headers/Public/WZLBadge" "${PODS_ROOT}/Headers/Public/YXAlertController" "${PODS_ROOT}/Headers/Public/iCarousel"
LIBRARY_SEARCH_PATHS = $(inherited) "$(PODS_ROOT)/UMengAnalytics/**" $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_5.0/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/TencentOpenAPI/ $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Wechat/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/AlipayShare/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/SinaSSO/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Line/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Whatsapp/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Instagram/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Tumblr/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/LaiWang/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Twitter/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Facebook/** "$PODS_CONFIGURATION_BUILD_DIR/AFNetworking" "$PODS_CONFIGURATION_BUILD_DIR/AliyunOSSiOS" "$PODS_CONFIGURATION_BUILD_DIR/DACircularProgress" "$PODS_CONFIGURATION_BUILD_DIR/DZNEmptyDataSet" "$PODS_CONFIGURATION_BUILD_DIR/FDFullscreenPopGesture" "$PODS_CONFIGURATION_BUILD_DIR/IQKeyboardManager" "$PODS_CONFIGURATION_BUILD_DIR/JSONModel" "$PODS_CONFIGURATION_BUILD_DIR/MBProgressHUD" "$PODS_CONFIGURATION_BUILD_DIR/MJRefresh" "$PODS_CONFIGURATION_BUILD_DIR/MMDrawerController" "$PODS_CONFIGURATION_BUILD_DIR/MWPhotoBrowser" "$PODS_CONFIGURATION_BUILD_DIR/Masonry" "$PODS_CONFIGURATION_BUILD_DIR/PNChart" "$PODS_CONFIGURATION_BUILD_DIR/SDWebImage" "$PODS_CONFIGURATION_BUILD_DIR/UICountingLabel" "$PODS_CONFIGURATION_BUILD_DIR/UITableView+FDTemplateLayoutCell" "$PODS_CONFIGURATION_BUILD_DIR/WYPopoverController" "$PODS_CONFIGURATION_BUILD_DIR/WZLBadge" "$PODS_CONFIGURATION_BUILD_DIR/YXAlertController" "$PODS_CONFIGURATION_BUILD_DIR/iCarousel" $(inherited) "${PODS_ROOT}/JCore" $(inherited) "${PODS_ROOT}/JPush" LIBRARY_SEARCH_PATHS = $(inherited) "$(PODS_ROOT)/UMengAnalytics/**" $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_5.0/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/TencentOpenAPI/ $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Wechat/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/AlipayShare/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/SinaSSO/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Line/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Whatsapp/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Instagram/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Tumblr/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/LaiWang/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Twitter/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Facebook/** "$PODS_CONFIGURATION_BUILD_DIR/AFNetworking" "$PODS_CONFIGURATION_BUILD_DIR/AliyunOSSiOS" "$PODS_CONFIGURATION_BUILD_DIR/DACircularProgress" "$PODS_CONFIGURATION_BUILD_DIR/DZNEmptyDataSet" "$PODS_CONFIGURATION_BUILD_DIR/FDFullscreenPopGesture" "$PODS_CONFIGURATION_BUILD_DIR/IQKeyboardManager" "$PODS_CONFIGURATION_BUILD_DIR/JSONModel" "$PODS_CONFIGURATION_BUILD_DIR/MBProgressHUD" "$PODS_CONFIGURATION_BUILD_DIR/MJRefresh" "$PODS_CONFIGURATION_BUILD_DIR/MMDrawerController" "$PODS_CONFIGURATION_BUILD_DIR/MWPhotoBrowser" "$PODS_CONFIGURATION_BUILD_DIR/Masonry" "$PODS_CONFIGURATION_BUILD_DIR/PNChart" "$PODS_CONFIGURATION_BUILD_DIR/SDWebImage" "$PODS_CONFIGURATION_BUILD_DIR/UICountingLabel" "$PODS_CONFIGURATION_BUILD_DIR/UITableView+FDTemplateLayoutCell" "$PODS_CONFIGURATION_BUILD_DIR/WYPopoverController" "$PODS_CONFIGURATION_BUILD_DIR/WZLBadge" "$PODS_CONFIGURATION_BUILD_DIR/YXAlertController" "$PODS_CONFIGURATION_BUILD_DIR/iCarousel" $(inherited) "${PODS_ROOT}/JCore" $(inherited) "${PODS_ROOT}/JPush"
OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/AFNetworking" -isystem "${PODS_ROOT}/Headers/Public/AliyunOSSiOS" -isystem "${PODS_ROOT}/Headers/Public/Bugly" -isystem "${PODS_ROOT}/Headers/Public/DACircularProgress" -isystem "${PODS_ROOT}/Headers/Public/DZNEmptyDataSet" -isystem "${PODS_ROOT}/Headers/Public/FDFullscreenPopGesture" -isystem "${PODS_ROOT}/Headers/Public/IQKeyboardManager" -isystem "${PODS_ROOT}/Headers/Public/JCore" -isystem "${PODS_ROOT}/Headers/Public/JPush" -isystem "${PODS_ROOT}/Headers/Public/JSONModel" -isystem "${PODS_ROOT}/Headers/Public/MBProgressHUD" -isystem "${PODS_ROOT}/Headers/Public/MJRefresh" -isystem "${PODS_ROOT}/Headers/Public/MMDrawerController" -isystem "${PODS_ROOT}/Headers/Public/MWPhotoBrowser" -isystem "${PODS_ROOT}/Headers/Public/Masonry" -isystem "${PODS_ROOT}/Headers/Public/PNChart" -isystem "${PODS_ROOT}/Headers/Public/SDWebImage" -isystem "${PODS_ROOT}/Headers/Public/UICountingLabel" -isystem "${PODS_ROOT}/Headers/Public/UITableView+FDTemplateLayoutCell" -isystem "${PODS_ROOT}/Headers/Public/UMengAnalytics" -isystem "${PODS_ROOT}/Headers/Public/UMengSocial" -isystem "${PODS_ROOT}/Headers/Public/WYPopoverController" -isystem "${PODS_ROOT}/Headers/Public/WZLBadge" -isystem "${PODS_ROOT}/Headers/Public/YXAlertController" -isystem "${PODS_ROOT}/Headers/Public/iCarousel" OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/AFNetworking" -isystem "${PODS_ROOT}/Headers/Public/AliyunOSSiOS" -isystem "${PODS_ROOT}/Headers/Public/Bugly" -isystem "${PODS_ROOT}/Headers/Public/DACircularProgress" -isystem "${PODS_ROOT}/Headers/Public/DZNEmptyDataSet" -isystem "${PODS_ROOT}/Headers/Public/FDFullscreenPopGesture" -isystem "${PODS_ROOT}/Headers/Public/IQKeyboardManager" -isystem "${PODS_ROOT}/Headers/Public/JCore" -isystem "${PODS_ROOT}/Headers/Public/JPush" -isystem "${PODS_ROOT}/Headers/Public/JSONModel" -isystem "${PODS_ROOT}/Headers/Public/MBProgressHUD" -isystem "${PODS_ROOT}/Headers/Public/MJRefresh" -isystem "${PODS_ROOT}/Headers/Public/MMDrawerController" -isystem "${PODS_ROOT}/Headers/Public/MWPhotoBrowser" -isystem "${PODS_ROOT}/Headers/Public/Masonry" -isystem "${PODS_ROOT}/Headers/Public/PNChart" -isystem "${PODS_ROOT}/Headers/Public/SDWebImage" -isystem "${PODS_ROOT}/Headers/Public/UICountingLabel" -isystem "${PODS_ROOT}/Headers/Public/UITableView+FDTemplateLayoutCell" -isystem "${PODS_ROOT}/Headers/Public/UMengAnalytics" -isystem "${PODS_ROOT}/Headers/Public/UMengSocial" -isystem "${PODS_ROOT}/Headers/Public/WYPopoverController" -isystem "${PODS_ROOT}/Headers/Public/WZLBadge" -isystem "${PODS_ROOT}/Headers/Public/YXAlertController" -isystem "${PODS_ROOT}/Headers/Public/iCarousel"
OTHER_LDFLAGS = $(inherited) -ObjC -l"AFNetworking" -l"APOpenSdk" -l"AliyunOSSiOS" -l"DACircularProgress" -l"DZNEmptyDataSet" -l"FDFullscreenPopGesture" -l"IQKeyboardManager" -l"JSONModel" -l"LWApiSDK" -l"MBProgressHUD" -l"MJRefresh" -l"MMDrawerController" -l"MWPhotoBrowser" -l"Masonry" -l"PNChart" -l"SDWebImage" -l"SocialAlipayShare" -l"SocialFacebook" -l"SocialInstagram" -l"SocialLaiWang" -l"SocialLine" -l"SocialQQ" -l"SocialSinaSSO" -l"SocialTumblr" -l"SocialTwitter" -l"SocialWechat" -l"SocialWhatsapp" -l"UICountingLabel" -l"UITableView+FDTemplateLayoutCell" -l"UMSocial_Sdk_5.0" -l"UMSocial_Sdk_Comment_5.0" -l"WYPopoverController" -l"WZLBadge" -l"WeChatSDK" -l"WeiboSDK" -l"YXAlertController" -l"c++" -l"iCarousel" -l"iconv" -l"jcore-ios-1.1.0" -l"jpush-ios-3.0.1" -l"resolv" -l"sqlite3" -l"stdc++" -l"z" -framework "Accounts" -framework "AssetsLibrary" -framework "Bugly" -framework "CFNetwork" -framework "CoreData" -framework "CoreFoundation" -framework "CoreGraphics" -framework "CoreTelephony" -framework "FBSDKCoreKit" -framework "FBSDKLoginKit" -framework "FBSDKShareKit" -framework "Fabric" -framework "Foundation" -framework "ImageIO" -framework "MediaPlayer" -framework "MobileCoreServices" -framework "QuartzCore" -framework "Security" -framework "Social" -framework "SystemConfiguration" -framework "TencentOpenAPI" -framework "TwitterCore" -framework "TwitterKit" -framework "UIKit" -framework "UMMobClick" -weak_framework "Photos" -weak_framework "UserNotifications" OTHER_LDFLAGS = $(inherited) -ObjC -l"AFNetworking" -l"APOpenSdk" -l"AliyunOSSiOS" -l"DACircularProgress" -l"DZNEmptyDataSet" -l"FDFullscreenPopGesture" -l"IQKeyboardManager" -l"JSONModel" -l"LWApiSDK" -l"MBProgressHUD" -l"MJRefresh" -l"MMDrawerController" -l"MWPhotoBrowser" -l"Masonry" -l"PNChart" -l"SDWebImage" -l"SocialAlipayShare" -l"SocialFacebook" -l"SocialInstagram" -l"SocialLaiWang" -l"SocialLine" -l"SocialQQ" -l"SocialSinaSSO" -l"SocialTumblr" -l"SocialTwitter" -l"SocialWechat" -l"SocialWhatsapp" -l"UICountingLabel" -l"UITableView+FDTemplateLayoutCell" -l"UMSocial_Sdk_5.0" -l"UMSocial_Sdk_Comment_5.0" -l"WYPopoverController" -l"WZLBadge" -l"WeChatSDK" -l"WeiboSDK" -l"YXAlertController" -l"c++" -l"iCarousel" -l"iconv" -l"jcore-ios-1.1.1" -l"jpush-ios-3.0.2" -l"resolv" -l"sqlite3" -l"stdc++" -l"z" -framework "Accounts" -framework "AssetsLibrary" -framework "Bugly" -framework "CFNetwork" -framework "CoreData" -framework "CoreFoundation" -framework "CoreGraphics" -framework "CoreTelephony" -framework "FBSDKCoreKit" -framework "FBSDKLoginKit" -framework "FBSDKShareKit" -framework "Fabric" -framework "Foundation" -framework "ImageIO" -framework "MediaPlayer" -framework "MobileCoreServices" -framework "QuartzCore" -framework "Security" -framework "Social" -framework "SystemConfiguration" -framework "TencentOpenAPI" -framework "TwitterCore" -framework "TwitterKit" -framework "UIKit" -framework "UMMobClick" -weak_framework "Photos" -weak_framework "UserNotifications"
PODS_BUILD_DIR = $BUILD_DIR PODS_BUILD_DIR = $BUILD_DIR
PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
PODS_ROOT = ${SRCROOT}/Pods PODS_ROOT = ${SRCROOT}/Pods
...@@ -3,7 +3,7 @@ GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 ...@@ -3,7 +3,7 @@ GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking" "${PODS_ROOT}/Headers/Public/AliyunOSSiOS" "${PODS_ROOT}/Headers/Public/Bugly" "${PODS_ROOT}/Headers/Public/DACircularProgress" "${PODS_ROOT}/Headers/Public/DZNEmptyDataSet" "${PODS_ROOT}/Headers/Public/FDFullscreenPopGesture" "${PODS_ROOT}/Headers/Public/IQKeyboardManager" "${PODS_ROOT}/Headers/Public/JCore" "${PODS_ROOT}/Headers/Public/JPush" "${PODS_ROOT}/Headers/Public/JSONModel" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/MMDrawerController" "${PODS_ROOT}/Headers/Public/MWPhotoBrowser" "${PODS_ROOT}/Headers/Public/Masonry" "${PODS_ROOT}/Headers/Public/PNChart" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/UICountingLabel" "${PODS_ROOT}/Headers/Public/UITableView+FDTemplateLayoutCell" "${PODS_ROOT}/Headers/Public/UMengAnalytics" "${PODS_ROOT}/Headers/Public/UMengSocial" "${PODS_ROOT}/Headers/Public/WYPopoverController" "${PODS_ROOT}/Headers/Public/WZLBadge" "${PODS_ROOT}/Headers/Public/YXAlertController" "${PODS_ROOT}/Headers/Public/iCarousel" HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking" "${PODS_ROOT}/Headers/Public/AliyunOSSiOS" "${PODS_ROOT}/Headers/Public/Bugly" "${PODS_ROOT}/Headers/Public/DACircularProgress" "${PODS_ROOT}/Headers/Public/DZNEmptyDataSet" "${PODS_ROOT}/Headers/Public/FDFullscreenPopGesture" "${PODS_ROOT}/Headers/Public/IQKeyboardManager" "${PODS_ROOT}/Headers/Public/JCore" "${PODS_ROOT}/Headers/Public/JPush" "${PODS_ROOT}/Headers/Public/JSONModel" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/MMDrawerController" "${PODS_ROOT}/Headers/Public/MWPhotoBrowser" "${PODS_ROOT}/Headers/Public/Masonry" "${PODS_ROOT}/Headers/Public/PNChart" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/UICountingLabel" "${PODS_ROOT}/Headers/Public/UITableView+FDTemplateLayoutCell" "${PODS_ROOT}/Headers/Public/UMengAnalytics" "${PODS_ROOT}/Headers/Public/UMengSocial" "${PODS_ROOT}/Headers/Public/WYPopoverController" "${PODS_ROOT}/Headers/Public/WZLBadge" "${PODS_ROOT}/Headers/Public/YXAlertController" "${PODS_ROOT}/Headers/Public/iCarousel"
LIBRARY_SEARCH_PATHS = $(inherited) "$(PODS_ROOT)/UMengAnalytics/**" $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_5.0/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/TencentOpenAPI/ $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Wechat/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/AlipayShare/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/SinaSSO/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Line/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Whatsapp/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Instagram/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Tumblr/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/LaiWang/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Twitter/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Facebook/** "$PODS_CONFIGURATION_BUILD_DIR/AFNetworking" "$PODS_CONFIGURATION_BUILD_DIR/AliyunOSSiOS" "$PODS_CONFIGURATION_BUILD_DIR/DACircularProgress" "$PODS_CONFIGURATION_BUILD_DIR/DZNEmptyDataSet" "$PODS_CONFIGURATION_BUILD_DIR/FDFullscreenPopGesture" "$PODS_CONFIGURATION_BUILD_DIR/IQKeyboardManager" "$PODS_CONFIGURATION_BUILD_DIR/JSONModel" "$PODS_CONFIGURATION_BUILD_DIR/MBProgressHUD" "$PODS_CONFIGURATION_BUILD_DIR/MJRefresh" "$PODS_CONFIGURATION_BUILD_DIR/MMDrawerController" "$PODS_CONFIGURATION_BUILD_DIR/MWPhotoBrowser" "$PODS_CONFIGURATION_BUILD_DIR/Masonry" "$PODS_CONFIGURATION_BUILD_DIR/PNChart" "$PODS_CONFIGURATION_BUILD_DIR/SDWebImage" "$PODS_CONFIGURATION_BUILD_DIR/UICountingLabel" "$PODS_CONFIGURATION_BUILD_DIR/UITableView+FDTemplateLayoutCell" "$PODS_CONFIGURATION_BUILD_DIR/WYPopoverController" "$PODS_CONFIGURATION_BUILD_DIR/WZLBadge" "$PODS_CONFIGURATION_BUILD_DIR/YXAlertController" "$PODS_CONFIGURATION_BUILD_DIR/iCarousel" $(inherited) "${PODS_ROOT}/JCore" $(inherited) "${PODS_ROOT}/JPush" LIBRARY_SEARCH_PATHS = $(inherited) "$(PODS_ROOT)/UMengAnalytics/**" $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_5.0/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/TencentOpenAPI/ $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Wechat/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/AlipayShare/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/SinaSSO/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Line/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Whatsapp/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Instagram/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Tumblr/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/LaiWang/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Twitter/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Facebook/** "$PODS_CONFIGURATION_BUILD_DIR/AFNetworking" "$PODS_CONFIGURATION_BUILD_DIR/AliyunOSSiOS" "$PODS_CONFIGURATION_BUILD_DIR/DACircularProgress" "$PODS_CONFIGURATION_BUILD_DIR/DZNEmptyDataSet" "$PODS_CONFIGURATION_BUILD_DIR/FDFullscreenPopGesture" "$PODS_CONFIGURATION_BUILD_DIR/IQKeyboardManager" "$PODS_CONFIGURATION_BUILD_DIR/JSONModel" "$PODS_CONFIGURATION_BUILD_DIR/MBProgressHUD" "$PODS_CONFIGURATION_BUILD_DIR/MJRefresh" "$PODS_CONFIGURATION_BUILD_DIR/MMDrawerController" "$PODS_CONFIGURATION_BUILD_DIR/MWPhotoBrowser" "$PODS_CONFIGURATION_BUILD_DIR/Masonry" "$PODS_CONFIGURATION_BUILD_DIR/PNChart" "$PODS_CONFIGURATION_BUILD_DIR/SDWebImage" "$PODS_CONFIGURATION_BUILD_DIR/UICountingLabel" "$PODS_CONFIGURATION_BUILD_DIR/UITableView+FDTemplateLayoutCell" "$PODS_CONFIGURATION_BUILD_DIR/WYPopoverController" "$PODS_CONFIGURATION_BUILD_DIR/WZLBadge" "$PODS_CONFIGURATION_BUILD_DIR/YXAlertController" "$PODS_CONFIGURATION_BUILD_DIR/iCarousel" $(inherited) "${PODS_ROOT}/JCore" $(inherited) "${PODS_ROOT}/JPush"
OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/AFNetworking" -isystem "${PODS_ROOT}/Headers/Public/AliyunOSSiOS" -isystem "${PODS_ROOT}/Headers/Public/Bugly" -isystem "${PODS_ROOT}/Headers/Public/DACircularProgress" -isystem "${PODS_ROOT}/Headers/Public/DZNEmptyDataSet" -isystem "${PODS_ROOT}/Headers/Public/FDFullscreenPopGesture" -isystem "${PODS_ROOT}/Headers/Public/IQKeyboardManager" -isystem "${PODS_ROOT}/Headers/Public/JCore" -isystem "${PODS_ROOT}/Headers/Public/JPush" -isystem "${PODS_ROOT}/Headers/Public/JSONModel" -isystem "${PODS_ROOT}/Headers/Public/MBProgressHUD" -isystem "${PODS_ROOT}/Headers/Public/MJRefresh" -isystem "${PODS_ROOT}/Headers/Public/MMDrawerController" -isystem "${PODS_ROOT}/Headers/Public/MWPhotoBrowser" -isystem "${PODS_ROOT}/Headers/Public/Masonry" -isystem "${PODS_ROOT}/Headers/Public/PNChart" -isystem "${PODS_ROOT}/Headers/Public/SDWebImage" -isystem "${PODS_ROOT}/Headers/Public/UICountingLabel" -isystem "${PODS_ROOT}/Headers/Public/UITableView+FDTemplateLayoutCell" -isystem "${PODS_ROOT}/Headers/Public/UMengAnalytics" -isystem "${PODS_ROOT}/Headers/Public/UMengSocial" -isystem "${PODS_ROOT}/Headers/Public/WYPopoverController" -isystem "${PODS_ROOT}/Headers/Public/WZLBadge" -isystem "${PODS_ROOT}/Headers/Public/YXAlertController" -isystem "${PODS_ROOT}/Headers/Public/iCarousel" OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/AFNetworking" -isystem "${PODS_ROOT}/Headers/Public/AliyunOSSiOS" -isystem "${PODS_ROOT}/Headers/Public/Bugly" -isystem "${PODS_ROOT}/Headers/Public/DACircularProgress" -isystem "${PODS_ROOT}/Headers/Public/DZNEmptyDataSet" -isystem "${PODS_ROOT}/Headers/Public/FDFullscreenPopGesture" -isystem "${PODS_ROOT}/Headers/Public/IQKeyboardManager" -isystem "${PODS_ROOT}/Headers/Public/JCore" -isystem "${PODS_ROOT}/Headers/Public/JPush" -isystem "${PODS_ROOT}/Headers/Public/JSONModel" -isystem "${PODS_ROOT}/Headers/Public/MBProgressHUD" -isystem "${PODS_ROOT}/Headers/Public/MJRefresh" -isystem "${PODS_ROOT}/Headers/Public/MMDrawerController" -isystem "${PODS_ROOT}/Headers/Public/MWPhotoBrowser" -isystem "${PODS_ROOT}/Headers/Public/Masonry" -isystem "${PODS_ROOT}/Headers/Public/PNChart" -isystem "${PODS_ROOT}/Headers/Public/SDWebImage" -isystem "${PODS_ROOT}/Headers/Public/UICountingLabel" -isystem "${PODS_ROOT}/Headers/Public/UITableView+FDTemplateLayoutCell" -isystem "${PODS_ROOT}/Headers/Public/UMengAnalytics" -isystem "${PODS_ROOT}/Headers/Public/UMengSocial" -isystem "${PODS_ROOT}/Headers/Public/WYPopoverController" -isystem "${PODS_ROOT}/Headers/Public/WZLBadge" -isystem "${PODS_ROOT}/Headers/Public/YXAlertController" -isystem "${PODS_ROOT}/Headers/Public/iCarousel"
OTHER_LDFLAGS = $(inherited) -ObjC -l"AFNetworking" -l"APOpenSdk" -l"AliyunOSSiOS" -l"DACircularProgress" -l"DZNEmptyDataSet" -l"FDFullscreenPopGesture" -l"IQKeyboardManager" -l"JSONModel" -l"LWApiSDK" -l"MBProgressHUD" -l"MJRefresh" -l"MMDrawerController" -l"MWPhotoBrowser" -l"Masonry" -l"PNChart" -l"SDWebImage" -l"SocialAlipayShare" -l"SocialFacebook" -l"SocialInstagram" -l"SocialLaiWang" -l"SocialLine" -l"SocialQQ" -l"SocialSinaSSO" -l"SocialTumblr" -l"SocialTwitter" -l"SocialWechat" -l"SocialWhatsapp" -l"UICountingLabel" -l"UITableView+FDTemplateLayoutCell" -l"UMSocial_Sdk_5.0" -l"UMSocial_Sdk_Comment_5.0" -l"WYPopoverController" -l"WZLBadge" -l"WeChatSDK" -l"WeiboSDK" -l"YXAlertController" -l"c++" -l"iCarousel" -l"iconv" -l"jcore-ios-1.1.0" -l"jpush-ios-3.0.1" -l"resolv" -l"sqlite3" -l"stdc++" -l"z" -framework "Accounts" -framework "AssetsLibrary" -framework "Bugly" -framework "CFNetwork" -framework "CoreData" -framework "CoreFoundation" -framework "CoreGraphics" -framework "CoreTelephony" -framework "FBSDKCoreKit" -framework "FBSDKLoginKit" -framework "FBSDKShareKit" -framework "Fabric" -framework "Foundation" -framework "ImageIO" -framework "MediaPlayer" -framework "MobileCoreServices" -framework "QuartzCore" -framework "Security" -framework "Social" -framework "SystemConfiguration" -framework "TencentOpenAPI" -framework "TwitterCore" -framework "TwitterKit" -framework "UIKit" -framework "UMMobClick" -weak_framework "Photos" -weak_framework "UserNotifications" OTHER_LDFLAGS = $(inherited) -ObjC -l"AFNetworking" -l"APOpenSdk" -l"AliyunOSSiOS" -l"DACircularProgress" -l"DZNEmptyDataSet" -l"FDFullscreenPopGesture" -l"IQKeyboardManager" -l"JSONModel" -l"LWApiSDK" -l"MBProgressHUD" -l"MJRefresh" -l"MMDrawerController" -l"MWPhotoBrowser" -l"Masonry" -l"PNChart" -l"SDWebImage" -l"SocialAlipayShare" -l"SocialFacebook" -l"SocialInstagram" -l"SocialLaiWang" -l"SocialLine" -l"SocialQQ" -l"SocialSinaSSO" -l"SocialTumblr" -l"SocialTwitter" -l"SocialWechat" -l"SocialWhatsapp" -l"UICountingLabel" -l"UITableView+FDTemplateLayoutCell" -l"UMSocial_Sdk_5.0" -l"UMSocial_Sdk_Comment_5.0" -l"WYPopoverController" -l"WZLBadge" -l"WeChatSDK" -l"WeiboSDK" -l"YXAlertController" -l"c++" -l"iCarousel" -l"iconv" -l"jcore-ios-1.1.1" -l"jpush-ios-3.0.2" -l"resolv" -l"sqlite3" -l"stdc++" -l"z" -framework "Accounts" -framework "AssetsLibrary" -framework "Bugly" -framework "CFNetwork" -framework "CoreData" -framework "CoreFoundation" -framework "CoreGraphics" -framework "CoreTelephony" -framework "FBSDKCoreKit" -framework "FBSDKLoginKit" -framework "FBSDKShareKit" -framework "Fabric" -framework "Foundation" -framework "ImageIO" -framework "MediaPlayer" -framework "MobileCoreServices" -framework "QuartzCore" -framework "Security" -framework "Social" -framework "SystemConfiguration" -framework "TencentOpenAPI" -framework "TwitterCore" -framework "TwitterKit" -framework "UIKit" -framework "UMMobClick" -weak_framework "Photos" -weak_framework "UserNotifications"
PODS_BUILD_DIR = $BUILD_DIR PODS_BUILD_DIR = $BUILD_DIR
PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
PODS_ROOT = ${SRCROOT}/Pods PODS_ROOT = ${SRCROOT}/Pods
...@@ -95,12 +95,14 @@ typedef NS_ENUM(NSInteger,COMMENT_PRAISE) { ...@@ -95,12 +95,14 @@ typedef NS_ENUM(NSInteger,COMMENT_PRAISE) {
/** /**
* 服务器开发地址 * 服务器开发地址
*/ */
//#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://gomoredev:8082/opple-web/app%@",URL] #define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://gomoredev:8082/opple-web/app%@",URL]
//外网http://debenson.picp.io/opple-web/
/** /**
* 服务器测试地址 * 服务器测试地址
*/ */
#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://dg-dev.opple.com/opple-web/app%@",URL] //#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://dg-dev.opple.com/opple-web/app%@",URL]
//** //**
// * 服务器正式地址 // * 服务器正式地址
...@@ -869,10 +871,6 @@ extern NSString *const ANIMATION; ...@@ -869,10 +871,6 @@ extern NSString *const ANIMATION;
*/ */
extern NSString *const REFRESH_FROUMLIST; extern NSString *const REFRESH_FROUMLIST;
/**
是否允许发帖
*/
extern NSString *const POSTING;
/** /**
修改导购名称 修改导购名称
......
...@@ -761,11 +761,6 @@ NSString *const ANIMATION = @"animationTimeLine"; ...@@ -761,11 +761,6 @@ NSString *const ANIMATION = @"animationTimeLine";
*/ */
NSString *const REFRESH_FROUMLIST = @"RefreshList"; NSString *const REFRESH_FROUMLIST = @"RefreshList";
/**
是否允许发帖
*/
NSString *const POSTING = @"Posting";
/** /**
修改导购名字 修改导购名字
*/ */
......
//
// UIButton+Title_Image.h
// SaleHelper
//
// Created by 曹云霄 on 2017/1/3.
// Copyright © 2017年 上海勾芒信息科技. All rights reserved.
//
#import <UIKit/UIKit.h>
@interface UIButton (Title_Image)
//上下居中,图片在上,文字在下
- (void)verticalCenterImageAndTitle:(CGFloat)spacing;
//左右居中,文字在左,图片在右
- (void)horizontalCenterTitleAndImage:(CGFloat)spacing;
//左右居中,图片在左,文字在右
- (void)horizontalCenterImageAndTitle:(CGFloat)spacing;
//文字居中,图片在左边
- (void)horizontalCenterTitleAndImageLeft:(CGFloat)spacing;
//文字居中,图片在右边
- (void)horizontalCenterTitleAndImageRight:(CGFloat)spacing;
@end
//
// UIButton+Title_Image.m
// SaleHelper
//
// Created by 曹云霄 on 2017/1/3.
// Copyright © 2017年 上海勾芒信息科技. All rights reserved.
//
#import "UIButton+Title_Image.h"
@implementation UIButton (Title_Image)
- (void)verticalCenterImageAndTitle:(CGFloat)spacing
{
CGSize imageSize = self.imageView.frame.size;
CGSize titleSize = self.titleLabel.frame.size;
self.titleEdgeInsets = UIEdgeInsetsMake(0.0, - imageSize.width, - (imageSize.height + spacing/2), 0.0);
titleSize = self.titleLabel.frame.size;
self.imageEdgeInsets = UIEdgeInsetsMake(- (titleSize.height + spacing/2), 0.0, 0.0, - titleSize.width);
}
- (void)horizontalCenterTitleAndImage:(CGFloat)spacing
{
CGSize imageSize = self.imageView.frame.size;
CGSize titleSize = self.titleLabel.frame.size;
self.titleEdgeInsets = UIEdgeInsetsMake(0.0, - imageSize.width, 0.0, imageSize.width + spacing/2);
titleSize = self.titleLabel.frame.size;
self.imageEdgeInsets = UIEdgeInsetsMake(0.0, titleSize.width + spacing/2, 0.0, - titleSize.width);
}
- (void)horizontalCenterImageAndTitle:(CGFloat)spacing;
{
self.titleEdgeInsets = UIEdgeInsetsMake(0.0, 0.0, 0.0, - spacing/2);
self.imageEdgeInsets = UIEdgeInsetsMake(0.0, - spacing/2, 0.0, 0.0);
}
- (void)horizontalCenterTitleAndImageLeft:(CGFloat)spacing
{
self.imageEdgeInsets = UIEdgeInsetsMake(0.0, - spacing, 0.0, 0.0);
}
- (void)horizontalCenterTitleAndImageRight:(CGFloat)spacing
{
CGSize imageSize = self.imageView.frame.size;
CGSize titleSize = self.titleLabel.frame.size;
self.titleEdgeInsets = UIEdgeInsetsMake(0.0, - imageSize.width, 0.0, 0.0);
titleSize = self.titleLabel.frame.size;
self.imageEdgeInsets = UIEdgeInsetsMake(0.0, titleSize.width + imageSize.width + spacing, 0.0, - titleSize.width);
}
@end
...@@ -32,11 +32,10 @@ ...@@ -32,11 +32,10 @@
_config.preferences.javaScriptEnabled = YES; _config.preferences.javaScriptEnabled = YES;
// 在iOS上默认为NO,表示不能自动通过窗口打开 // 在iOS上默认为NO,表示不能自动通过窗口打开
_config.preferences.javaScriptCanOpenWindowsAutomatically = NO; _config.preferences.javaScriptCanOpenWindowsAutomatically = NO;
// 通过JS与webview内容交互 // 通过JS与webview内容交互
_config.userContentController = [[WKUserContentController alloc] init]; _config.userContentController = [[WKUserContentController alloc] init];
[_config.userContentController addScriptMessageHandler:self name:@"AppModel"]; [_config.userContentController addScriptMessageHandler:self name:@"AppModel"];
[_config.userContentController addScriptMessageHandler:self name:@"appShare"];
} }
return _config; return _config;
} }
...@@ -59,7 +58,6 @@ ...@@ -59,7 +58,6 @@
[self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:@"about:blank"]]]; [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:@"about:blank"]]];
} }
- (void)viewDidLoad { - (void)viewDidLoad {
[super viewDidLoad]; [super viewDidLoad];
...@@ -111,6 +109,7 @@ ...@@ -111,6 +109,7 @@
#pragma mark - WKScriptMessageHandler #pragma mark - WKScriptMessageHandler
- (void)userContentController:(WKUserContentController *)userContentController didReceiveScriptMessage:(WKScriptMessage *)message - (void)userContentController:(WKUserContentController *)userContentController didReceiveScriptMessage:(WKScriptMessage *)message
{ {
//抽奖结果
if ([message.name isEqualToString:@"AppModel"]) { if ([message.name isEqualToString:@"AppModel"]) {
// 打印所传过来的参数,只支持NSNumber, NSString, NSDate, NSArray, // 打印所传过来的参数,只支持NSNumber, NSString, NSDate, NSArray,
// NSDictionary, and NSNull类型 // NSDictionary, and NSNull类型
...@@ -128,6 +127,16 @@ ...@@ -128,6 +127,16 @@
} }
} }
} }
}else if ([message.name isEqualToString:@"appShare"]) {
//体验中心3D分享
NSString *imgUrl = message.body[@"imgUrl"];
NSString *panoUrl = message.body[@"panoUrl"];
[UMSocialData defaultData].extConfig.wechatTimelineData.url = panoUrl;
[[UMSocialDataService defaultDataService] postSNSWithTypes:@[UMShareToWechatTimeline] content:@"体验中心3D分享" image:imgUrl location:nil urlResource:nil presentedController:self completion:^(UMSocialResponseEntity *response){
if (response.responseCode == UMSResponseCodeSuccess) {
[XBLoadingView showHUDViewWithSuccessText:@"分享微信朋友圈成功" completeBlock:nil];
}
}];
} }
} }
......
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