Skip to content

Commit

Permalink
add slides
Browse files Browse the repository at this point in the history
  • Loading branch information
@airingursb
airingursb committed May 31, 2016
1 parent 7ac90c3 commit 465f031
Show file tree
Hide file tree
Showing 6 changed files with 357 additions and 10 deletions.
12 changes: 8 additions & 4 deletions FeedMe.xcodeproj/project.pbxproj
View file
Expand Up @@ -688,6 +688,7 @@
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "iPhone Developer: Jiahao Sun (8AFAT9RX6K)";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/build/Debug-iphoneos",
Expand All @@ -714,6 +715,7 @@
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "iPhone Developer: Jiahao Sun (8AFAT9RX6K)";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/build/Debug-iphoneos",
Expand Down Expand Up @@ -752,7 +754,8 @@
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_IDENTITY = "iPhone Developer: Jiahao Sun (8AFAT9RX6K)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Jiahao Sun (8AFAT9RX6K)";
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
Expand Down Expand Up @@ -797,7 +800,8 @@
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_IDENTITY = "iPhone Developer: Jiahao Sun (8AFAT9RX6K)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Jiahao Sun (8AFAT9RX6K)";
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
Expand All @@ -824,7 +828,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_IDENTITY = "iPhone Developer: Jiahao Sun (8AFAT9RX6K)";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/FeedMe/SMS_SDK",
Expand All @@ -851,7 +855,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_IDENTITY = "iPhone Developer: Jiahao Sun (8AFAT9RX6K)";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/FeedMe/SMS_SDK",
Expand Down
8 changes: 7 additions & 1 deletion FeedMe/Base.lproj/Main.storyboard
View file
Expand Up @@ -1647,6 +1647,11 @@
</connections>
</tableView>
<navigationItem key="navigationItem" title="个人设置" id="YfH-ya-xDO">
<barButtonItem key="leftBarButtonItem" systemItem="cancel" id="HUR-sf-58A">
<connections>
<segue destination="1q0-B8-SDZ" kind="show" id="nEJ-1A-Fmb"/>
</connections>
</barButtonItem>
<barButtonItem key="rightBarButtonItem" systemItem="save" id="Z5X-at-4MQ">
<connections>
<action selector="updateInfo:" destination="bhR-Qk-Ak1" id="w7v-QC-Rtw"/>
Expand Down Expand Up @@ -3569,6 +3574,7 @@
<inferredMetricsTieBreakers>
<segue reference="RI2-dy-XmB"/>
<segue reference="fxp-1h-NEc"/>
<segue reference="Cf6-7c-5O0"/>
<segue reference="Fzz-A2-wc2"/>
<segue reference="nEJ-1A-Fmb"/>
</inferredMetricsTieBreakers>
</document>
2 changes: 1 addition & 1 deletion FeedMe/ConfigUtil.swift
View file
Expand Up @@ -9,7 +9,7 @@
import Foundation

class ConfigUtil {
var _host: String? = "http://192.168.20.229:8080/feedme"
var _host: String? = "http://192.168.173.1:8080/feedme"

var host: String? {
get {
Expand Down
4 changes: 2 additions & 2 deletions FeedMe/GroupDetailViewController.swift
View file
Expand Up @@ -109,7 +109,7 @@ class GroupDetailViewController: UIViewController, UITableViewDataSource, UITabl
self.discussUserName = json.userName
self.discussUserHead = json.userHead
self.discussContent = json.discussContent
self.discussImage = json.discussImage
self.discussImage = config.host! + json.discussImage
self.discussCreateTime = json.discussCreateTime
if (json.result == 1) {
if json.replyNum != 0 {
Expand All @@ -119,7 +119,7 @@ class GroupDetailViewController: UIViewController, UITableViewDataSource, UITabl
self.replyCreateTimes.append(json.groups[i].replyCreateTime)
self.replyContents.append(json.groups[i].replyContent)
self.replyIds.append(json.groups[i].replyId)
self.userHeads.append(json.groups[i].userHead)
self.userHeads.append(config.host! + json.groups[i].userHead)
self.count++
self.tableview.reloadData()
}
Expand Down
5 changes: 3 additions & 2 deletions FeedMe/GroupViewController.swift
View file
Expand Up @@ -112,6 +112,7 @@ class GroupViewController: UIViewController, UITableViewDataSource, UITableViewD
request.POST(discuss_url, parameters: ["page": self.pageNumber], completionHandler: {(response: HTTPResponse) in
if let res: AnyObject = response.responseObject {
let json = Groups(JSONDecoder(res))
print(json)
if (json.result == 1) {
print(json.groups[1].userName)
if json.discussNum != 0 {
Expand All @@ -121,9 +122,9 @@ class GroupViewController: UIViewController, UITableViewDataSource, UITableViewD
self.discussIds.append(json.groups[i].discussId)
self.createTimes.append(json.groups[i].createTime)
self.replyNumbers.append(json.groups[i].replyNumber)
self.groupImages.append(json.groups[i].groupImage)
self.groupImages.append(config.host! + json.groups[i].groupImage)
self.contents.append(json.groups[i].content)
self.userHeads.append(json.groups[i].userHead)
self.userHeads.append(config.host! + json.groups[i].userHead)
self.count++
self.tableview.reloadData()
}
Expand Down
336 changes: 336 additions & 0 deletions slides.html
View file

Large diffs are not rendered by default.

0 comments on commit 465f031

Please sign in to comment.