Skip to content

D
Dolphins
Commit cea7aa3f authored by lmj_521aiau@163.com's avatar lmj_521aiau@163.com
Browse files
Options

no message

parent d45682c9
Hide whitespace changes
Inline Side-by-side
Showing with 208 additions and 149 deletions
.DS_Store
View file @ cea7aa3f
No preview for this file type
Dolphins.xcodeproj/project.pbxproj
View file @ cea7aa3f
......@@ -7,6 +7,8 @@
objects = {
/* Begin PBXBuildFile section */
A94EE52B24D2A2180046038D /* ZJCoulometricRemindCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = A95A97B724D121140035A684 /* ZJCoulometricRemindCell.xib */; };
A94EE52E24D2A2B60046038D /* ZJSystemMessageModel.m in Sources */ = {isa = PBXBuildFile; fileRef = A94EE52D24D2A2B60046038D /* ZJSystemMessageModel.m */; };
A94EF18C24C696F8009E5BD1 /* libWeChatSDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A94EF18B24C696F7009E5BD1 /* libWeChatSDK.a */; };
A95A97B024D1132A0035A684 /* ZJGuardCell.m in Sources */ = {isa = PBXBuildFile; fileRef = A95A97AE24D1132A0035A684 /* ZJGuardCell.m */; };
A95A97B124D1132A0035A684 /* ZJGuardCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = A95A97AF24D1132A0035A684 /* ZJGuardCell.xib */; };
......@@ -20,8 +22,6 @@
A967939F24D1C46E00B6C5FA /* ZJSystemMessageCell.m in Sources */ = {isa = PBXBuildFile; fileRef = A967939D24D1C46E00B6C5FA /* ZJSystemMessageCell.m */; };
A96793A024D1C46E00B6C5FA /* ZJSystemMessageCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = A967939E24D1C46E00B6C5FA /* ZJSystemMessageCell.xib */; };
A9764A522490EAC600463B78 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9764A512490EAC600463B78 /* CoreGraphics.framework */; };
A9C2B99D24D039B400010EAE /* launch1@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = A9C2B84424D039B300010EAE /* launch1@3x.png */; };
A9C2B99E24D039B400010EAE /* launch1@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A9C2B84624D039B300010EAE /* launch1@2x.png */; };
A9C2B99F24D039B400010EAE /* ZJGuideConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = A9C2B84B24D039B300010EAE /* ZJGuideConfig.m */; };
A9C2B9A024D039B400010EAE /* GuideViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A9C2B84C24D039B300010EAE /* GuideViewController.m */; };
A9C2B9A124D039B400010EAE /* LaunchScreenPlaceHolderView.m in Sources */ = {isa = PBXBuildFile; fileRef = A9C2B84F24D039B300010EAE /* LaunchScreenPlaceHolderView.m */; };
......@@ -174,9 +174,7 @@
A9C2BA3924D039B500010EAE /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A9C2B99224D039B400010EAE /* Assets.xcassets */; };
A9C2BA3A24D039B500010EAE /* SceneDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = A9C2B99324D039B400010EAE /* SceneDelegate.m */; };
A9C2BA3B24D039B500010EAE /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A9C2B99424D039B400010EAE /* LaunchScreen.storyboard */; };
A9C2BA3C24D039B500010EAE /* launch2@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A9C2B99624D039B400010EAE /* launch2@2x.png */; };
A9C2BA3D24D039B500010EAE /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = A9C2B99724D039B400010EAE /* main.m */; };
A9C2BA3E24D039B500010EAE /* launch2@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = A9C2B99824D039B400010EAE /* launch2@3x.png */; };
A9C2BA3F24D039B500010EAE /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = A9C2B99924D039B400010EAE /* AppDelegate.m */; };
A9C2BA4624D040FB00010EAE /* KeychainItemWrapper.m in Sources */ = {isa = PBXBuildFile; fileRef = A9C2B8B524D039B400010EAE /* KeychainItemWrapper.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
A9C2BA4C24D0466800010EAE /* Guard.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A9C2BA4B24D0466800010EAE /* Guard.storyboard */; };
......@@ -219,6 +217,8 @@
3F5384018EF72D3D6EB89CCE /* Pods-Dolphins.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Dolphins.debug.xcconfig"; path = "Target Support Files/Pods-Dolphins/Pods-Dolphins.debug.xcconfig"; sourceTree = "<group>"; };
686A7C942487644600C7200C /* 海豚守护.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "海豚守护.app"; sourceTree = BUILT_PRODUCTS_DIR; };
7E14C5B082456C6EB743E9D7 /* Pods-Dolphins.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Dolphins.release.xcconfig"; path = "Target Support Files/Pods-Dolphins/Pods-Dolphins.release.xcconfig"; sourceTree = "<group>"; };
A94EE52C24D2A2B60046038D /* ZJSystemMessageModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZJSystemMessageModel.h; sourceTree = "<group>"; };
A94EE52D24D2A2B60046038D /* ZJSystemMessageModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZJSystemMessageModel.m; sourceTree = "<group>"; };
A94EF18B24C696F7009E5BD1 /* libWeChatSDK.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libWeChatSDK.a; path = Pods/WechatOpenSDK/OpenSDK1.8.7.1/libWeChatSDK.a; sourceTree = "<group>"; };
A95A97AD24D1132A0035A684 /* ZJGuardCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZJGuardCell.h; sourceTree = "<group>"; };
A95A97AE24D1132A0035A684 /* ZJGuardCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZJGuardCell.m; sourceTree = "<group>"; };
......@@ -237,9 +237,7 @@
A967939D24D1C46E00B6C5FA /* ZJSystemMessageCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZJSystemMessageCell.m; sourceTree = "<group>"; };
A967939E24D1C46E00B6C5FA /* ZJSystemMessageCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ZJSystemMessageCell.xib; sourceTree = "<group>"; };
A9764A512490EAC600463B78 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
A9C2B84424D039B300010EAE /* launch1@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "launch1@3x.png"; sourceTree = "<group>"; };
A9C2B84524D039B300010EAE /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
A9C2B84624D039B300010EAE /* launch1@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "launch1@2x.png"; sourceTree = "<group>"; };
A9C2B84A24D039B300010EAE /* GuideViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GuideViewController.h; sourceTree = "<group>"; };
A9C2B84B24D039B300010EAE /* ZJGuideConfig.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ZJGuideConfig.m; sourceTree = "<group>"; };
A9C2B84C24D039B300010EAE /* GuideViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GuideViewController.m; sourceTree = "<group>"; };
......@@ -517,9 +515,7 @@
A9C2B99224D039B400010EAE /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
A9C2B99324D039B400010EAE /* SceneDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SceneDelegate.m; sourceTree = "<group>"; };
A9C2B99524D039B400010EAE /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
A9C2B99624D039B400010EAE /* launch2@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "launch2@2x.png"; sourceTree = "<group>"; };
A9C2B99724D039B400010EAE /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
A9C2B99824D039B400010EAE /* launch2@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "launch2@3x.png"; sourceTree = "<group>"; };
A9C2B99924D039B400010EAE /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
A9C2B99C24D039B400010EAE /* SceneDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SceneDelegate.h; sourceTree = "<group>"; };
A9C2BA4224D03D0100010EAE /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
......@@ -656,10 +652,6 @@
children = (
A9C2B99124D039B400010EAE /* Dolphins.entitlements */,
A9C2B84724D039B300010EAE /* Classes */,
A9C2B84624D039B300010EAE /* launch1@2x.png */,
A9C2B84424D039B300010EAE /* launch1@3x.png */,
A9C2B99824D039B400010EAE /* launch2@3x.png */,
A9C2B99624D039B400010EAE /* launch2@2x.png */,
A9C2B99224D039B400010EAE /* Assets.xcassets */,
A9C2B99424D039B400010EAE /* LaunchScreen.storyboard */,
A9C2B99724D039B400010EAE /* main.m */,
......@@ -724,10 +716,10 @@
A9C2B84924D039B300010EAE /* Guide */ = {
isa = PBXGroup;
children = (
A9C2B84A24D039B300010EAE /* GuideViewController.h */,
A9C2B84D24D039B300010EAE /* ZJGuideConfig.h */,
A9C2B84B24D039B300010EAE /* ZJGuideConfig.m */,
A9C2B84A24D039B300010EAE /* GuideViewController.h */,
A9C2B84C24D039B300010EAE /* GuideViewController.m */,
A9C2B84D24D039B300010EAE /* ZJGuideConfig.h */,
);
path = Guide;
sourceTree = "<group>";
......@@ -735,9 +727,9 @@
A9C2B84E24D039B300010EAE /* LaunchScreen */ = {
isa = PBXGroup;
children = (
A9C2B84F24D039B300010EAE /* LaunchScreenPlaceHolderView.m */,
A9C2B85024D039B300010EAE /* LaunchScreenPlaceHolderView.xib */,
A9C2B85124D039B300010EAE /* LaunchScreenPlaceHolderView.h */,
A9C2B84F24D039B300010EAE /* LaunchScreenPlaceHolderView.m */,
);
path = LaunchScreen;
sourceTree = "<group>";
......@@ -998,10 +990,12 @@
A9C2B8DB24D039B400010EAE /* Model */ = {
isa = PBXGroup;
children = (
A9C2B8DC24D039B400010EAE /* ZJFriendMessageModel.m */,
A9C2B8DF24D039B400010EAE /* ZJFriendModel.h */,
A9C2B8DD24D039B400010EAE /* ZJFriendModel.m */,
A9C2B8DE24D039B400010EAE /* ZJFriendMessageModel.h */,
A9C2B8DF24D039B400010EAE /* ZJFriendModel.h */,
A9C2B8DC24D039B400010EAE /* ZJFriendMessageModel.m */,
A94EE52C24D2A2B60046038D /* ZJSystemMessageModel.h */,
A94EE52D24D2A2B60046038D /* ZJSystemMessageModel.m */,
);
path = Model;
sourceTree = "<group>";
......@@ -1548,11 +1542,9 @@
files = (
A9C2B9F524D039B500010EAE /* ZJMapViewPersonCardView.xib in Resources */,
BF3A68DB24D16D3700977895 /* ZJChooseIconCell.xib in Resources */,
A9C2B99D24D039B400010EAE /* launch1@3x.png in Resources */,
A9C2BA0D24D039B500010EAE /* ZJLocationFindViewCell.xib in Resources */,
A9C2B9F024D039B500010EAE /* ZJMapTrackDatePickerView.xib in Resources */,
BFCEA5AB24D116240010B2F0 /* ZJReminderMainCell.xib in Resources */,
A9C2BA3C24D039B500010EAE /* launch2@2x.png in Resources */,
A9C2BA3924D039B500010EAE /* Assets.xcassets in Resources */,
BF1C129924D1514F0000DB41 /* ZJReminderFooterView.xib in Resources */,
A9C2B9F324D039B500010EAE /* ZJUserTrackTimeView.xib in Resources */,
......@@ -1569,14 +1561,13 @@
A9C2B9F724D039B500010EAE /* ZJFriendListTableViewCell.xib in Resources */,
A9C2BA0C24D039B500010EAE /* Location.storyboard in Resources */,
A9C2BA1724D039B500010EAE /* Goods.storyboard in Resources */,
A94EE52B24D2A2180046038D /* ZJCoulometricRemindCell.xib in Resources */,
A95A97B124D1132A0035A684 /* ZJGuardCell.xib in Resources */,
A9C2B9A224D039B400010EAE /* LaunchScreenPlaceHolderView.xib in Resources */,
A9C2BA0A24D039B500010EAE /* ZJLocationAttentionCell.xib in Resources */,
A9C2BA3E24D039B500010EAE /* launch2@3x.png in Resources */,
A9C2BA5424D0470200010EAE /* ZJGuardCollectionHeaderView.xib in Resources */,
A9C2B9E824D039B500010EAE /* ZJAlertView.xib in Resources */,
A9C2B9E724D039B500010EAE /* ZJLocationVC.xib in Resources */,
A9C2B99E24D039B400010EAE /* launch1@2x.png in Resources */,
A9C2BA2124D039B500010EAE /* ZJGoodsStyle2CollectionHeaderView.xib in Resources */,
A9C2BA0824D039B500010EAE /* ZJLocationAttentionView.xib in Resources */,
A96793A024D1C46E00B6C5FA /* ZJSystemMessageCell.xib in Resources */,
......@@ -1759,6 +1750,7 @@
A9C2B9AA24D039B400010EAE /* UIColor+HExtension.m in Sources */,
A9C2BA1B24D039B500010EAE /* ZJGoodsModel.m in Sources */,
A9C2B9EA24D039B500010EAE /* ZJMapStyle2ViewController.m in Sources */,
A94EE52E24D2A2B60046038D /* ZJSystemMessageModel.m in Sources */,
A9C2B9ED24D039B500010EAE /* ZJMapViewController.m in Sources */,
A9C2BA1A24D039B500010EAE /* ZJGoodsViewController.m in Sources */,
A9C2B9C524D039B500010EAE /* ZJDefaultTools.m in Sources */,
......
Dolphins/Assets.xcassets/launch/launch2.imageset/Contents.json deleted 100644 → 0
View file @ d45682c9
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "launch2@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "launch2@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Dolphins/Assets.xcassets/launch/launch1.imageset/Contents.json → Dolphins/Assets.xcassets/launch/launch_icon.imageset/Contents.json
View file @ cea7aa3f
......@@ -5,12 +5,11 @@
"scale" : "1x"
},
{
"filename" : "launch1@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "launch1@3x.png",
"filename" : "编组@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
Dolphins/Base.lproj/LaunchScreen.storyboard
View file @ cea7aa3f
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
......@@ -16,25 +16,14 @@
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="launch2" translatesAutoresizingMaskIntoConstraints="NO" id="2f0-Ky-54O">
<rect key="frame" x="0.0" y="347.5" width="414" height="548.5"/>
</imageView>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="launch1" translatesAutoresizingMaskIntoConstraints="NO" id="QBu-ql-K1q">
<rect key="frame" x="0.0" y="44" width="414" height="303.5"/>
<constraints>
<constraint firstAttribute="width" secondItem="QBu-ql-K1q" secondAttribute="height" multiplier="15:11" id="Nv9-UH-cli"/>
</constraints>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="launch_icon" translatesAutoresizingMaskIntoConstraints="NO" id="dC3-SO-tgb">
<rect key="frame" x="146" y="173.5" width="122" height="146"/>
</imageView>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<constraints>
<constraint firstItem="QBu-ql-K1q" firstAttribute="leading" secondItem="6Tk-OE-BBY" secondAttribute="leading" id="1Sf-lB-DMr"/>
<constraint firstItem="2f0-Ky-54O" firstAttribute="top" secondItem="QBu-ql-K1q" secondAttribute="bottom" id="CvV-Lb-Of9"/>
<constraint firstItem="QBu-ql-K1q" firstAttribute="top" secondItem="6Tk-OE-BBY" secondAttribute="top" id="EgB-et-jcz"/>
<constraint firstAttribute="bottom" secondItem="2f0-Ky-54O" secondAttribute="bottom" id="JDQ-R5-K31"/>
<constraint firstItem="2f0-Ky-54O" firstAttribute="leading" secondItem="6Tk-OE-BBY" secondAttribute="leading" id="THF-M2-dGE"/>
<constraint firstItem="6Tk-OE-BBY" firstAttribute="trailing" secondItem="2f0-Ky-54O" secondAttribute="trailing" id="Yin-AY-LER"/>
<constraint firstItem="6Tk-OE-BBY" firstAttribute="trailing" secondItem="QBu-ql-K1q" secondAttribute="trailing" id="vOk-AG-Smp"/>
<constraint firstItem="dC3-SO-tgb" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" multiplier="0.55" id="2Va-Mo-5Ql"/>
<constraint firstItem="dC3-SO-tgb" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="ssc-pU-r2l"/>
</constraints>
<viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
</view>
......@@ -45,7 +34,6 @@
</scene>
</scenes>
<resources>
<image name="launch1" width="360" height="263.5"/>
<image name="launch2" width="360" height="376.5"/>
<image name="launch_icon" width="122" height="146"/>
</resources>
</document>
Dolphins/Classes/Care/Controller/ZJBaseCareViewController.m
View file @ cea7aa3f
......@@ -15,6 +15,8 @@
__block int count;
}
@property (nonatomic, assign) BOOL newSystemMsg;
@end
#define refreshCount 30
......@@ -88,7 +90,7 @@
break;
}
} else {
[AlertControllerTool alertControllerWithTitle:@"定位服务未开启，请进入系统［设置］> [隐私] > [定位服务]中打开开关，并允许使用定位服务" message:@"知迹绘制您的轨迹需要您开启定位服务" cancelTitle:@"去设置" cancelBlock:^{
[AlertControllerTool alertControllerWithTitle:@"定位服务未开启，请进入系统［设置］> [隐私] > [定位服务]中打开开关，并允许使用定位服务" message:@"海豚守护绘制您的轨迹需要您开启定位服务" cancelTitle:@"去设置" cancelBlock:^{
NSURL * url = [NSURL URLWithString:UIApplicationOpenSettingsURLString];
......@@ -316,6 +318,7 @@
}
[MobClick event:@"home_message_click"];
ZJXiaoXiViewController *vc = [[ZJXiaoXiViewController alloc] init];
vc.newSystemMsg = self.newSystemMsg;
[self.navigationController pushViewController:vc animated:YES];
}
......@@ -371,6 +374,24 @@
NSLog(@"失败");
}];
[[TQNetworkTools shared] getWithAction:userHasNewSystemMsg parameters:@{} success:^(id _Nonnull response) {
if([[response objectForKey:@"status"] integerValue] == 200){
NSString * has = [NSString stringWithFormat:@"%@", [[[response objectForKey:@"result"] objectForKey:@"data"] objectForKey:@"has"]];
if (has && ![has isEqualToString:@"0"]) {
self.xiaoXiRedPoint.hidden = NO;
self.newSystemMsg = YES;
}else{
self.xiaoXiRedPoint.hidden = YES;
}
}else{
[MBProgressHUD showError:[response objectForKey:@"msg"] toView:self.view];
}
} failure:^(NSError * _Nonnull error) {
self.xiaoXiRedPoint.hidden = YES;
NSLog(@"失败");
}];
}
#pragma mark 好友列表
......@@ -470,10 +491,6 @@
// model.locationType 未知
model.time = [self currentDate];
NSDictionary * modelDic = [model dictionaryWithValuesForKeys:@[@"address", @"city", @"latitude", @"longitude", @"time"]];
NSData *jsonData = [NSJSONSerialization dataWithJSONObject:modelDic options:NSJSONWritingPrettyPrinted error:nil];
NSString * string = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
//电量
[UIDevice currentDevice].batteryMonitoringEnabled = YES;
double deviceLevel = [UIDevice currentDevice].batteryLevel;
......@@ -482,7 +499,13 @@
power = @"100"; //未识别
}
[[TQNetworkTools shared] postWithAction:syncLocationDataLast parameters:@{@"LocationSyncData":string, @"power":power} success:^(id _Nonnull response) {
NSMutableDictionary * modelDic = [model dictionaryWithValuesForKeys:@[@"address", @"city", @"latitude", @"longitude", @"time"]].mutableCopy;
[modelDic setDictionary:@{@"power":power}];
NSData *jsonData = [NSJSONSerialization dataWithJSONObject:modelDic options:NSJSONWritingPrettyPrinted error:nil];
NSString * string = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
[[TQNetworkTools shared] postWithAction:syncLocationDataLast parameters:@{@"LocationSyncData":string} success:^(id _Nonnull response) {
NSString *result = [[NSString alloc] initWithData:response
encoding:NSUTF8StringEncoding];
......
Dolphins/Classes/Care/Controller/ZJTianJiaViewController.m
View file @ cea7aa3f
......@@ -608,7 +608,7 @@
- (void)showAlertViewAboutNotAuthorAccessContact{
[AlertControllerTool alertControllerWithTitle:@"请授权通讯录权限" message:@"请在iPhone的\"设置-隐私-通讯录\"选项中,允许知迹访问你的通讯录" cancelTitle:@"好的" cancelBlock:nil finishBlock:nil];
[AlertControllerTool alertControllerWithTitle:@"请授权通讯录权限" message:@"请在iPhone的\"设置-隐私-通讯录\"选项中,允许海豚守护访问你的通讯录" cancelTitle:@"好的" cancelBlock:nil finishBlock:nil];
}
- (void)openContact{
......
Dolphins/Classes/Care/Controller/ZJXiaoXiViewController.h
View file @ cea7aa3f
......@@ -12,6 +12,8 @@ NS_ASSUME_NONNULL_BEGIN
@interface ZJXiaoXiViewController : ZJBaseViewController
@property (nonatomic, assign) BOOL newSystemMsg;
@end
NS_ASSUME_NONNULL_END
Dolphins/Classes/Care/Controller/ZJXiaoXiViewController.m
View file @ cea7aa3f
......@@ -13,16 +13,25 @@
#import "ZJUserInfoManager.h"
#import "ZJFriendMessageModel.h"
#import "ZJUserInfoManager.h"
#import "ZJSystemMessageCell.h"
#import "ZJSystemMessageModel.h"
typedef enum : NSUInteger {
DGSystemMsgType,
DGFriendMsgType,
} DGMsgType;
@interface ZJXiaoXiViewController ()<UITableViewDataSource, UITableViewDelegate>
@property (nonatomic, strong) ZJXiaoxiView *xiaoXiView;
@property (nonatomic, strong) NSMutableArray<ZJFriendMessageModel *> *dataArray;
@property (nonatomic, strong) NSMutableArray<ZJFriendMessageModel *> *systemDataArray;
@property (nonatomic, strong) NSMutableArray<ZJSystemMessageModel *> *systemDataArray;
@property (nonatomic, strong) NSMutableArray * currentDataArray;
@property (nonatomic, strong) ZJBasetableView *xiaoXiTableView;
@property (nonatomic, strong) UIView * lineView;
@property (nonatomic, assign) DGMsgType msgType;
@end
static NSString *ID = @"xiaoXi";
......@@ -39,6 +48,7 @@ static NSString *ID = @"xiaoXi";
self.navigationItem.title = @"消息";
self.view.backgroundColor = [UIColor whiteColor];
_msgType = DGFriendMsgType;
[self setUI];
[self loadData];
[self userMsgRead];
......@@ -77,7 +87,7 @@ static NSString *ID = @"xiaoXi";
for (NSDictionary * dic in response[@"result"][@"data"]) {
ZJFriendMessageModel * model = [[ZJFriendMessageModel alloc] init];
ZJSystemMessageModel * model = [[ZJSystemMessageModel alloc] init];
[model setValuesForKeysWithDictionary:dic];
[self.systemDataArray addObject:model];
}
......@@ -111,7 +121,7 @@ static NSString *ID = @"xiaoXi";
NSArray *segmentedArray = [NSArray arrayWithObjects:@"好友申请", @"系统通知",nil];
UIButton * button;
for (int count = 0; count < 2; count++) {
for (int count = 0; count < segmentedArray.count; count++) {
UIButton * btn = [[UIButton alloc] initWithFrame:CGRectMake(0+count*116, 6, 116, 30)];
// [btn setTitle:segmentedArray[count] forState:(UIControlStateNormal)];
// [btn setTitleColor:kColorWithRGB(34, 34, 34) forState:UIControlStateNormal];
......@@ -134,6 +144,9 @@ static NSString *ID = @"xiaoXi";
[btn addSubview:point];
point.tag = 0xc8+count;
point.hidden = YES;
if (self.newSystemMsg && count==segmentedArray.count-1) {
point.hidden = NO;
}
}
_lineView = [[UIView alloc] initWithFrame:CGRectMake(segmentBgView.frame.size.width/8, CGRectGetMaxY(button.frame), segmentBgView.frame.size.width/4, 2)];
......@@ -152,8 +165,10 @@ static NSString *ID = @"xiaoXi";
point.hidden = YES;
if (sender.tag - 0x64 == 0) {
_msgType = DGFriendMsgType;
_currentDataArray = self.dataArray;
}else{
_msgType = DGSystemMsgType;
_currentDataArray = self.systemDataArray;
}
[self.xiaoXiTableView reloadData];
......@@ -164,31 +179,48 @@ static NSString *ID = @"xiaoXi";
}
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
ZJXiaoXiTableViewCell *xiaoXiCell = [tableView dequeueReusableCellWithIdentifier:ID forIndexPath:indexPath];
UITableViewCell * cell;
if (_msgType == DGFriendMsgType) {
ZJXiaoXiTableViewCell *xiaoXiCell = [tableView dequeueReusableCellWithIdentifier:ID forIndexPath:indexPath];
xiaoXiCell.model = self.currentDataArray[indexPath.row];
xiaoXiCell.buttonClick = ^{
self.xiaoXiView = [[ZJXiaoxiView alloc] init];
[self.xiaoXiView showToWindow];
xiaoXiCell.model = self.currentDataArray[indexPath.row];
xiaoXiCell.buttonClick = ^{
self.xiaoXiView = [[ZJXiaoxiView alloc] init];
[self.xiaoXiView showToWindow];
__weak typeof(self) weakSelf = self;
self.xiaoXiView.buttonClick = ^(id _Nonnull x) {
// 移除弹窗
[weakSelf.xiaoXiView hide:^{
}];
};
self.xiaoXiView.acceptFriendInviteCallBack = ^{
__weak typeof(self) weakSelf = self;
[weakSelf acceptFriendInviteWithModel:weakSelf.dataArray[indexPath.row]];
self.xiaoXiView.buttonClick = ^(id _Nonnull x) {
// 移除弹窗
[weakSelf.xiaoXiView hide:^{
}];
};
self.xiaoXiView.acceptFriendInviteCallBack = ^{
[weakSelf acceptFriendInviteWithModel:weakSelf.dataArray[indexPath.row]];
};
};
};
cell = xiaoXiCell;
}else{
ZJSystemMessageModel * model = self.currentDataArray[indexPath.row];
ZJSystemMessageCell * systemCell = [tableView dequeueReusableCellWithIdentifier:@"ZJSystemMessageCell" forIndexPath:indexPath];
[systemCell.headerImV sd_setImageWithURL:[NSURL URLWithString:model.iconUrl]];
systemCell.titleLab.text = model.remindUser;
systemCell.timeLab.text = model.createdAt;
systemCell.desLab.text = model.remark;
cell = systemCell;
}
xiaoXiCell.selectionStyle = UITableViewCellSelectionStyleNone;
return xiaoXiCell;
cell.selectionStyle = UITableViewCellSelectionStyleNone;
return cell;
}
#pragma mark 同意好友邀请 acceptBtn
......
Dolphins/Classes/Care/Model/ZJSystemMessageModel.h 0 → 100644
View file @ cea7aa3f
//
// ZJSystemMessageModel.h
// Dolphins
//
// Created by 明津李 on 2020/7/30.
// Copyright © 2020 Company. All rights reserved.
//
#import "BaseModel.h"
NS_ASSUME_NONNULL_BEGIN
@interface ZJSystemMessageModel : BaseModel
@property (nonatomic, copy) NSString * createdAt;
@property (nonatomic, copy) NSString * iconUrl;
@property (nonatomic, copy) NSString * id;
@property (nonatomic, copy) NSString * remark;
@property (nonatomic, copy) NSString * remindName;
@property (nonatomic, copy) NSString * remindUser;
@property (nonatomic, copy) NSString * uid;
@end
NS_ASSUME_NONNULL_END
Dolphins/Classes/Care/Model/ZJSystemMessageModel.m 0 → 100644
View file @ cea7aa3f
//
// ZJSystemMessageModel.m
// Dolphins
//
// Created by 明津李 on 2020/7/30.
// Copyright © 2020 Company. All rights reserved.
//
#import "ZJSystemMessageModel.h"
@implementation ZJSystemMessageModel
@end
Dolphins/Classes/Goods/Controller/ZJGoodsViewController.m
View file @ cea7aa3f
......@@ -277,7 +277,7 @@
self.tongYButton = [UIButton buttonWithType:UIButtonTypeCustom];
// self.tongYButton.backgroundColor = [UIColor redColor];
self.tongYButton.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft;
[self.tongYButton setTitle:@"购买前请先阅读并同意《知迹付费会员服务协议》" forState:0];
[self.tongYButton setTitle:@"购买前请先阅读并同意《海豚守护付费会员服务协议》" forState:0];
[self.tongYButton setTitleColor:[UIColor colorWithHex:0x666666] forState:UIControlStateNormal];
[self.tongYButton.titleLabel setFont:[UIFont systemFontOfSize:KFont(13)]];
[self.beiJingView addSubview:self.tongYButton];
......
Dolphins/Classes/Guard/Controller/ZJElectricalRemindVC.m
View file @ cea7aa3f
......@@ -46,6 +46,7 @@
_tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
_tableView.tableFooterView = [UIView new];
[_tableView registerNib:[UINib nibWithNibName:@"ZJCoulometricRemindCell" bundle:nil] forCellReuseIdentifier:@"ZJCoulometricRemindCell"];
}
- (void)getDataSource{
......@@ -86,23 +87,37 @@
sender.selected = !sender.selected;
ZJElectricalModel * model = self.friendDataSource[sender.tag-0x64];
[[TQNetworkTools shared] postWithAction:userRemindInfoSet parameters:@{@"typeId":@"1", @"status":sender.selected?@"1":@"0", @"friendId":[NSString stringWithFormat:@"%ld", (long)model.friendId], @"id":[NSString stringWithFormat:@"%ld", (long)model.id]} success:^(id _Nonnull response) {
NSMutableDictionary * modelDic = @{@"typeId":@1, @"status":sender.selected?@1:@0, @"friendId":@(model.friendId), @"id":@(model.id)}.mutableCopy;
NSData *jsonData = [NSJSONSerialization dataWithJSONObject:modelDic options:NSJSONWritingPrettyPrinted error:nil];
NSString * string = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
[[TQNetworkTools shared] postWithAction:userRemindInfoSet parameters:@{@"":string} success:^(id _Nonnull response) {
NSString *result = [[NSString alloc] initWithData:response
encoding:NSUTF8StringEncoding];
NSData * data = [result dataUsingEncoding:NSUTF8StringEncoding];
NSDictionary * responseDict = [NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingMutableContainers error:nil];
ZJCoulometricRemindCell * cell = [self.tableView cellForRowAtIndexPath:[NSIndexPath indexPathForRow:sender.tag-0x64 inSection:0]];
if([[responseDict objectForKey:@"status"] integerValue] == 200){
NSLog(@"success");
if (sender.selected) {
[MBProgressHUD showSuccess:@"低电量提醒已开启"];
cell.remindLab.text = @"已设置提醒";
model.status = 1;
}else{
[MBProgressHUD showSuccess:@"低电量提醒已关闭"];
cell.remindLab.text = @"未设置提醒";
model.status = 0;
}
}else{
[MBProgressHUD showError:[responseDict objectForKey:@"msg"]];
}
} failure:^(NSError * _Nonnull error) {
[MBProgressHUD showError:@"请稍后再试"];
}];
}
#pragma mark tableView delegate
......
Dolphins/Classes/LocationAttention/ZJLocationAttentionVC.swift
View file @ cea7aa3f
......@@ -69,7 +69,7 @@ class ZJLocationAttentionVC: BaseViewController {
self.locationTableView.dataSource = self
// maskBgView.isHidden = currentFriendModel != nil
maskBgView.isHidden = self.locationRemindDataSource.count != 0
maskBgView.isHidden = true
addLongPres()
}
......@@ -357,9 +357,10 @@ extension ZJLocationAttentionVC {
}
self.currentFriendModel = self.headerFriendsDataSource?.first
self.updataUI()
if self.currentFriendModel != nil {
self.getSingleFriendLocationRemindList(self.currentFriendModel)
}else{
self.updataUI()
}
}else{
......
Dolphins/Classes/LocationVC/View/ZJAlertView.xib
View file @ cea7aa3f
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
......@@ -26,7 +24,7 @@
<color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="请确定对方是否授权知迹位置权限" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RiW-bm-Ym2">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="请确定对方是否授权海豚守护位置权限" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RiW-bm-Ym2">
<rect key="frame" x="0.0" y="63" width="342" height="17"/>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/>
<color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
......
Dolphins/Classes/LocationVC/ZJLocationVC.xib
View file @ cea7aa3f
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<dependencies>
<deployment version="4368" identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
......@@ -20,12 +19,12 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="74Z-43-LHV">
<rect key="frame" x="0.0" y="44" width="414" height="818"/>
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fSh-sX-R0o">
<rect key="frame" x="0.0" y="0.0" width="414" height="36"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="为了您能更好地体验知迹App,请进行以下设置：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="57c-sW-NKG">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="为了您能更好地体验海豚守护App,请进行以下设置：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="57c-sW-NKG">
<rect key="frame" x="14.5" y="0.0" width="399.5" height="36"/>
<color key="backgroundColor" red="0.67183357480000006" green="0.73134952779999995" blue="0.8706133962" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
<constraints>
......@@ -46,8 +45,8 @@
<constraint firstAttribute="height" constant="36" id="mGl-Xg-BFq"/>
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="确认对方没有删除知迹" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FTA-M6-PwX">
<rect key="frame" x="14.5" y="65" width="183.5" height="21"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="确认对方没有删除海豚守护" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FTA-M6-PwX">
<rect key="frame" x="14.5" y="65" width="220.5" height="21"/>
<fontDescription key="fontDescription" type="system" weight="semibold" pointSize="18"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
......@@ -87,7 +86,7 @@ mbsK5b2VAw
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="46g-dc-NS9">
<rect key="frame" x="14.5" y="194" width="324.5" height="33.5"/>
<string key="text">如果Ta关闭了位置权限，请让Ta前往设置&gt;权限管理
&gt;知迹里开启位置权限。</string>
&gt;海豚守护里开启位置权限。</string>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
......
Dolphins/Classes/Main/View/Protocol.m
View file @ cea7aa3f
......@@ -57,7 +57,7 @@
//neiRongLabel
NSString *str = @" 知迹APP需要双方安装并加好友授权同意，APP付费方即可时刻关注对方的位置信息。\n 注册为知迹会员或接受付费会员的好友邀请意味着 您将向平台和该付费会员提供地理位置，行为轨迹，高度等隐私信息。您正在使用的产品/服务及其功能将会收集、储存和使用您的相关信息，包括但不限于您的GPS定位、设备信息、手机通讯录等，您将受到《用户协议》和《隐私政策》的约束。您点击类似“同意并继续”按钮后或进行主动勾选同 义本协议等操作后，即表示您充分理解隐私政策内 容以及上述描述，并已同意授权平台按照隐私政策 内容合法收集、储存和使用您的个人信息。为保护 您的合法权益，请认真阅读并充分理解《隐私政策》内容。";
NSString *str = @" 海豚守护APP需要双方安装并加好友授权同意，APP付费方即可时刻关注对方的位置信息。\n 注册为海豚守护会员或接受付费会员的好友邀请意味着 您将向平台和该付费会员提供地理位置，行为轨迹，高度等隐私信息。您正在使用的产品/服务及其功能将会收集、储存和使用您的相关信息，包括但不限于您的GPS定位、设备信息、手机通讯录等，您将受到《用户协议》和《隐私政策》的约束。您点击类似“同意并继续”按钮后或进行主动勾选同 义本协议等操作后，即表示您充分理解隐私政策内 容以及上述描述，并已同意授权平台按照隐私政策 内容合法收集、储存和使用您的个人信息。为保护 您的合法权益，请认真阅读并充分理解《隐私政策》内容。";
_neiRongLabel = [UILabel labelWithtext:str font:[UIFont systemFontOfSize:KFont(13)] textColor:[UIColor colorWithHex:0x333333] alignment:NSTextAlignmentLeft];
//设置行间距
......@@ -84,8 +84,8 @@
_textView = [[UITextView alloc] initWithFrame:CGRectMake(10, 100, 400, 100)];
[_bgView addSubview:_textView];
NSString *text1 = @"阅读完整版";
NSString *text2 = @"《知迹隐私协议》";
NSString *text3 = @"《知迹用户协议》";
NSString *text2 = @"《海豚守护隐私协议》";
NSString *text3 = @"《海豚守护用户协议》";
NSString *text4 = @"了解全部内容";
NSMutableAttributedString * attributeStr1 = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"%@%@和%@%@",text1,text2,text3,text4]];
......
Dolphins/Classes/Map/Controller/ZJFriendTrackMapViewController.m
View file @ cea7aa3f
......@@ -103,7 +103,7 @@
self.alertView.alertSubtitle.text = @"请查看其它时段或稍等几分钟";
} else {
self.alertView.alertTitle.text = @"对方该时间段未收录位置信息";
self.alertView.alertSubtitle.text = @"请确定对方是否授权知迹位置权限";
self.alertView.alertSubtitle.text = @"请确定对方是否授权海豚守护位置权限";
}
......
Dolphins/Classes/Mine/Controller/ZJSettingViewController.m
View file @ cea7aa3f
......@@ -105,14 +105,14 @@
if (![ZJUserInfoManager shared].isLogin) {
_dataSource = @[@"版本检测",
@"隐私政策",
@"知迹用户协议",
@"知迹用户付费协议",
@"海豚守护用户协议",
@"海豚守护用户付费协议",
];
}else{
_dataSource = @[@"版本检测",
@"隐私政策",
@"知迹用户协议",
@"知迹用户付费协议",
@"海豚守护用户协议",
@"海豚守护用户付费协议",
@"注销账户"
];
}
......
Dolphins/Classes/Mine/View/ZJAddEmergencyContactView.m
View file @ cea7aa3f
......@@ -306,7 +306,7 @@
- (void)showAlertViewAboutNotAuthorAccessContact{
[AlertControllerTool alertControllerWithTitle:@"请授权通讯录权限" message:@"请在iPhone的\"设置-隐私-通讯录\"选项中,允许知迹访问你的通讯录" cancelTitle:@"好的" cancelBlock:nil finishBlock:nil];
[AlertControllerTool alertControllerWithTitle:@"请授权通讯录权限" message:@"请在iPhone的\"设置-隐私-通讯录\"选项中,允许海豚守护访问你的通讯录" cancelTitle:@"好的" cancelBlock:nil finishBlock:nil];
}
- (void)openContact{
......
Dolphins/Classes/Tools/LaunchScreen/LaunchScreenPlaceHolderView.xib
View file @ cea7aa3f
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
......@@ -14,31 +14,20 @@
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="launch1" translatesAutoresizingMaskIntoConstraints="NO" id="0DC-DF-t9u">
<rect key="frame" x="0.0" y="44" width="414" height="303.5"/>
</imageView>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="launch2" translatesAutoresizingMaskIntoConstraints="NO" id="ODD-qe-EdO">
<rect key="frame" x="0.0" y="347.5" width="414" height="514.5"/>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="launch_icon" translatesAutoresizingMaskIntoConstraints="NO" id="Z3I-sh-qPI">
<rect key="frame" x="146" y="173.5" width="122" height="146"/>
</imageView>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<constraints>
<constraint firstItem="ODD-qe-EdO" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" id="6oN-nm-Ffe"/>
<constraint firstAttribute="trailing" secondItem="ODD-qe-EdO" secondAttribute="trailing" id="KeZ-Dh-SCb"/>
<constraint firstItem="vUN-kp-3ea" firstAttribute="bottom" secondItem="ODD-qe-EdO" secondAttribute="bottom" id="Rvt-Yk-hGZ"/>
<constraint firstItem="0DC-DF-t9u" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="UdZ-we-gM3"/>
<constraint firstItem="ODD-qe-EdO" firstAttribute="top" secondItem="0DC-DF-t9u" secondAttribute="bottom" id="Ys1-C5-RRp"/>
<constraint firstItem="vUN-kp-3ea" firstAttribute="trailing" secondItem="0DC-DF-t9u" secondAttribute="trailing" id="bbK-ie-b6j"/>
<constraint firstItem="0DC-DF-t9u" firstAttribute="width" secondItem="0DC-DF-t9u" secondAttribute="height" multiplier="15:11" id="gmu-89-LAK"/>
<constraint firstItem="0DC-DF-t9u" firstAttribute="top" secondItem="vUN-kp-3ea" secondAttribute="top" id="hL8-DH-5uB"/>
<constraint firstItem="ODD-qe-EdO" firstAttribute="top" secondItem="0DC-DF-t9u" secondAttribute="bottom" id="xvf-lx-ufF"/>
<constraint firstItem="Z3I-sh-qPI" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="RWp-yG-pPE"/>
<constraint firstItem="Z3I-sh-qPI" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="centerY" multiplier="0.55" id="hsl-Hi-mKr"/>
</constraints>
<viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
<point key="canvasLocation" x="139" y="90"/>
</view>
</objects>
<resources>
<image name="launch1" width="360" height="263.5"/>
<image name="launch2" width="360" height="376.5"/>
<image name="launch_icon" width="122" height="146"/>
</resources>
</document>
Dolphins/Classes/Tools/Network/TQNetworkTools.h
View file @ cea7aa3f
......@@ -37,6 +37,7 @@ typedef enum : NSUInteger {
payVoucherList, // 获取代金券列表
userFind, // 根据手机号查询用户状态 , 0-未注册 1-已注册 2-是自己 3-已经是好友
userHasNewMsg, // 查询用户是否有新消息
userHasNewSystemMsg, // 查询用户是否有新系统消息
userInfo, // 查询用户信息
userPayConfig, // 支付配置
userPayOrder, // 订单校验
......
Dolphins/Classes/Tools/Network/TQNetworkTools.m
View file @ cea7aa3f
......@@ -107,7 +107,7 @@ static TQNetworkTools* _tools = nil;
urlString = [urlString stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
NSDictionary * params;
if (action == syncLocationDataLast || action == addFriendFollowed || action == friendFollowedUpdate) {
if (action == syncLocationDataLast || action == addFriendFollowed || action == friendFollowedUpdate || action == userRemindInfoSet) {
// params = [self setRequestParams: @{} token:YES];
}else if (action == loginWithQuick){
params = [self setRequestParams: parameters token:NO];
......@@ -310,6 +310,8 @@ static TQNetworkTools* _tools = nil;
return @"/app/v1/location/user/find";
case userHasNewMsg:
return @"/app/v1/location/user/has-new-msg";
case userHasNewSystemMsg:
return @"/app/v1/location/user/has-new-record";
case userInfo:
return @"/app/v1/location/user/info";
case userPayConfig:
......
Dolphins/Classes/Tools/PCH/ResourceHeader.pch
View file @ cea7aa3f
......@@ -19,7 +19,7 @@
#define ShanYanAppID @"CiuaRN4D" //创蓝appid
#define WXAppId @"wx8b8bbccffda2f453"
#define WXAppId @"wxe24b15232c28e77c"
#define WXUniversalLink @"https://www.wayaya.info/"
#define aesIvParameter @"e2e7d664d72f710b" // 密钥默认偏移，可更改
......
Dolphins/Classes/Tools/UserInfoManager/ZJUserInfoManager.m
View file @ cea7aa3f
......@@ -281,7 +281,7 @@ static ZJUserInfoManager * manager;
} else if (kCLAuthorizationStatusDenied == status) {
NSString *alertTitle = [NSString stringWithFormat:@"位置权限未开启，请进入系统［设置］> [%@] > [位置]中允许访问位置信息，用来绘制您的轨迹", [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleName"]];
[AlertControllerTool alertControllerWithTitle:alertTitle message: @"知迹绘制您的轨迹需要您开启定位服务" cancelTitle:@"去开启" cancelBlock:^{
[AlertControllerTool alertControllerWithTitle:alertTitle message: @"海豚守护绘制您的轨迹需要您开启定位服务" cancelTitle:@"去开启" cancelBlock:^{
NSURL * url = [NSURL URLWithString:UIApplicationOpenSettingsURLString];
......@@ -303,7 +303,7 @@ static ZJUserInfoManager * manager;
}
}
}else{
[AlertControllerTool alertControllerWithTitle:@"定位服务未开启，请进入系统［设置］> [隐私] > [定位服务]中打开开关，并允许使用定位服务" message:@"知迹绘制您的轨迹需要您开启定位服务" cancelTitle:@"去设置" cancelBlock:^{
[AlertControllerTool alertControllerWithTitle:@"定位服务未开启，请进入系统［设置］> [隐私] > [定位服务]中打开开关，并允许使用定位服务" message:@"海豚守护绘制您的轨迹需要您开启定位服务" cancelTitle:@"去设置" cancelBlock:^{
NSURL * url = [NSURL URLWithString:UIApplicationOpenSettingsURLString];
......
Dolphins/Dolphins.entitlements
View file @ cea7aa3f
......@@ -2,9 +2,11 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>aps-environment</key>
<string>development</string>
<key>com.apple.developer.associated-domains</key>
<array>
<string>applinks:www.wayaya.info/</string>
<string>applinks:www.wayaya.info/dolphins/</string>
</array>
<key>keychain-access-groups</key>
<array/>
......
Dolphins/Info.plist
View file @ cea7aa3f
......@@ -25,7 +25,7 @@
<string>weixin</string>
<key>CFBundleURLSchemes</key>
<array>
<string>wx8b8bbccffda2f453</string>
<string>wxe24b15232c28e77c</string>
</array>
</dict>
<dict>
......@@ -76,19 +76,19 @@
<true/>
</dict>
<key>NSCameraUsageDescription</key>
<string>知迹修改您的头像需要您的相机权限</string>
<string>海豚守护修改您的头像需要您的相机权限</string>
<key>NSContactsUsageDescription</key>
<string>知迹获取您的好友需要您的通讯录权限</string>
<string>海豚守护获取您的好友需要您的通讯录权限</string>
<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
<string>知迹绘制您的轨迹需要您的定位权限</string>
<string>海豚守护绘制您的轨迹需要您的定位权限</string>
<key>NSLocationAlwaysUsageDescription</key>
<string>知迹绘制您的轨迹需要您的定位权限</string>
<string>海豚守护绘制您的轨迹需要您的定位权限</string>
<key>NSLocationUsageDescription</key>
<string>知迹绘制您的轨迹需要您的定位权限</string>
<string>海豚守护绘制您的轨迹需要您的定位权限</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>知迹绘制您的轨迹需要您的定位权限</string>
<string>海豚守护绘制您的轨迹需要您的定位权限</string>
<key>NSPhotoLibraryUsageDescription</key>
<string>知迹修改您的头像需要您的相册权限</string>
<string>海豚守护修改您的头像需要您的相册权限</string>
<key>UIApplicationSceneManifest</key>
<dict>
<key>UIApplicationSupportsMultipleScenes</key>
......
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