gg 1 mese fa
parent
commit
ba1578ba66

BIN
.DS_Store


BIN
MSYOUPAI.xcworkspace/xcuserdata/macmini.xcuserdatad/UserInterfaceState.xcuserstate


+ 4 - 0
MSYOUPAI/NewCode/Module/MyEarnings/Controller/YMMyEarningsViewController.m

@@ -52,6 +52,10 @@
     return UIStatusBarStyleLightContent;
 }
 
+- (void)backAction {
+    [self.navigationController popViewControllerAnimated:YES];
+}
+
 - (void)ym_setupViews{
     [self setNavHidden:YES];
     

+ 17 - 7
Pods/BAWKWebView/BAWKWebView/BAWKWebView/WKWebView+BAKit.m

@@ -11,7 +11,7 @@
 #import "WKWebView+BAJavaScriptAlert.h"
 #import "WeakScriptMessageDelegate.h"
 
-
+static void *BAKitKVOContext = &BAKitKVOContext;
 
 @interface WKWebView ()
 
@@ -74,19 +74,19 @@
     [self addObserver:self
                    forKeyPath:kBAKit_WK_title
                       options:NSKeyValueObservingOptionNew
-                      context:nil];
+                      context:BAKitKVOContext];
     
     // 当前页面载入进度
     [self addObserver:self
                    forKeyPath:kBAKit_WK_estimatedProgress
                       options:NSKeyValueObservingOptionNew
-                      context:nil];
+                      context:BAKitKVOContext];
     
     // 监听 URL,当之前的 URL 不为空,而新的 URL 为空时则表示进程被终止
     [self addObserver:self
            forKeyPath:kBAKit_WK_URL
               options:NSKeyValueObservingOptionNew
-              context:nil];
+              context:BAKitKVOContext];
 }
 
 - (void)observeValueForKeyPath:(NSString *)keyPath
@@ -94,6 +94,16 @@
                         change:(NSDictionary<NSString *,id> *)change
                        context:(void *)context
 {
+    
+    // ===== ① 非 BAKit 的 KVO,一律放行(系统 / SDK)=====
+    if (context != BAKitKVOContext) {
+        [super observeValueForKeyPath:keyPath
+                             ofObject:object
+                               change:change
+                              context:context];
+        return;
+    }
+    
     if ([keyPath isEqualToString:kBAKit_WK_title])
     {
         if (object == self)
@@ -569,8 +579,8 @@
 {
 //    BAKit_Objc_exchangeMethodAToB(NSSelectorFromString(@"init"), @selector(ba_web_init));
 //    BAKit_Objc_exchangeMethodAToB(NSSelectorFromString(@"initWithFrame"), @selector(ba_web_initWithFrame));
-    BAKit_Objc_exchangeMethodAToB(NSSelectorFromString(@"dealloc"),
-                                  @selector(ba_web_dealloc));
+//    BAKit_Objc_exchangeMethodAToB(NSSelectorFromString(@"dealloc"),
+//                                  @selector(ba_web_dealloc));
 
 }
 
@@ -594,7 +604,7 @@
         [self.scrollView addObserver:self
                           forKeyPath:kBAKit_WK_contentSize
                              options:NSKeyValueObservingOptionNew
-                             context:nil];
+                             context:BAKitKVOContext];
     }
 }
 

+ 55 - 55
Pods/Pods.xcodeproj/xcuserdata/macmini.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,277 +7,277 @@
 		<key>AgoraRtcEngine_Special_iOS.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>39</integer>
+			<integer>4</integer>
 		</dict>
 		<key>AlipaySDK-iOS.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>52</integer>
+			<integer>27</integer>
 		</dict>
 		<key>AliyunOSSiOS.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>48</integer>
+			<integer>49</integer>
 		</dict>
 		<key>BAGridView.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>19</integer>
+			<integer>24</integer>
 		</dict>
 		<key>BATextField.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>3</integer>
+			<integer>17</integer>
 		</dict>
 		<key>BAWKWebView.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>12</integer>
+			<integer>42</integer>
 		</dict>
 		<key>CHTCollectionViewWaterfallLayout.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>49</integer>
+			<integer>25</integer>
 		</dict>
 		<key>CocoaAsyncSocket.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>14</integer>
+			<integer>32</integer>
 		</dict>
 		<key>FLAnimatedImage.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>29</integer>
+			<integer>6</integer>
 		</dict>
 		<key>GKNavigationBarViewController.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>53</integer>
+			<integer>55</integer>
 		</dict>
 		<key>IQKeyboardManager-IQKeyboardManager.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>34</integer>
