diff --git a/Ash_AWord.xcodeproj/project.pbxproj b/Ash_AWord.xcodeproj/project.pbxproj index d7a538e..2ec1830 100644 --- a/Ash_AWord.xcodeproj/project.pbxproj +++ b/Ash_AWord.xcodeproj/project.pbxproj @@ -2559,7 +2559,7 @@ A95510841AC39E6A0006D16F /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0620; + LastUpgradeCheck = 0720; ORGANIZATIONNAME = ash; TargetAttributes = { A955108B1AC39E6A0006D16F = { @@ -3080,6 +3080,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; @@ -3163,6 +3164,7 @@ "$(PROJECT_DIR)/Ash_AWord/ViewControllers/Chat/VoiceConvert/opencore-amrnb", "$(PROJECT_DIR)/Ash_AWord/ViewControllers/Chat/VoiceConvert/opencore-amrwb", ); + PRODUCT_BUNDLE_IDENTIFIER = "ash.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = "b33bbace-362f-4f05-be3d-6af1812b44e0"; VALID_ARCHS = "arm64 armv7 armv7s x86_64"; @@ -3195,6 +3197,7 @@ "$(PROJECT_DIR)/Ash_AWord/ViewControllers/Chat/VoiceConvert/opencore-amrnb", "$(PROJECT_DIR)/Ash_AWord/ViewControllers/Chat/VoiceConvert/opencore-amrwb", ); + PRODUCT_BUNDLE_IDENTIFIER = "ash.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = "b33bbace-362f-4f05-be3d-6af1812b44e0"; VALID_ARCHS = "arm64 armv7 armv7s x86_64"; diff --git a/Ash_AWord.xcodeproj/xcuserdata/xmfish.xcuserdatad/xcschemes/Ash_AWord.xcscheme b/Ash_AWord.xcodeproj/xcuserdata/xmfish.xcuserdatad/xcschemes/Ash_AWord.xcscheme index 7bfe036..58b43ba 100644 --- a/Ash_AWord.xcodeproj/xcuserdata/xmfish.xcuserdatad/xcschemes/Ash_AWord.xcscheme +++ b/Ash_AWord.xcodeproj/xcuserdata/xmfish.xcuserdatad/xcschemes/Ash_AWord.xcscheme @@ -1,6 +1,6 @@ + shouldUseLaunchSchemeArgsEnv = "YES"> @@ -62,15 +62,18 @@ ReferencedContainer = "container:Ash_AWord.xcodeproj"> + + @@ -86,10 +89,10 @@ diff --git a/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index d6b579d..8ad658d 100644 --- a/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -323,22 +323,6 @@ landmarkType = "5"> - - - - + + + + + + + + + + + + diff --git a/Ash_AWord/Info.plist b/Ash_AWord/Info.plist index 3e15e38..cb897b1 100644 --- a/Ash_AWord/Info.plist +++ b/Ash_AWord/Info.plist @@ -15,7 +15,7 @@ Icon CFBundleIdentifier - ash.$(PRODUCT_NAME:rfc1034identifier) + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/Ash_AWord/LaunchScreen.xib b/Ash_AWord/LaunchScreen.xib index d2cfff8..d740c33 100644 --- a/Ash_AWord/LaunchScreen.xib +++ b/Ash_AWord/LaunchScreen.xib @@ -1,8 +1,8 @@ - + - + diff --git a/Ash_AWord/ViewControllers/Login/LoginViewController.xib b/Ash_AWord/ViewControllers/Login/LoginViewController.xib index e345d6c..4ea659d 100644 --- a/Ash_AWord/ViewControllers/Login/LoginViewController.xib +++ b/Ash_AWord/ViewControllers/Login/LoginViewController.xib @@ -1,8 +1,8 @@ - + - + diff --git a/Ash_AWord/ViewControllers/Login/OurLoginViewController.xib b/Ash_AWord/ViewControllers/Login/OurLoginViewController.xib index 7d94df0..dc171e6 100644 --- a/Ash_AWord/ViewControllers/Login/OurLoginViewController.xib +++ b/Ash_AWord/ViewControllers/Login/OurLoginViewController.xib @@ -1,8 +1,8 @@ - + - + diff --git a/Ash_AWord/ViewControllers/Login/RegistAccountViewController.xib b/Ash_AWord/ViewControllers/Login/RegistAccountViewController.xib index b71c0fb..871fbd8 100644 --- a/Ash_AWord/ViewControllers/Login/RegistAccountViewController.xib +++ b/Ash_AWord/ViewControllers/Login/RegistAccountViewController.xib @@ -1,8 +1,8 @@ - + - + diff --git a/Ash_AWord/ViewControllers/Login/RegistInfoViewController.xib b/Ash_AWord/ViewControllers/Login/RegistInfoViewController.xib index 5fe1a30..ea1d875 100644 --- a/Ash_AWord/ViewControllers/Login/RegistInfoViewController.xib +++ b/Ash_AWord/ViewControllers/Login/RegistInfoViewController.xib @@ -1,8 +1,8 @@ - + - + diff --git a/Ash_AWord/ViewControllers/Note/NoteCommentViewController.m b/Ash_AWord/ViewControllers/Note/NoteCommentViewController.m index dc9f881..bd10c06 100644 --- a/Ash_AWord/ViewControllers/Note/NoteCommentViewController.m +++ b/Ash_AWord/ViewControllers/Note/NoteCommentViewController.m @@ -117,9 +117,11 @@ PropertyEntity* pro = [NoteViewModel requireNoteWithRecordId:_recordId]; [RequireEngine requireWithProperty:pro completionBlock:^(id viewModel) { if ([viewModel success]) { - if (_text_image) { + if (_text_image) + { _text_image = [(NoteViewModel*)viewModel text_image]; - if (_headView) { + if (_headView) + { [_headView setText_Image:_text_image]; } return ; diff --git a/Ash_AWord/Views/Note/NoteTableViewCell.xib b/Ash_AWord/Views/Note/NoteTableViewCell.xib index 6bbbd0a..eb17628 100644 --- a/Ash_AWord/Views/Note/NoteTableViewCell.xib +++ b/Ash_AWord/Views/Note/NoteTableViewCell.xib @@ -1,8 +1,8 @@ - + - + @@ -12,7 +12,7 @@ - +