From fbd62afcf9e1b280386f763532544a4561864e66 Mon Sep 17 00:00:00 2001 From: quan Date: Sun, 19 Mar 2017 15:48:48 +0700 Subject: [PATCH] version 1.2.2 --- .idea/misc.xml | 31 ---- App/Base.lproj/Main.storyboard | 127 +++++++++++------ App/addPerson/CellPerson.swift | 21 +++ App/addPerson/VCAddPerson.swift | 46 +++++- App/addPerson/VcListPerson.swift | 55 +++++++- .../MyConfirmViewController.swift | 32 +++-- App/camera/board/Board.swift | 42 ++++-- App/camera/board/Board.xib | 3 + App/commons/CellMucChupWithCamera.swift | 41 ++++-- App/createNew/VCChonMucChup.swift | 29 +++- App/createNew/VCConfirmMucDaChon.swift | 2 +- App/createNew/VCNhapMucChup.swift | 37 ++++- App/firstInput/VCNoiDungTraoDoi.swift | 15 +- App/firstInput/VCSendTraoDoi.swift | 37 ++++- App/listCtruong/VCListCtruong.swift | 2 +- App/listCtruong/VCPageImgs.swift | 34 ++++- App/listCtruong/VCShootItemList.swift | 12 +- App/listCtruong/VcEdit.swift | 157 +++++++++++++++++++-- App/model/CongTruong.swift | 20 ++- App/model/ImgObj.swift | 18 ++- App/model/Person.swift | 33 +++++ App/model/ShootItem.swift | 20 ++- App/utils/AppUtils.swift | 29 ++-- App/utils/NetWorkUtils.swift | 14 +- .../GeneralUtils/commonUtils/DataTypeUtils.swift | 9 +- .../GeneralUtils/commonUtils/NetWorkUtils.swift | 3 +- .../ui/views/TableView/BaseTbLoadData.swift | 2 +- .../GeneralUtils/ui/views/UIButtonCustom.swift | 6 +- Morooka.xcodeproj/project.pbxproj | 8 ++ .../UserInterfaceState.xcuserstate | Bin 14115 -> 19391 bytes 30 files changed, 690 insertions(+), 195 deletions(-) create mode 100644 App/addPerson/CellPerson.swift create mode 100644 App/model/Person.swift diff --git a/.idea/misc.xml b/.idea/misc.xml index e1f8477..bfe3f8e 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -46,37 +46,6 @@ - - - - - - - - - Objective-C - - - RELAX NG - - - Spelling - - - Swift - - - TypeScript - - - - - Objective-C - - - - - diff --git a/App/Base.lproj/Main.storyboard b/App/Base.lproj/Main.storyboard index 50d9099..cad21d1 100644 --- a/App/Base.lproj/Main.storyboard +++ b/App/Base.lproj/Main.storyboard @@ -61,7 +61,7 @@ - 不明 + ID発行 @@ -155,7 +155,7 @@ - + - - - - - - - - - - + - - + @@ -258,14 +241,14 @@ - + - + - + + + - + + + + + + - + @@ -1080,6 +1072,7 @@ + @@ -1179,7 +1172,7 @@ - + @@ -1202,6 +1195,7 @@ + @@ -1782,6 +1776,9 @@ + + + + + @@ -2201,7 +2221,7 @@ -