KidsHome

artimenring-iOS/Artimenring/Base.lproj/InfoPlist.strings

@@ -1,5 +1,5 @@
-"CFBundleDisplayName" = "SikeyComm";
-"CFBundleName" = "SikeyComm";
+"CFBundleDisplayName" = "思奇家";
+"CFBundleName" = "思奇家";
 
 "NSAppleMusicUsageDescription" = "Please allow multimedia access so that you can listen to voice messages from your baby.";
 "NSBluetoothPeripheralUsageDescription" = "Please allow Bluetooth privileges so that mobile phones and watches can be connected via Bluetooth.";

artimenring-iOS/Artimenring/Base.lproj/LaunchScreen.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -13,7 +13,7 @@
             <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="launch_sk_1.png" adjustsImageSizeForAccessibilityContentSizeCategory="YES" translatesAutoresizingMaskIntoConstraints="NO" id="0fj-No-nOB">
+                <imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="launch_sk_1.png" adjustsImageSizeForAccessibilityContentSizeCategory="YES" translatesAutoresizingMaskIntoConstraints="NO" id="0fj-No-nOB">
                     <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                 </imageView>
             </subviews>

artimenring-iOS/Artimenring/Base.lproj/Main.storyboard

@@ -7977,7 +7977,7 @@
                                     <action selector="onAreaAction:" destination="BJf-cy-QW1" eventType="touchUpInside" id="3SM-XC-9w8"/>
                                 </connections>
                             </button>
-                            <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="88W-vo-xcy">
+                            <stackView hidden="YES" opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="88W-vo-xcy">
                                 <rect key="frame" x="0.0" y="150" width="375" height="115"/>
                                 <subviews>
                                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_app" translatesAutoresizingMaskIntoConstraints="NO" id="qhr-Ih-ZSG">

artimenring-iOS/Artimenring/Classes/ViewController/Login/SKRegisterViewController.m

