Skip to content

Z
ZhiJi-Overseas
Commit e3d8716d authored by lmj_521aiau@163.com's avatar lmj_521aiau@163.com
Browse files
Options

no message

parent 5a276689
Expand all Show whitespace changes
Inline Side-by-side
Showing with 309 additions and 216 deletions
ZhiJi.xcodeproj/project.pbxproj
View file @ e3d8716d
...@@ -157,6 +157,7 @@ ...@@ -157,6 +157,7 @@
A96696E424AF5E7700CF6992 /* AMap.bundle in Resources */ = {isa = PBXBuildFile; fileRef = A96696E324AF5E7700CF6992 /* AMap.bundle */; }; A96696E424AF5E7700CF6992 /* AMap.bundle in Resources */ = {isa = PBXBuildFile; fileRef = A96696E324AF5E7700CF6992 /* AMap.bundle */; };
A9764A522490EAC600463B78 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9764A512490EAC600463B78 /* CoreGraphics.framework */; }; A9764A522490EAC600463B78 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9764A512490EAC600463B78 /* CoreGraphics.framework */; };
A9764A5C2492380D00463B78 /* ZJImagePickerManager.m in Sources */ = {isa = PBXBuildFile; fileRef = A9764A5B2492380D00463B78 /* ZJImagePickerManager.m */; }; A9764A5C2492380D00463B78 /* ZJImagePickerManager.m in Sources */ = {isa = PBXBuildFile; fileRef = A9764A5B2492380D00463B78 /* ZJImagePickerManager.m */; };
A9C2B61F24CEC0DC00010EAE /* ZJCustomAnnotation.m in Sources */ = {isa = PBXBuildFile; fileRef = A9C2B61E24CEC0DC00010EAE /* ZJCustomAnnotation.m */; };
A9F91E28249CCA4B006157BF /* ZJUpgradeAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = A9F91E27249CCA4B006157BF /* ZJUpgradeAlertView.m */; }; A9F91E28249CCA4B006157BF /* ZJUpgradeAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = A9F91E27249CCA4B006157BF /* ZJUpgradeAlertView.m */; };
A9F91E3E249DFC53006157BF /* BaseWebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A9F91E3D249DFC53006157BF /* BaseWebViewController.m */; }; A9F91E3E249DFC53006157BF /* BaseWebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A9F91E3D249DFC53006157BF /* BaseWebViewController.m */; };
D5167D5B2490C87400A79CB6 /* ZJSheZhiView.m in Sources */ = {isa = PBXBuildFile; fileRef = D5167D592490C87400A79CB6 /* ZJSheZhiView.m */; }; D5167D5B2490C87400A79CB6 /* ZJSheZhiView.m in Sources */ = {isa = PBXBuildFile; fileRef = D5167D592490C87400A79CB6 /* ZJSheZhiView.m */; };
...@@ -467,6 +468,8 @@ ...@@ -467,6 +468,8 @@
A9764A5A2492380D00463B78 /* ZJImagePickerManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZJImagePickerManager.h; sourceTree = "<group>"; }; A9764A5A2492380D00463B78 /* ZJImagePickerManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZJImagePickerManager.h; sourceTree = "<group>"; };
A9764A5B2492380D00463B78 /* ZJImagePickerManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZJImagePickerManager.m; sourceTree = "<group>"; }; A9764A5B2492380D00463B78 /* ZJImagePickerManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZJImagePickerManager.m; sourceTree = "<group>"; };
A9850D6E2490B9F500810B7D /* PrefixHeader.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PrefixHeader.pch; path = ZhiJi/Classes/Tools/PCH/PrefixHeader.pch; sourceTree = SOURCE_ROOT; }; A9850D6E2490B9F500810B7D /* PrefixHeader.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PrefixHeader.pch; path = ZhiJi/Classes/Tools/PCH/PrefixHeader.pch; sourceTree = SOURCE_ROOT; };
A9C2B61D24CEC0DC00010EAE /* ZJCustomAnnotation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZJCustomAnnotation.h; sourceTree = "<group>"; };
A9C2B61E24CEC0DC00010EAE /* ZJCustomAnnotation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZJCustomAnnotation.m; sourceTree = "<group>"; };
A9F91E26249CCA4B006157BF /* ZJUpgradeAlertView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZJUpgradeAlertView.h; sourceTree = "<group>"; }; A9F91E26249CCA4B006157BF /* ZJUpgradeAlertView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZJUpgradeAlertView.h; sourceTree = "<group>"; };
A9F91E27249CCA4B006157BF /* ZJUpgradeAlertView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZJUpgradeAlertView.m; sourceTree = "<group>"; }; A9F91E27249CCA4B006157BF /* ZJUpgradeAlertView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZJUpgradeAlertView.m; sourceTree = "<group>"; };
A9F91E3C249DFC53006157BF /* BaseWebViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BaseWebViewController.h; sourceTree = "<group>"; }; A9F91E3C249DFC53006157BF /* BaseWebViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BaseWebViewController.h; sourceTree = "<group>"; };
...@@ -1027,6 +1030,8 @@ ...@@ -1027,6 +1030,8 @@
A9619E7F24AAE2A8009A2012 /* ZJMapStyle2ViewController.m */, A9619E7F24AAE2A8009A2012 /* ZJMapStyle2ViewController.m */,
64F52440248F34DB0032BCA2 /* ZJFriendTrackMapViewController.h */, 64F52440248F34DB0032BCA2 /* ZJFriendTrackMapViewController.h */,
64F52441248F34DB0032BCA2 /* ZJFriendTrackMapViewController.m */, 64F52441248F34DB0032BCA2 /* ZJFriendTrackMapViewController.m */,
A9C2B61D24CEC0DC00010EAE /* ZJCustomAnnotation.h */,
A9C2B61E24CEC0DC00010EAE /* ZJCustomAnnotation.m */,
); );
path = Controller; path = Controller;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -1582,6 +1587,7 @@ ...@@ -1582,6 +1587,7 @@
6453732124978FF800FD4C07 /* SJLabelSlider.m in Sources */, 6453732124978FF800FD4C07 /* SJLabelSlider.m in Sources */,
A95F5C73248DDE81001DB97E /* ZJJinJiViewController.m in Sources */, A95F5C73248DDE81001DB97E /* ZJJinJiViewController.m in Sources */,
A95F5C59248DDE81001DB97E /* NSArray+Category.m in Sources */, A95F5C59248DDE81001DB97E /* NSArray+Category.m in Sources */,
A9C2B61F24CEC0DC00010EAE /* ZJCustomAnnotation.m in Sources */,
647F2DE2249CB37E00C696E0 /* JZLocationConverter.m in Sources */, 647F2DE2249CB37E00C696E0 /* JZLocationConverter.m in Sources */,
A95F5CC62490A37F001DB97E /* UILabel+FontAppearance.m in Sources */, A95F5CC62490A37F001DB97E /* UILabel+FontAppearance.m in Sources */,
A948C4C82497122B00C22D69 /* ZJUserTrackTimeView.m in Sources */, A948C4C82497122B00C22D69 /* ZJUserTrackTimeView.m in Sources */,
...@@ -1762,10 +1768,10 @@ ...@@ -1762,10 +1768,10 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = ZhiJi/ZhiJi.entitlements; CODE_SIGN_ENTITLEMENTS = ZhiJi/ZhiJi.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Manual; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 100; CURRENT_PROJECT_VERSION = 100;
DEVELOPMENT_TEAM = KQ4CS767WC; DEVELOPMENT_TEAM = 3VFFTBZ496;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"$(PROJECT_DIR)/ZhiJi/Classes/Tools", "$(PROJECT_DIR)/ZhiJi/Classes/Tools",
...@@ -1842,9 +1848,9 @@ ...@@ -1842,9 +1848,9 @@
"-ObjC", "-ObjC",
"-all_load", "-all_load",
); );
PRODUCT_BUNDLE_IDENTIFIER = com.app.familymapp; PRODUCT_BUNDLE_IDENTIFIER = com.ishinapp.familymapp;
PRODUCT_NAME = "Family Mapp"; PRODUCT_NAME = "Family Mapp";
PROVISIONING_PROFILE_SPECIFIER = family_map_develop; PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "$(SRCROOT)/ZhiJi/Classes/Main/Base/ZhiJi-Bridging-Header.h"; SWIFT_OBJC_BRIDGING_HEADER = "$(SRCROOT)/ZhiJi/Classes/Main/Base/ZhiJi-Bridging-Header.h";
SWIFT_OBJC_INTERFACE_HEADER_NAME = "ZhiJi-Swift.h"; SWIFT_OBJC_INTERFACE_HEADER_NAME = "ZhiJi-Swift.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_OPTIMIZATION_LEVEL = "-Onone";
...@@ -1860,12 +1866,12 @@ ...@@ -1860,12 +1866,12 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = ZhiJi/ZhiJi.entitlements; CODE_SIGN_ENTITLEMENTS = ZhiJi/ZhiJi.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Manual; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 100; CURRENT_PROJECT_VERSION = 100;
DEBUG_INFORMATION_FORMAT = dwarf; DEBUG_INFORMATION_FORMAT = dwarf;
DEFINES_MODULE = YES; DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = KQ4CS767WC; DEVELOPMENT_TEAM = 3VFFTBZ496;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"$(PROJECT_DIR)/ZhiJi/Classes/Tools", "$(PROJECT_DIR)/ZhiJi/Classes/Tools",
...@@ -1942,9 +1948,9 @@ ...@@ -1942,9 +1948,9 @@
"-ObjC", "-ObjC",
"-all_load", "-all_load",
); );
PRODUCT_BUNDLE_IDENTIFIER = com.app.familymapp; PRODUCT_BUNDLE_IDENTIFIER = com.ishinapp.familymapp;
PRODUCT_NAME = "Family Mapp"; PRODUCT_NAME = "Family Mapp";
PROVISIONING_PROFILE_SPECIFIER = family_map_develop; PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "$(SRCROOT)/ZhiJi/Classes/Main/Base/ZhiJi-Bridging-Header.h"; SWIFT_OBJC_BRIDGING_HEADER = "$(SRCROOT)/ZhiJi/Classes/Main/Base/ZhiJi-Bridging-Header.h";
SWIFT_OBJC_INTERFACE_HEADER_NAME = "ZhiJi-Swift.h"; SWIFT_OBJC_INTERFACE_HEADER_NAME = "ZhiJi-Swift.h";
SWIFT_VERSION = 5.0; SWIFT_VERSION = 5.0;
......
ZhiJi/Classes/Map/Controller/ZJCustomAnnotation.h 0 → 100644
View file @ e3d8716d
//
// ZJCustomAnnotation.h
// ZhiJi
//
// Created by 明津李 on 2020/7/27.
// Copyright © 2020 Company. All rights reserved.
//
#import <Foundation/Foundation.h>
#import <MapKit/MapKit.h>
NS_ASSUME_NONNULL_BEGIN
@interface ZJCustomAnnotation : NSObject<MKAnnotation>
@property (nonatomic) CLLocationCoordinate2D coordinate;
@property (nonatomic,copy) NSString * title;
@property (nonatomic,copy) NSString * subtitle;
@end
NS_ASSUME_NONNULL_END
ZhiJi/Classes/Map/Controller/ZJCustomAnnotation.m 0 → 100644
View file @ e3d8716d
//
// ZJCustomAnnotation.m
// ZhiJi
//
// Created by 明津李 on 2020/7/27.
// Copyright © 2020 Company. All rights reserved.
//
#import "ZJCustomAnnotation.h"
@implementation ZJCustomAnnotation
@end
ZhiJi/Classes/Tools/PCH/ResourceHeader.pch
View file @ e3d8716d
...@@ -22,14 +22,14 @@ ...@@ -22,14 +22,14 @@
//#if DEBUG //#if DEBUG
// //
#define ServerReport @"http://report.zhangxinhulian.com" //#define ServerReport @"http://report.zhangxinhulian.com"
#define ServerHost @"https://feedapitest.zhangxinhulian.com" //#define ServerHost @"https://feedapitest.zhangxinhulian.com"
#define ServerHostFeed @"https://feedapitest.zhangxinhulian.com" //#define ServerHostFeed @"https://feedapitest.zhangxinhulian.com"
// //
//#else //#else
//#define ServerReport @"http://report.zhangxinhulian.com" #define ServerReport @"http://report.zhangxinhulian.com"
//#define ServerHost @"https://feedapi.zhangxinhulian.com" #define ServerHost @"https://feedapi.zhangxinhulian.com"
//#define ServerHostFeed @"https://feedapi.zhangxinhulian.com" #define ServerHostFeed @"https://feedapi.zhangxinhulian.com"
//#endif //#endif
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