陈文艺 пре 6 месеци
родитељ
комит
5c922870ae

+ 9 - 0
MiMoLive/MiMoLive/AppDelegate.m

@@ -45,6 +45,7 @@
 
 #ifdef DEBUG
 #import "MOLogFormatter.h"
+#import "DoraemonKit.h"
 #endif
 
 
@@ -115,6 +116,10 @@
     [[FBSDKApplicationDelegate sharedInstance] application:application
                              didFinishLaunchingWithOptions:launchOptions];
     
+#ifdef DEBUG
+    [self setupDoraemonKit];
+#endif
+    
     return YES;
 }
 
@@ -1103,6 +1108,10 @@ fetchCompletionHandler:(void (^)(UIBackgroundFetchResult))completionHandler {
 
 #ifdef DEBUG
 
+- (void)setupDoraemonKit {
+    [[DoraemonManager shareInstance] install];
+}
+
 - (void)setupLogger {
     DDOSLogger *consoleLogger = [DDOSLogger sharedInstance];
     consoleLogger.logFormatter = [[MOLogFormatter alloc] init];  // 设置格式器

+ 18 - 0
MiMoLive/MiMoLive/Classes/Mine/Controller/MOMineSetUpVC.m

@@ -22,6 +22,10 @@
 #import "MOMinimizeManager.h"
 #import "MOPlaySettingVC.h"
 
+#ifdef DEBUG
+#import "DoraemonKit.h"
+#endif
+
 @interface MOMineSetUpVC ()
 
 @property (weak, nonatomic) IBOutlet UIImageView *bgImgView;
@@ -38,6 +42,8 @@
 
 @property (nonatomic, strong) MOSecurityData *baseData;
 
+@property (weak, nonatomic) IBOutlet UIView *dokitView;
+@property (weak, nonatomic) IBOutlet UISwitch *dokitSwitch;
 
 @end
 
@@ -117,6 +123,10 @@
     BOOL isTest = GetIsTest;
     self.theTestSwitch.on = isTest;
     
+    self.dokitView.hidden = NO;
+    self.dokitView.layer.cornerRadius = 16;
+    [self.dokitSwitch setOn:[[DoraemonManager shareInstance] isShowDoraemon]];
+    
 #endif
     
 //#if kAPP_Environment == 2
@@ -462,4 +472,12 @@
     }];
 }
 
+- (IBAction)handleDokitSwitch:(id)sender {
+    if (self.dokitSwitch.isOn) {
+        [[DoraemonManager shareInstance] showDoraemon];
+    } else {
+        [[DoraemonManager shareInstance] hiddenDoraemon];
+    }
+}
+
 @end

+ 34 - 4
MiMoLive/MiMoLive/Classes/Mine/Controller/MOMineSetUpVC.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22154" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_12" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22130"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -12,6 +12,8 @@
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MOMineSetUpVC">
             <connections>
                 <outlet property="bgImgView" destination="8ZC-Zv-RoF" id="CsP-RS-fcM"/>
+                <outlet property="dokitSwitch" destination="UVv-IE-U9H" id="jZT-yf-DZg"/>
+                <outlet property="dokitView" destination="KAm-6v-zLv" id="i4u-jb-Qg3"/>
                 <outlet property="quitBtn" destination="bqa-sn-hEc" id="Qcg-v3-Zy1"/>
                 <outlet property="tableView" destination="Wbg-V7-70S" id="jiJ-U3-fP3"/>
                 <outlet property="theTestSwitch" destination="OgD-Ql-jkB" id="YLI-q6-iS8"/>
@@ -50,11 +52,37 @@
                     </connections>
                 </button>
                 <switch hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="OgD-Ql-jkB">
-                    <rect key="frame" x="306" y="681" width="51" height="31"/>
+                    <rect key="frame" x="306" y="644" width="51" height="31"/>
                     <connections>
                         <action selector="switchChanged:" destination="-1" eventType="valueChanged" id="YgR-JO-Hql"/>
                     </connections>
                 </switch>