@@ -90,33 +90,33 @@
 }
 
 - (IBAction)checkLiscense:(id)sender {
-#if 0
-    NSString* language = [EUtil getSupportLanguage];
-    NSString* url = [NSString stringWithFormat:@"%@%@%@", @"https://life-content.idoocloud.com/page/privacy_policy/", language, @"/VeryFit%20Kids.html"];
-    NSString *title = NSLocalizedString(@"License.PrivacyPolicy", nil);
-    SKWebViewViewController *webVc = [[self storyboard] instantiateViewControllerWithIdentifier:@"WebViewVC"];
-    webVc.title = title;
-    webVc.urlToOpen = url;
-    [self pushViewController:webVc animated:YES];
-#else
-    NSString *filePath = [[NSBundle mainBundle] pathForResource:@"Privacy Policy" ofType:@"docx"];
-    NSURL *fileURL = [NSURL fileURLWithPath:filePath];
-    self.documentController = [UIDocumentInteractionController interactionControllerWithURL:fileURL];
-    self.documentController.delegate = self;
-    [self.documentController presentPreviewAnimated:YES];
-#endif
+//#if 0
+//    NSString* language = [EUtil getSupportLanguage];
+//    NSString* url = [NSString stringWithFormat:@"%@%@%@", @"https://life-content.idoocloud.com/page/privacy_policy/", language, @"/VeryFit%20Kids.html"];
+//    NSString *title = NSLocalizedString(@"License.PrivacyPolicy", nil);
+//    SKWebViewViewController *webVc = [[self storyboard] instantiateViewControllerWithIdentifier:@"WebViewVC"];
+//    webVc.title = title;
+//    webVc.urlToOpen = url;
+//    [self pushViewController:webVc animated:YES];
+//#else
+//    NSString *filePath = [[NSBundle mainBundle] pathForResource:@"Privacy Policy" ofType:@"docx"];
+//    NSURL *fileURL = [NSURL fileURLWithPath:filePath];
+//    self.documentController = [UIDocumentInteractionController interactionControllerWithURL:fileURL];
+//    self.documentController.delegate = self;
+//    [self.documentController presentPreviewAnimated:YES];
+//#endif
 }
 
 - (IBAction)onOnlinePrivacyPolicy:(id)sender {
-    [MobClick event:@"ClickLiscense"];
-    UIViewController *controller = [[self storyboard] instantiateViewControllerWithIdentifier:@"PrivacyPolicyVC"];
-    [self pushViewController:controller animated:YES];
+//    [MobClick event:@"ClickLiscense"];
+//    UIViewController *controller = [[self storyboard] instantiateViewControllerWithIdentifier:@"PrivacyPolicyVC"];
+//    [self pushViewController:controller animated:YES];
 }
 
 - (IBAction)onEndUserLicenseAgreement:(id)sender {
-    [MobClick event:@"ClickLiscense"];
-    UIViewController *controller = [[self storyboard] instantiateViewControllerWithIdentifier:@"LiscenseVC"];
-    [self pushViewController:controller animated:YES];
+//    [MobClick event:@"ClickLiscense"];
+//    UIViewController *controller = [[self storyboard] instantiateViewControllerWithIdentifier:@"LiscenseVC"];
+//    [self pushViewController:controller animated:YES];
 }
 
 - (void)showBindPhoneNumber:(id)sender {

artimenring-iOS/Artimenring/Classes/ViewController/SKAboutViewController.m

@@ -121,7 +121,10 @@ static NSString *s_goto_weibo = @"";
 }
 
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{
-    return 64;
+    if (indexPath.section == 7)
+        return 64;
+    else
+        return 0;
 }
 
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {

artimenring-iOS/Artimenring/Images.xcassets/AppIcon.appiconset/Contents.json

@@ -1,62 +1,53 @@
 {
   "images" : [
     {
-      "size" : "20x20",
       "idiom" : "iphone",
-      "filename" : "icon-20@2x.png",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "20x20"
     },
     {
-      "size" : "20x20",
       "idiom" : "iphone",
-      "filename" : "icon-20@3x.png",
-      "scale" : "3x"
+      "scale" : "3x",
+      "size" : "20x20"
     },
     {
-      "size" : "29x29",
       "idiom" : "iphone",
-      "filename" : "icon-29@2x.png",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "29x29"
     },
     {
-      "size" : "29x29",
       "idiom" : "iphone",
-      "filename" : "icon-29@3x.png",
-      "scale" : "3x"
+      "scale" : "3x",
+      "size" : "29x29"
     },
     {
-      "size" : "40x40",
       "idiom" : "iphone",
-      "filename" : "icon-40@2x.png",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "40x40"
     },
     {
-      "size" : "40x40",
       "idiom" : "iphone",
-      "filename" : "icon-40@3x.png",
-      "scale" : "3x"
+      "scale" : "3x",
+      "size" : "40x40"
     },
     {
-      "size" : "60x60",
       "idiom" : "iphone",
-      "filename" : "icon-60@2x.png",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "60x60"
     },
     {
-      "size" : "60x60",
       "idiom" : "iphone",
-      "filename" : "icon-60@3x.png",
-      "scale" : "3x"
+      "scale" : "3x",
+      "size" : "60x60"
     },
     {
-      "size" : "1024x1024",
       "idiom" : "ios-marketing",
-      "filename" : "icon-1024.png",
-      "scale" : "1x"
+      "scale" : "1x",
+      "size" : "1024x1024"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

artimenring-iOS/Artimenring/zh-HK.lproj/InfoPlist.strings

@@ -1,5 +1,5 @@
-"CFBundleDisplayName" = "思奇互聯";
-"CFBundleName" = "思奇互聯";
+"CFBundleDisplayName" = "思奇家";
+"CFBundleName" = "思奇家";
 
 "NSAppleMusicUsageDescription" = "請允許多媒體權限，這樣您可以收聽來自寶貝的語音信息。";
 "NSBluetoothPeripheralUsageDescription" = "請允許藍牙權限，以便使手機與手錶通過藍牙連接。";

artimenring-iOS/Artimenring/zh-Hans.lproj/InfoPlist.strings

@@ -5,8 +5,8 @@
   Created by YangJianguo on 6/16/15.
   Copyright (c) 2015 BaH Cy. All rights reserved.
 */
-"CFBundleDisplayName" = "思奇互联";
-"CFBundleName" = "思奇互联";
+"CFBundleDisplayName" = "思奇家";
+"CFBundleName" = "思奇家";
 
 
 "NSAppleMusicUsageDescription" = "请允许多媒体权限，这样您可以收听来自宝贝的语音信息。";

artimenring-iOS/SikeyComm.xcodeproj/project.pbxproj

@@ -3471,13 +3471,13 @@
 					"$(PROJECT_DIR)/Artimenring/Classes/Chat/amrnb",
 					"$(PROJECT_DIR)/Artimenring/Classes/Chat/mp3",
 				);
-				MARKETING_VERSION = 1.7;
+				MARKETING_VERSION = 1.0;
 				MiSDKRun = debug;
 				OTHER_LDFLAGS = (
 					"-ObjC",
 					"$(inherited)",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.sikey.kidswatch;
+				PRODUCT_BUNDLE_IDENTIFIER = com.sikey.kidsHome;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3536,7 +3536,7 @@
 					"$(PROJECT_DIR)/Artimenring/Classes/Chat/amrnb",
 					"$(PROJECT_DIR)/Artimenring/Classes/Chat/mp3",
 				);
-				MARKETING_VERSION = 1.7;
+				MARKETING_VERSION = 1.0;
 				MiSDKRun = online;
 				OTHER_LDFLAGS = (
 					"-ObjC",
@@ -3561,7 +3561,7 @@
 					"-lstdc++",
 					"$(inherited)",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.sikey.kidswatch;
+				PRODUCT_BUNDLE_IDENTIFIER = com.sikey.kidsHome;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3663,7 +3663,7 @@
 					"$(PROJECT_DIR)/Artimenring/Classes/Chat/amrnb",
 					"$(PROJECT_DIR)/Artimenring/Classes/Chat/mp3",
 				);
-				MARKETING_VERSION = 1.7;
+				MARKETING_VERSION = 1.0;
 				MiSDKRun = debug;
 				OTHER_LDFLAGS = (
 					"-ObjC",
@@ -3685,7 +3685,7 @@
 					"\"SystemConfiguration\"",
 					"$(inherited)",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.sikey.kidswatch;
+				PRODUCT_BUNDLE_IDENTIFIER = com.sikey.kidsHome;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
 				PROVISIONING_PROFILE_SPECIFIER = "";

artimenring-iOS/SikeyComm.xcworkspace/xcuserdata/liuzhenxing.xcuserdatad/IDEFindNavigatorScopes.plist

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<array/>
+</plist>