From a0ac7d2421b7ce392cff9def53148cf5c1166838 Mon Sep 17 00:00:00 2001
From: Achilles <wlz.debenson@gmail.com>
Date: Fri, 27 Nov 2015 22:53:25 +0800
Subject: [PATCH] =?UTF-8?q?=E2=80=9C=E7=A7=9F=E5=94=AE=E6=AF=94=E2=80=9D?=
=?UTF-8?q?=E8=B0=83=E5=9B=9E=E2=80=9C=E8=BD=A6=E6=B5=81=E2=80=9D/?=
=?UTF-8?q?=E2=80=9C=E5=AE=A2=E5=8D=95=E4=BB=B7=E2=80=9D=E6=94=B9=E4=B8=BA?=
=?UTF-8?q?=E2=80=9CWIFI=E7=99=BB=E5=BD=95=E6=95=B0=E2=80=9D=20VK-14?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
vanke.xcodeproj/project.pbxproj | 167 ++++++++++++++++--
vanke/controller/VankeProjectSummaryAPI.h | 6 +
vanke/controller/VankeProjectSummaryAPI.m | 2 +
.../affairs/VankeAffairsBoard_iPhone.m | 4 +-
.../main/VankeServiceDashBoard_iPhone.m | 8 +-
5 files changed, 167 insertions(+), 20 deletions(-)
diff --git a/vanke.xcodeproj/project.pbxproj b/vanke.xcodeproj/project.pbxproj
index 5ea42fe..660b038 100755
--- a/vanke.xcodeproj/project.pbxproj
+++ b/vanke.xcodeproj/project.pbxproj
@@ -86,6 +86,38 @@
C10F18701BF8EE600065F18C /* VankeStatementListBoard_iPhone.xml in Resources */ = {isa = PBXBuildFile; fileRef = C10F186E1BF8EE600065F18C /* VankeStatementListBoard_iPhone.xml */; };
C10F18731BF8F1830065F18C /* VankeStatementListModel.m in Sources */ = {isa = PBXBuildFile; fileRef = C10F18721BF8F1830065F18C /* VankeStatementListModel.m */; };
C10F18761BF8F33B0065F18C /* VankeSettlementListAPI.m in Sources */ = {isa = PBXBuildFile; fileRef = C10F18751BF8F33B0065F18C /* VankeSettlementListAPI.m */; };
+ C11BAAF91C089D77007BBCCC /* arrow_down@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C11BAAD71C089D77007BBCCC /* arrow_down@2x.png */; };
+ C11BAAFA1C089D77007BBCCC /* arrow_down@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = C11BAAD81C089D77007BBCCC /* arrow_down@3x.png */; };
+ C11BAAFB1C089D77007BBCCC /* bill_icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C11BAAD91C089D77007BBCCC /* bill_icon@2x.png */; };
+ C11BAAFC1C089D77007BBCCC /* bill_icon@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = C11BAADA1C089D77007BBCCC /* bill_icon@3x.png */; };
+ C11BAAFD1C089D77007BBCCC /* confirmed@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C11BAADB1C089D77007BBCCC /* confirmed@2x.png */; };
+ C11BAAFE1C089D77007BBCCC /* confirmed@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = C11BAADC1C089D77007BBCCC /* confirmed@3x.png */; };
+ C11BAAFF1C089D77007BBCCC /* confirmed_big@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C11BAADD1C089D77007BBCCC /* confirmed_big@2x.png */; };
+ C11BAB001C089D77007BBCCC /* confirmed_big@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = C11BAADE1C089D77007BBCCC /* confirmed_big@3x.png */; };
+ C11BAB011C089D77007BBCCC /* money@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C11BAADF1C089D77007BBCCC /* money@2x.png */; };
+ C11BAB021C089D77007BBCCC /* money@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = C11BAAE01C089D77007BBCCC /* money@3x.png */; };
+ C11BAB031C089D77007BBCCC /* money_add@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C11BAAE11C089D77007BBCCC /* money_add@2x.png */; };
+ C11BAB041C089D77007BBCCC /* money_add@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = C11BAAE21C089D77007BBCCC /* money_add@3x.png */; };
+ C11BAB051C089D77007BBCCC /* money_red_point@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C11BAAE31C089D77007BBCCC /* money_red_point@2x.png */; };
+ C11BAB061C089D77007BBCCC /* money_red_point@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = C11BAAE41C089D77007BBCCC /* money_red_point@3x.png */; };
+ C11BAB071C089D77007BBCCC /* money_reduce@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C11BAAE51C089D77007BBCCC /* money_reduce@2x.png */; };
+ C11BAB081C089D77007BBCCC /* money_reduce@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = C11BAAE61C089D77007BBCCC /* money_reduce@3x.png */; };
+ C11BAB091C089D77007BBCCC /* notice_icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C11BAAE71C089D77007BBCCC /* notice_icon@2x.png */; };
+ C11BAB0A1C089D77007BBCCC /* notice_icon@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = C11BAAE81C089D77007BBCCC /* notice_icon@3x.png */; };
+ C11BAB0B1C089D77007BBCCC /* red_point@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C11BAAE91C089D77007BBCCC /* red_point@2x.png */; };
+ C11BAB0C1C089D77007BBCCC /* red_point@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = C11BAAEA1C089D77007BBCCC /* red_point@3x.png */; };
+ C11BAB0D1C089D77007BBCCC /* rejected@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C11BAAEB1C089D77007BBCCC /* rejected@2x.png */; };
+ C11BAB0E1C089D77007BBCCC /* rejected@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = C11BAAEC1C089D77007BBCCC /* rejected@3x.png */; };
+ C11BAB0F1C089D77007BBCCC /* rejected_big@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C11BAAED1C089D77007BBCCC /* rejected_big@2x.png */; };
+ C11BAB101C089D77007BBCCC /* rejected_big@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = C11BAAEE1C089D77007BBCCC /* rejected_big@3x.png */; };
+ C11BAB111C089D77007BBCCC /* salel_input_icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C11BAAEF1C089D77007BBCCC /* salel_input_icon@2x.png */; };
+ C11BAB121C089D77007BBCCC /* salel_input_icon@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = C11BAAF01C089D77007BBCCC /* salel_input_icon@3x.png */; };
+ C11BAB131C089D77007BBCCC /* service_apply_icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C11BAAF11C089D77007BBCCC /* service_apply_icon@2x.png */; };
+ C11BAB141C089D77007BBCCC /* service_apply_icon@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = C11BAAF21C089D77007BBCCC /* service_apply_icon@3x.png */; };
+ C11BAB151C089D77007BBCCC /* unconfirmed@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C11BAAF31C089D77007BBCCC /* unconfirmed@2x.png */; };
+ C11BAB161C089D77007BBCCC /* unconfirmed@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = C11BAAF41C089D77007BBCCC /* unconfirmed@3x.png */; };
+ C11BAB171C089D77007BBCCC /* unconfirmed_big@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C11BAAF51C089D77007BBCCC /* unconfirmed_big@2x.png */; };
+ C11BAB181C089D77007BBCCC /* unconfirmed_big@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = C11BAAF61C089D77007BBCCC /* unconfirmed_big@3x.png */; };
C11DD0611C060A9E00DD11E3 /* CDatePickerViewEx.m in Sources */ = {isa = PBXBuildFile; fileRef = C11DD0601C060A9E00DD11E3 /* CDatePickerViewEx.m */; };
C12804D71BC124A3001ECBAA /* VankeWeatherModel.m in Sources */ = {isa = PBXBuildFile; fileRef = C12804D61BC124A3001ECBAA /* VankeWeatherModel.m */; };
C12804DA1BC12A67001ECBAA /* VankeWeatherController.m in Sources */ = {isa = PBXBuildFile; fileRef = C12804D91BC12A67001ECBAA /* VankeWeatherController.m */; };
@@ -815,6 +847,38 @@
C10F18721BF8F1830065F18C /* VankeStatementListModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VankeStatementListModel.m; sourceTree = "<group>"; };
C10F18741BF8F33B0065F18C /* VankeSettlementListAPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VankeSettlementListAPI.h; sourceTree = "<group>"; };
C10F18751BF8F33B0065F18C /* VankeSettlementListAPI.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VankeSettlementListAPI.m; sourceTree = "<group>"; };
+ C11BAAD71C089D77007BBCCC /* arrow_down@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "arrow_down@2x.png"; sourceTree = "<group>"; };
+ C11BAAD81C089D77007BBCCC /* arrow_down@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "arrow_down@3x.png"; sourceTree = "<group>"; };
+ C11BAAD91C089D77007BBCCC /* bill_icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "bill_icon@2x.png"; sourceTree = "<group>"; };
+ C11BAADA1C089D77007BBCCC /* bill_icon@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "bill_icon@3x.png"; sourceTree = "<group>"; };
+ C11BAADB1C089D77007BBCCC /* confirmed@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "confirmed@2x.png"; sourceTree = "<group>"; };
+ C11BAADC1C089D77007BBCCC /* confirmed@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "confirmed@3x.png"; sourceTree = "<group>"; };
+ C11BAADD1C089D77007BBCCC /* confirmed_big@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "confirmed_big@2x.png"; sourceTree = "<group>"; };
+ C11BAADE1C089D77007BBCCC /* confirmed_big@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "confirmed_big@3x.png"; sourceTree = "<group>"; };
+ C11BAADF1C089D77007BBCCC /* money@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "money@2x.png"; sourceTree = "<group>"; };
+ C11BAAE01C089D77007BBCCC /* money@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "money@3x.png"; sourceTree = "<group>"; };
+ C11BAAE11C089D77007BBCCC /* money_add@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "money_add@2x.png"; sourceTree = "<group>"; };
+ C11BAAE21C089D77007BBCCC /* money_add@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "money_add@3x.png"; sourceTree = "<group>"; };
+ C11BAAE31C089D77007BBCCC /* money_red_point@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "money_red_point@2x.png"; sourceTree = "<group>"; };
+ C11BAAE41C089D77007BBCCC /* money_red_point@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "money_red_point@3x.png"; sourceTree = "<group>"; };
+ C11BAAE51C089D77007BBCCC /* money_reduce@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "money_reduce@2x.png"; sourceTree = "<group>"; };
+ C11BAAE61C089D77007BBCCC /* money_reduce@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "money_reduce@3x.png"; sourceTree = "<group>"; };
+ C11BAAE71C089D77007BBCCC /* notice_icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "notice_icon@2x.png"; sourceTree = "<group>"; };
+ C11BAAE81C089D77007BBCCC /* notice_icon@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "notice_icon@3x.png"; sourceTree = "<group>"; };
+ C11BAAE91C089D77007BBCCC /* red_point@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "red_point@2x.png"; sourceTree = "<group>"; };
+ C11BAAEA1C089D77007BBCCC /* red_point@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "red_point@3x.png"; sourceTree = "<group>"; };
+ C11BAAEB1C089D77007BBCCC /* rejected@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "rejected@2x.png"; sourceTree = "<group>"; };
+ C11BAAEC1C089D77007BBCCC /* rejected@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "rejected@3x.png"; sourceTree = "<group>"; };
+ C11BAAED1C089D77007BBCCC /* rejected_big@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "rejected_big@2x.png"; sourceTree = "<group>"; };
+ C11BAAEE1C089D77007BBCCC /* rejected_big@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "rejected_big@3x.png"; sourceTree = "<group>"; };
+ C11BAAEF1C089D77007BBCCC /* salel_input_icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "salel_input_icon@2x.png"; sourceTree = "<group>"; };
+ C11BAAF01C089D77007BBCCC /* salel_input_icon@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "salel_input_icon@3x.png"; sourceTree = "<group>"; };
+ C11BAAF11C089D77007BBCCC /* service_apply_icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "service_apply_icon@2x.png"; sourceTree = "<group>"; };
+ C11BAAF21C089D77007BBCCC /* service_apply_icon@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "service_apply_icon@3x.png"; sourceTree = "<group>"; };
+ C11BAAF31C089D77007BBCCC /* unconfirmed@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "unconfirmed@2x.png"; sourceTree = "<group>"; };
+ C11BAAF41C089D77007BBCCC /* unconfirmed@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "unconfirmed@3x.png"; sourceTree = "<group>"; };
+ C11BAAF51C089D77007BBCCC /* unconfirmed_big@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "unconfirmed_big@2x.png"; sourceTree = "<group>"; };
+ C11BAAF61C089D77007BBCCC /* unconfirmed_big@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "unconfirmed_big@3x.png"; sourceTree = "<group>"; };
C11DD05F1C060A9E00DD11E3 /* CDatePickerViewEx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDatePickerViewEx.h; sourceTree = "<group>"; };
C11DD0601C060A9E00DD11E3 /* CDatePickerViewEx.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CDatePickerViewEx.m; sourceTree = "<group>"; };
C12804D51BC124A3001ECBAA /* VankeWeatherModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VankeWeatherModel.h; sourceTree = "<group>"; };
@@ -2135,6 +2199,46 @@
name = statement;
sourceTree = "<group>";
};
+ C11BAAD61C089D77007BBCCC /* settlement */ = {
+ isa = PBXGroup;
+ children = (
+ C11BAAD71C089D77007BBCCC /* arrow_down@2x.png */,
+ C11BAAD81C089D77007BBCCC /* arrow_down@3x.png */,
+ C11BAAD91C089D77007BBCCC /* bill_icon@2x.png */,
+ C11BAADA1C089D77007BBCCC /* bill_icon@3x.png */,
+ C11BAADB1C089D77007BBCCC /* confirmed@2x.png */,
+ C11BAADC1C089D77007BBCCC /* confirmed@3x.png */,
+ C11BAADD1C089D77007BBCCC /* confirmed_big@2x.png */,
+ C11BAADE1C089D77007BBCCC /* confirmed_big@3x.png */,
+ C11BAADF1C089D77007BBCCC /* money@2x.png */,
+ C11BAAE01C089D77007BBCCC /* money@3x.png */,
+ C11BAAE11C089D77007BBCCC /* money_add@2x.png */,
+ C11BAAE21C089D77007BBCCC /* money_add@3x.png */,
+ C11BAAE31C089D77007BBCCC /* money_red_point@2x.png */,
+ C11BAAE41C089D77007BBCCC /* money_red_point@3x.png */,
+ C11BAAE51C089D77007BBCCC /* money_reduce@2x.png */,
+ C11BAAE61C089D77007BBCCC /* money_reduce@3x.png */,
+ C11BAAE71C089D77007BBCCC /* notice_icon@2x.png */,
+ C11BAAE81C089D77007BBCCC /* notice_icon@3x.png */,
+ C11BAAE91C089D77007BBCCC /* red_point@2x.png */,
+ C11BAAEA1C089D77007BBCCC /* red_point@3x.png */,
+ C11BAAEB1C089D77007BBCCC /* rejected@2x.png */,
+ C11BAAEC1C089D77007BBCCC /* rejected@3x.png */,
+ C11BAAED1C089D77007BBCCC /* rejected_big@2x.png */,
+ C11BAAEE1C089D77007BBCCC /* rejected_big@3x.png */,
+ C11BAAEF1C089D77007BBCCC /* salel_input_icon@2x.png */,
+ C11BAAF01C089D77007BBCCC /* salel_input_icon@3x.png */,
+ C11BAAF11C089D77007BBCCC /* service_apply_icon@2x.png */,
+ C11BAAF21C089D77007BBCCC /* service_apply_icon@3x.png */,
+ C11BAAF31C089D77007BBCCC /* unconfirmed@2x.png */,
+ C11BAAF41C089D77007BBCCC /* unconfirmed@3x.png */,
+ C11BAAF51C089D77007BBCCC /* unconfirmed_big@2x.png */,
+ C11BAAF61C089D77007BBCCC /* unconfirmed_big@3x.png */,
+ );
+ name = settlement;
+ path = img/settlement;
+ sourceTree = "<group>";
+ };
C11DD05E1C060A9E00DD11E3 /* MonthYearDatePicker */ = {
isa = PBXGroup;
children = (
@@ -2625,22 +2729,11 @@
C1D594761BB2E5B000D297FE /* img */ = {
isa = PBXGroup;
children = (
- C1555F441C02178D00C80B55 /* settlement */,
- C10F18581BF8ACD40065F18C /* SystemImage.png */,
- C10F18591BF8ACD40065F18C /* SystemImage@2x.png */,
- C1CF9F581BF23FED0033C35E /* right_arrow.png */,
- C1CF9F441BEFB1520033C35E /* AnnounceTitleBG.png */,
- C1CF9F451BEFB1520033C35E /* AnnounceTitleBG@2x.png */,
- C1CF9F461BEFB1520033C35E /* PriorityTagGreen.png */,
- C1CF9F471BEFB1520033C35E /* PriorityTagGreen@2x.png */,
- C1CF9F481BEFB1520033C35E /* PriorityTagGrey.png */,
- C1CF9F491BEFB1520033C35E /* PriorityTagGrey@2x.png */,
- C1CF9F4A1BEFB1530033C35E /* PriorityTagOrange.png */,
- C1CF9F4B1BEFB1530033C35E /* PriorityTagOrange@2x.png */,
- C1CF9F4C1BEFB1530033C35E /* PriorityTagRed.png */,
- C1CF9F4D1BEFB1530033C35E /* PriorityTagRed@2x.png */,
+ C19ADE341BC6C71F00206213 /* floor-def.jpg */,
C14D6F591BB8071700210172 /* aboutme_unchecked.png */,
C14D6F5A1BB8071700210172 /* aboutme_unchecked@2x.png */,
+ C1CF9F441BEFB1520033C35E /* AnnounceTitleBG.png */,
+ C1CF9F451BEFB1520033C35E /* AnnounceTitleBG@2x.png */,
C1D594771BB2E5DD00D297FE /* arrow-down@2x.png */,
C1A06A011BE10B080082006F /* bill.png */,
C1A06A021BE10B080082006F /* bill@2x.png */,
@@ -2657,7 +2750,6 @@
C1D594781BB2E5DD00D297FE /* contact-them@2x.png */,
C14D6F711BB8098400210172 /* energy.png */,
C14D6F721BB8098400210172 /* energy@2x.png */,
- C19ADE341BC6C71F00206213 /* floor-def.jpg */,
C1DED3251BCEC4B40049BB2D /* home_bg.png */,
C1DED3261BCEC4B40049BB2D /* home_bg@2x.png */,
C14D6F5B1BB8071700210172 /* home_checked.png */,
@@ -2688,8 +2780,17 @@
C1A06A041BE10B080082006F /* notice@2x.png */,
C14D6F731BB8098400210172 /* people.png */,
C14D6F741BB8098400210172 /* people@2x.png */,
+ C1CF9F461BEFB1520033C35E /* PriorityTagGreen.png */,
+ C1CF9F471BEFB1520033C35E /* PriorityTagGreen@2x.png */,
+ C1CF9F481BEFB1520033C35E /* PriorityTagGrey.png */,
+ C1CF9F491BEFB1520033C35E /* PriorityTagGrey@2x.png */,
+ C1CF9F4A1BEFB1530033C35E /* PriorityTagOrange.png */,
+ C1CF9F4B1BEFB1530033C35E /* PriorityTagOrange@2x.png */,
+ C1CF9F4C1BEFB1530033C35E /* PriorityTagRed.png */,
+ C1CF9F4D1BEFB1530033C35E /* PriorityTagRed@2x.png */,
C16507831BB96C2800CB2FC1 /* pwd_icon.png */,
C16507841BB96C2800CB2FC1 /* pwd_icon@2x.png */,
+ C1CF9F581BF23FED0033C35E /* right_arrow.png */,
C14D6F851BB8268800210172 /* right_icon.png */,
C14D6F861BB8268800210172 /* right_icon@2x.png */,
C1A06A051BE10B080082006F /* sale_input.png */,
@@ -2705,12 +2806,16 @@
C1A06A071BE10B080082006F /* service_apply.png */,
C1A06A081BE10B080082006F /* service_apply@2x.png */,
C1D5950F1BB42A7200D297FE /* spinner@2x.png */,
+ C10F18581BF8ACD40065F18C /* SystemImage.png */,
+ C10F18591BF8ACD40065F18C /* SystemImage@2x.png */,
C1DED3291BCEC4B40049BB2D /* user_checked.png */,
C1DED32A1BCEC4B40049BB2D /* user_checked@2x.png */,
C19BBC271BBE894D00831290 /* user_icon.png */,
C19BBC281BBE894D00831290 /* user_icon@2x.png */,
C1DED32B1BCEC4B40049BB2D /* user.png */,
C1DED32C1BCEC4B40049BB2D /* user@2x.png */,
+ C11BAAD61C089D77007BBCCC /* settlement */,
+ C1555F441C02178D00C80B55 /* settlement */,
);
name = img;
sourceTree = "<group>";
@@ -4072,13 +4177,16 @@
C19BBC261BBE869500831290 /* PullLoader.xml in Resources */,
C1A06A0A1BE10B080082006F /* bill@2x.png in Resources */,
C19BBC001BBE85F500831290 /* VankeServiceDashBoard_iPhone.xml in Resources */,
+ C11BAB141C089D77007BBCCC /* service_apply_icon@3x.png in Resources */,
C1CF9F561BEFB1530033C35E /* PriorityTagRed.png in Resources */,
C1A06A0C1BE10B080082006F /* notice@2x.png in Resources */,
C1555F661C02178D00C80B55 /* arrow_down@3x.png in Resources */,
+ C11BAB051C089D77007BBCCC /* money_red_point@2x.png in Resources */,
C1555F781C02178D00C80B55 /* red_point@3x.png in Resources */,
C1DED3301BCEC4B40049BB2D /* business_checked@2x.png in Resources */,
C1555F6F1C02178D00C80B55 /* money_add@2x.png in Resources */,
C14D6F571BB8041B00210172 /* homepage_logo.png in Resources */,
+ C11BAAFC1C089D77007BBCCC /* bill_icon@3x.png in Resources */,
C1DED2AD1BCEAC530049BB2D /* location_icon.png in Resources */,
C16BA6241BD393B7001ACB26 /* VankePassengerDetailBoard_iPhone.xml in Resources */,
C1555F771C02178D00C80B55 /* red_point@2x.png in Resources */,
@@ -4098,13 +4206,16 @@
C19BBC061BBE85F500831290 /* VankeWeatherCell_iPhone.xml in Resources */,
C1D595031BB42A6800D297FE /* page-normal@2x.png in Resources */,
C1DED3391BCEC4B40049BB2D /* user.png in Resources */,
+ C11BAB0B1C089D77007BBCCC /* red_point@2x.png in Resources */,
C1A06A0B1BE10B080082006F /* notice.png in Resources */,
+ C11BAB0F1C089D77007BBCCC /* rejected_big@2x.png in Resources */,
C1D595051BB42A6800D297FE /* splash2.xml in Resources */,
C14D6F6C1BB8071700210172 /* sales_red@2x.png in Resources */,
C1CF9F411BEF4A770033C35E /* VankeNoticeListBoardCell_iPhone.xml in Resources */,
C1CF9F521BEFB1530033C35E /* PriorityTagGrey.png in Resources */,
C10F18571BF8AAC90065F18C /* Localizable.strings in Resources */,
C165078C1BB96C2800CB2FC1 /* pwd_icon.png in Resources */,
+ C11BAB011C089D77007BBCCC /* money@2x.png in Resources */,
C1555F7B1C02178D00C80B55 /* rejected_big@2x.png in Resources */,
C1DED3381BCEC4B40049BB2D /* user_checked@2x.png in Resources */,
C1A06A0D1BE10B080082006F /* sale_input.png in Resources */,
@@ -4112,21 +4223,30 @@
C1D5948B1BB2E5DD00D297FE /* arrow-down@2x.png in Resources */,
C1D594971BB2E5DD00D297FE /* navigation-back@2x.png in Resources */,
C19BBC291BBE894D00831290 /* user_icon.png in Resources */,
+ C11BAB181C089D77007BBCCC /* unconfirmed_big@3x.png in Resources */,
+ C11BAB111C089D77007BBCCC /* salel_input_icon@2x.png in Resources */,
C17ABD531BFCD92200908573 /* VankeStatementDetailMonthCell_iPhone.xml in Resources */,
+ C11BAAFA1C089D77007BBCCC /* arrow_down@3x.png in Resources */,
C1555F691C02178D00C80B55 /* confirmed@2x.png in Resources */,
C10F18611BF8ED5D0065F18C /* VankeStatementMonthCell_iPhone.xml in Resources */,
C1DED3321BCEC4B40049BB2D /* business@2x.png in Resources */,
C14D6F871BB8268800210172 /* right_icon.png in Resources */,
C1555F841C02178D00C80B55 /* unconfirmed_big@3x.png in Resources */,
+ C11BAB071C089D77007BBCCC /* money_reduce@2x.png in Resources */,
C1D595061BB42A6800D297FE /* splash3.xml in Resources */,
C1555F671C02178D00C80B55 /* bill_icon@2x.png in Resources */,
C19BBBFC1BBE85F500831290 /* VankeMainTabBoard_iPhone.xml in Resources */,
+ C11BAB041C089D77007BBCCC /* money_add@3x.png in Resources */,
C1555F651C02178D00C80B55 /* arrow_down@2x.png in Resources */,
+ C11BAAFF1C089D77007BBCCC /* confirmed_big@2x.png in Resources */,
+ C11BAB031C089D77007BBCCC /* money_add@2x.png in Resources */,
C1555F791C02178D00C80B55 /* rejected@2x.png in Resources */,
C19ADE3D1BC8147800206213 /* left_arrow.png in Resources */,
+ C11BAB161C089D77007BBCCC /* unconfirmed@3x.png in Resources */,
C19ADE4A1BC82ADB00206213 /* nav_orange_bg.png in Resources */,
C1CF9F531BEFB1530033C35E /* PriorityTagGrey@2x.png in Resources */,
C10F186B1BF8EE2D0065F18C /* VankeStatementDetailListCell_iPhone.xml in Resources */,
+ C11BAB101C089D77007BBCCC /* rejected_big@3x.png in Resources */,
C14D6F671BB8071700210172 /* sales_orange.png in Resources */,
C1555F731C02178D00C80B55 /* money_reduce@2x.png in Resources */,
C1555F6A1C02178D00C80B55 /* confirmed@3x.png in Resources */,
@@ -4141,8 +4261,11 @@
C1D595171BB42A7200D297FE /* spinner@2x.png in Resources */,
C1555F711C02178D00C80B55 /* money_red_point@2x.png in Resources */,
C10F18661BF8EE020065F18C /* VankeStatementListItemCell_iPhone.xml in Resources */,
+ C11BAB0C1C089D77007BBCCC /* red_point@3x.png in Resources */,
+ C11BAB0A1C089D77007BBCCC /* notice_icon@3x.png in Resources */,
C165078D1BB96C2800CB2FC1 /* pwd_icon@2x.png in Resources */,
C1D595161BB42A7200D297FE /* navigation-menu@2x.png in Resources */,
+ C11BAB151C089D77007BBCCC /* unconfirmed@2x.png in Resources */,
C1CF9F361BEF232A0033C35E /* VankeNoticeListBoard_iPhone.xml in Resources */,
C1555F7D1C02178D00C80B55 /* salel_input_icon@2x.png in Resources */,
C1DED2AE1BCEAC530049BB2D /* location_icon@2x.png in Resources */,
@@ -4152,6 +4275,7 @@
C1DED33A1BCEC4B40049BB2D /* user@2x.png in Resources */,
C19BBBFA1BBE85F500831290 /* VankeMainBoard_iPhone.xml in Resources */,
C14D6F791BB8098400210172 /* energy.png in Resources */,
+ C11BAB061C089D77007BBCCC /* money_red_point@3x.png in Resources */,
C14D6F7B1BB8098400210172 /* people.png in Resources */,
C16507891BB96C2800CB2FC1 /* login_bg@2x.png in Resources */,
C1DED32D1BCEC4B40049BB2D /* blue_bg.png in Resources */,
@@ -4162,6 +4286,7 @@
C1DED3371BCEC4B40049BB2D /* user_checked.png in Resources */,
C1CF9F591BF23FED0033C35E /* right_arrow.png in Resources */,
C19BBC041BBE85F500831290 /* VankeTopMenuBoardCell_iPhone.xml in Resources */,
+ C11BAB121C089D77007BBCCC /* salel_input_icon@3x.png in Resources */,
C14D6F811BB813D300210172 /* little_down_icon.png in Resources */,
C1555F761C02178D00C80B55 /* notice_icon@3x.png in Resources */,
C16BA62F1BD3ABF1001ACB26 /* NoDataCell_iPhoneCell.xml in Resources */,
@@ -4171,16 +4296,21 @@
C19ADE3E1BC8147800206213 /* left_arrow@2x.png in Resources */,
C1555F811C02178D00C80B55 /* unconfirmed@2x.png in Resources */,
C19BBBFE1BBE85F500831290 /* VankeServiceBoardCell_iPhone.xml in Resources */,
+ C11BAB0D1C089D77007BBCCC /* rejected@2x.png in Resources */,
C14D6F841BB813D300210172 /* little_up_icon@2x.png in Resources */,
C10F18561BF8AAC90065F18C /* Localizable.strings in Resources */,
C1D599B21BB58FD600D297FE /* icon_username@2x.png in Resources */,
C19BBC1C1BBE865400831290 /* VankeFloorListBoardCell_iPhone.xml in Resources */,
C1D595041BB42A6800D297FE /* splash1.xml in Resources */,
+ C11BAB131C089D77007BBCCC /* service_apply_icon@2x.png in Resources */,
+ C11BAB081C089D77007BBCCC /* money_reduce@3x.png in Resources */,
C17ABD4E1BFCD48A00908573 /* VankeStatementDetailListBoard_iPhone.xml in Resources */,
C1D595071BB42A6800D297FE /* splash4.xml in Resources */,
C14D6F751BB8098400210172 /* car.png in Resources */,
+ C11BAB001C089D77007BBCCC /* confirmed_big@3x.png in Resources */,
C14D6F821BB813D300210172 /* little_down_icon@2x.png in Resources */,
C14D6F651BB8071700210172 /* home_checked.png in Resources */,
+ C11BAAF91C089D77007BBCCC /* arrow_down@2x.png in Resources */,
C19BBC0F1BBE861700831290 /* VankeBusinessChartCell_iPhone.xml in Resources */,
C14D6F781BB8098400210172 /* complaint@2x.png in Resources */,
C1DED3311BCEC4B40049BB2D /* business.png in Resources */,
@@ -4190,17 +4320,23 @@
C1D599B11BB58FD600D297FE /* icon_password@2x.png in Resources */,
C1DED32E1BCEC4B40049BB2D /* blue_bg@2x.png in Resources */,
C10F185A1BF8ACD40065F18C /* SystemImage.png in Resources */,
+ C11BAB0E1C089D77007BBCCC /* rejected@3x.png in Resources */,
C14D6F771BB8098400210172 /* complaint.png in Resources */,
C1D595021BB42A6800D297FE /* page-last@2x.png in Resources */,
C1555F721C02178D00C80B55 /* money_red_point@3x.png in Resources */,
C1CF9F551BEFB1530033C35E /* PriorityTagOrange@2x.png in Resources */,
C1555F7F1C02178D00C80B55 /* service_apply_icon@2x.png in Resources */,
+ C11BAAFB1C089D77007BBCCC /* bill_icon@2x.png in Resources */,
C1D595011BB42A6800D297FE /* page-active@2x.png in Resources */,
C1555F7A1C02178D00C80B55 /* rejected@3x.png in Resources */,
+ C11BAB091C089D77007BBCCC /* notice_icon@2x.png in Resources */,
+ C11BAAFD1C089D77007BBCCC /* confirmed@2x.png in Resources */,
+ C11BAB171C089D77007BBCCC /* unconfirmed_big@2x.png in Resources */,
C1DED3331BCEC4B40049BB2D /* home_bg.png in Resources */,
C14D6F7A1BB8098400210172 /* energy@2x.png in Resources */,
C165078B1BB96C2800CB2FC1 /* logo@2x.png in Resources */,
C1CF9F4E1BEFB1530033C35E /* AnnounceTitleBG.png in Resources */,
+ C11BAB021C089D77007BBCCC /* money@3x.png in Resources */,
C1555F7E1C02178D00C80B55 /* salel_input_icon@3x.png in Resources */,
C1D58B511BB1BC9200D297FE /* Images.xcassets in Resources */,
C14D6F7C1BB8098400210172 /* people@2x.png in Resources */,
@@ -4223,6 +4359,7 @@
C1CF9F4F1BEFB1530033C35E /* AnnounceTitleBG@2x.png in Resources */,
C14D6F6A1BB8071700210172 /* sales_purple@2x.png in Resources */,
C1DED3361BCEC4B40049BB2D /* home@2x.png in Resources */,
+ C11BAAFE1C089D77007BBCCC /* confirmed@3x.png in Resources */,
C1CF9F511BEFB1530033C35E /* PriorityTagGreen@2x.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
diff --git a/vanke/controller/VankeProjectSummaryAPI.h b/vanke/controller/VankeProjectSummaryAPI.h
index 4c891fe..5c5e01d 100755
--- a/vanke/controller/VankeProjectSummaryAPI.h
+++ b/vanke/controller/VankeProjectSummaryAPI.h
@@ -45,6 +45,12 @@
// 当å‰è½¦æµ
@property (nonatomic, strong) NSNumber *trafficVolume;
+// 租售比
+@property (nonatomic, strong) NSNumber *salesPerArea;
+
+// wifi登录数
+@property (nonatomic, strong) NSNumber *wifiLoginTimes;
+
@end
diff --git a/vanke/controller/VankeProjectSummaryAPI.m b/vanke/controller/VankeProjectSummaryAPI.m
index 0e10b61..105ef27 100755
--- a/vanke/controller/VankeProjectSummaryAPI.m
+++ b/vanke/controller/VankeProjectSummaryAPI.m
@@ -71,6 +71,8 @@
@synthesize passengerFlowVolume;
@synthesize trafficVolume;
@synthesize salesAmount;
+@synthesize salesPerArea;
+@synthesize wifiLoginTimes;
@end
diff --git a/vanke/view_iPhone/templates/affairs/VankeAffairsBoard_iPhone.m b/vanke/view_iPhone/templates/affairs/VankeAffairsBoard_iPhone.m
index 543105b..e7f5de4 100644
--- a/vanke/view_iPhone/templates/affairs/VankeAffairsBoard_iPhone.m
+++ b/vanke/view_iPhone/templates/affairs/VankeAffairsBoard_iPhone.m
@@ -21,6 +21,7 @@
#import "VankeAppBoard_iPhone.h"
#import "VankeNoticeListBoard_iPhone.h"
#import "VankeStatementListBoard_iPhone.h"
+#import "ICRAnnouncementViewController.h"
#pragma mark -
@@ -92,7 +93,8 @@ ON_DID_DISAPPEAR( signal )
ON_SIGNAL3(VankeAffairsBoard_iPhone, btnNotice, signal) {
[[VankeAppBoard_iPhone sharedInstance] hideMenu];
- VankeNoticeListBoard_iPhone *board = [VankeNoticeListBoard_iPhone board];
+// VankeNoticeListBoard_iPhone *board = [VankeNoticeListBoard_iPhone board];
+ ICRAnnouncementViewController *board = [ICRAnnouncementViewController board];
[self.stack pushBoard:board animated:YES];
}
diff --git a/vanke/view_iPhone/templates/main/VankeServiceDashBoard_iPhone.m b/vanke/view_iPhone/templates/main/VankeServiceDashBoard_iPhone.m
index 6456fc4..8c4db0b 100644
--- a/vanke/view_iPhone/templates/main/VankeServiceDashBoard_iPhone.m
+++ b/vanke/view_iPhone/templates/main/VankeServiceDashBoard_iPhone.m
@@ -48,9 +48,9 @@ DEF_OUTLET( VankeServiceBoardCell_iPhone, complaint );
{
self.salesInfo.imgRightBg.backgroundColor = [UIColor colorWithRed:237/255.0 green:27/255.0 blue:35/255.0 alpha:1];
[self.passenger loadDefaults:@"people.png" title:@"当å‰å®¢æµ" bgColor:[UIColor colorWithRed:0 green:195/255.0 blue:230/255.0 alpha:1] unit:@"人" defValue:[NSNumber numberWithInt:0]];
- [self.traffic loadDefaults:@"car.png" title:@"租售比" bgColor:[UIColor colorWithRed:79/255.0 green:143/255.0 blue:248/255.0 alpha:1] unit:@"%" defValue:[NSNumber numberWithInt:0]];
+ [self.traffic loadDefaults:@"car.png" title:@"车æµ" bgColor:[UIColor colorWithRed:79/255.0 green:143/255.0 blue:248/255.0 alpha:1] unit:@"人" defValue:[NSNumber numberWithInt:0]];
[self.energy loadDefaults:@"energy.png" title:@"åªæ•ˆ" bgColor:[UIColor colorWithRed:149/255.0 green:200/255.0 blue:8/255.0 alpha:1] unit:@"å…ƒ" defValue:[NSNumber numberWithInt:0]];
- [self.complaint loadDefaults:@"complaint.png" title:@"客å•ä»·" bgColor:[UIColor colorWithRed:252/255.0 green:67/255.0 blue:62/255.0 alpha:1] unit:@"å…ƒ" defValue:[NSNumber numberWithInt:0]];
+ [self.complaint loadDefaults:@"complaint.png" title:@"WIFI登录数" bgColor:[UIColor colorWithRed:252/255.0 green:67/255.0 blue:62/255.0 alpha:1] unit:@"次" defValue:[NSNumber numberWithInt:0]];
}
- (void)unload
@@ -66,9 +66,9 @@ DEF_OUTLET( VankeServiceBoardCell_iPhone, complaint );
if (nil != summary) {
[self.salesInfo setData:summary.salesAmount];
[self.passenger setData:summary.passengerFlowVolume];
- [self.traffic setData:[NSNumber numberWithFloat:15.16]];
+ [self.traffic setData:[NSNumber numberWithFloat:122]];
[self.energy setData:[NSNumber numberWithInt:789]];
- [self.complaint setData:[NSNumber numberWithInt:103]];
+ [self.complaint setData:summary.wifiLoginTimes];
}
}
--
2.18.1