+                <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="KAm-6v-zLv">
+                    <rect key="frame" x="150.33333333333337" y="695" width="226.66666666666663" height="39"/>
+                    <subviews>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="是否展示 Dokit 浮窗" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nty-Z6-4dX">
+                            <rect key="frame" x="8" y="9" width="149.66666666666666" height="21"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                            <nil key="textColor"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" title="是否展示 Dokit 浮窗" translatesAutoresizingMaskIntoConstraints="NO" id="UVv-IE-U9H">
+                            <rect key="frame" x="169.66666666666666" y="4" width="51" height="31"/>
+                            <connections>
+                                <action selector="handleDokitSwitch:" destination="-1" eventType="valueChanged" id="FuY-Lb-5Ht"/>
+                            </connections>
+                        </switch>
+                    </subviews>
+                    <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                    <constraints>
+                        <constraint firstAttribute="trailing" secondItem="UVv-IE-U9H" secondAttribute="trailing" constant="8" id="2O4-FO-yHV"/>
+                        <constraint firstItem="nty-Z6-4dX" firstAttribute="centerY" secondItem="KAm-6v-zLv" secondAttribute="centerY" id="7Gn-cs-oDu"/>
+                        <constraint firstAttribute="bottom" secondItem="UVv-IE-U9H" secondAttribute="bottom" constant="4" id="B3o-xn-jT4"/>
+                        <constraint firstItem="UVv-IE-U9H" firstAttribute="leading" secondItem="nty-Z6-4dX" secondAttribute="trailing" constant="12" id="WgC-Vw-K3I"/>
+                        <constraint firstItem="nty-Z6-4dX" firstAttribute="leading" secondItem="KAm-6v-zLv" secondAttribute="leading" constant="8" id="evC-1q-Ih2"/>
+                        <constraint firstItem="UVv-IE-U9H" firstAttribute="top" secondItem="KAm-6v-zLv" secondAttribute="top" constant="4" id="rQP-iZ-djF"/>
+                    </constraints>
+                </view>
             </subviews>
             <viewLayoutGuide key="safeArea" id="Q5M-cg-NOt"/>
             <color key="backgroundColor" systemColor="systemBackgroundColor"/>
@@ -63,12 +91,14 @@
                 <constraint firstItem="8ZC-Zv-RoF" firstAttribute="leading" secondItem="Q5M-cg-NOt" secondAttribute="leading" id="8xF-fJ-pI5"/>
                 <constraint firstItem="bqa-sn-hEc" firstAttribute="leading" secondItem="Q5M-cg-NOt" secondAttribute="leading" constant="30" id="Bec-tH-wPt"/>
                 <constraint firstAttribute="bottom" secondItem="bqa-sn-hEc" secondAttribute="bottom" constant="50" id="CEd-0e-7a4"/>
+                <constraint firstItem="KAm-6v-zLv" firstAttribute="top" secondItem="OgD-Ql-jkB" secondAttribute="bottom" constant="20" id="Kt1-lb-htd"/>
                 <constraint firstItem="Wbg-V7-70S" firstAttribute="leading" secondItem="Q5M-cg-NOt" secondAttribute="leading" id="Q5a-z8-3pm"/>
-                <constraint firstItem="bqa-sn-hEc" firstAttribute="top" secondItem="OgD-Ql-jkB" secondAttribute="bottom" constant="42" id="TkF-R1-5ZO"/>
+                <constraint firstItem="Q5M-cg-NOt" firstAttribute="trailing" secondItem="KAm-6v-zLv" secondAttribute="trailing" constant="16" id="Uis-c0-9sc"/>
                 <constraint firstAttribute="bottom" secondItem="8ZC-Zv-RoF" secondAttribute="bottom" id="bcX-6w-4Ir"/>
                 <constraint firstItem="Q5M-cg-NOt" firstAttribute="trailing" secondItem="OgD-Ql-jkB" secondAttribute="trailing" constant="38" id="c6j-Cx-K8o"/>
                 <constraint firstItem="Wbg-V7-70S" firstAttribute="top" secondItem="Q5M-cg-NOt" secondAttribute="top" id="cvX-7Z-1UU"/>
                 <constraint firstItem="8ZC-Zv-RoF" firstAttribute="top" secondItem="Q5M-cg-NOt" secondAttribute="top" id="fZj-Bq-c74"/>
+                <constraint firstItem="bqa-sn-hEc" firstAttribute="top" secondItem="KAm-6v-zLv" secondAttribute="bottom" constant="20" id="kRy-kP-Cky"/>
                 <constraint firstItem="Q5M-cg-NOt" firstAttribute="trailing" secondItem="bqa-sn-hEc" secondAttribute="trailing" constant="30" id="qPa-fd-Xja"/>
                 <constraint firstAttribute="bottom" secondItem="Wbg-V7-70S" secondAttribute="bottom" id="tix-Ji-fTK"/>
                 <constraint firstItem="Q5M-cg-NOt" firstAttribute="trailing" secondItem="8ZC-Zv-RoF" secondAttribute="trailing" id="uvR-iJ-ypp"/>