+			<integer>11</integer>
 		</dict>
 		<key>IQKeyboardManager.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>27</integer>
+			<integer>37</integer>
 		</dict>
 		<key>JQCollectionViewAlignLayout.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>4</integer>
+			<integer>44</integer>
 		</dict>
 		<key>JXCategoryView-JXCategoryView.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>10</integer>
+			<integer>43</integer>
 		</dict>
 		<key>JXCategoryView.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>42</integer>
+			<integer>28</integer>
 		</dict>
 		<key>JXPagingView-JXPagerView.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>45</integer>
+			<integer>20</integer>
 		</dict>
 		<key>JXPagingView.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>50</integer>
+			<integer>3</integer>
 		</dict>
 		<key>JhtMarquee.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>21</integer>
+			<integer>46</integer>
 		</dict>
 		<key>KTVHTTPCache.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>18</integer>
+			<integer>35</integer>
 		</dict>
 		<key>LYEmptyView.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>47</integer>
+			<integer>19</integer>
 		</dict>
 		<key>LookinServer.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>55</integer>
+			<integer>12</integer>
 		</dict>
 		<key>MJExtension-MJExtension.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>33</integer>
+			<integer>53</integer>
 		</dict>
 		<key>MJExtension.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>20</integer>
+			<integer>51</integer>
 		</dict>
 		<key>MJRefresh-MJRefresh.Privacy.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>11</integer>
+			<integer>41</integer>
 		</dict>
 		<key>MJRefresh.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>28</integer>
+			<integer>5</integer>
 		</dict>
 		<key>MSYConfig.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>56</integer>
+			<integer>8</integer>
 		</dict>
 		<key>Masonry.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>30</integer>
+			<integer>2</integer>
 		</dict>
 		<key>Nama-lite.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>22</integer>
+			<integer>34</integer>
 		</dict>
 		<key>PGDatePicker.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>9</integer>
+			<integer>7</integer>
 		</dict>
 		<key>PGPickerView.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>37</integer>
+			<integer>26</integer>
 		</dict>
 		<key>Pods-MSYOUPAI.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>31</integer>
+			<integer>38</integer>
 		</dict>
 		<key>PrintBeautifulLog.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>54</integer>
+			<integer>48</integer>
 		</dict>
 		<key>Protobuf-Protobuf_Privacy.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>38</integer>
+			<integer>9</integer>
 		</dict>
 		<key>Protobuf.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>13</integer>
+			<integer>31</integer>
 		</dict>
 		<key>ReactiveObjC.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>23</integer>
+			<integer>29</integer>
 		</dict>
 		<key>SDWebImage.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>15</integer>
+			<integer>18</integer>
 		</dict>
 		<key>SDWebImageAPNGCoder.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>2</integer>
+			<integer>23</integer>
 		</dict>
 		<key>SSZipArchive.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>16</integer>
+			<integer>36</integer>
 		</dict>
 		<key>SVGAPlayer.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>51</integer>
+			<integer>33</integer>
 		</dict>
 		<key>TFHpple.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>44</integer>
+			<integer>21</integer>
 		</dict>
 		<key>TZImagePickerController.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>24</integer>
+			<integer>40</integer>
 		</dict>
 		<key>UMAPM.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>5</integer>
+			<integer>16</integer>
 		</dict>
 		<key>UMCCommonLog.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>32</integer>
+			<integer>39</integer>
 		</dict>
 		<key>UMCommon.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>35</integer>
+			<integer>52</integer>
 		</dict>
 		<key>UMDevice.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>6</integer>
+			<integer>22</integer>
 		</dict>
 		<key>UMPush.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>8</integer>
+			<integer>30</integer>
 		</dict>
 		<key>UMShare.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>40</integer>
+			<integer>14</integer>
 		</dict>
 		<key>VODUpload.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>7</integer>
+			<integer>13</integer>
 		</dict>
 		<key>WechatOpenSDK.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>25</integer>
+			<integer>54</integer>
 		</dict>
 		<key>YYModel.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>41</integer>
+			<integer>10</integer>
 		</dict>
 		<key>YYText.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>26</integer>
+			<integer>15</integer>
 		</dict>
 		<key>libOpenInstallSDK-OPPrivacy.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>43</integer>
+			<integer>50</integer>
 		</dict>
 		<key>libOpenInstallSDK.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>17</integer>
+			<integer>56</integer>
 		</dict>
 		<key>libwebp.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>36</integer>
+			<integer>45</integer>
 		</dict>
 		<key>lottie-ios_Oc.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>46</integer>
+			<integer>47</integer>
 		</dict>
 	</dict>
 </dict>