缓存插件支持传入json

IpuCommon/Frameworks/WadeMobile.framework/Headers/IPUWebView.h

@@ -25,8 +25,6 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic, weak) id <WKUIDelegate, WKNavigationDelegate> delegate;
@property (nonatomic, copy, nullable) WebViewLoadCompletion loadCompletion;
- (void)loadUrl:(NSString *)urlString;
- (void)loadLocalUrl:(NSString *)filePath;

IpuCommon/Frameworks/WadeMobile.framework/Headers/WDAppDelegate.h

@@ -30,9 +30,6 @@
/** App进入后台时调用SnapShot功能时，是否模糊视图 **/
- (BOOL)blurredScreen;
/** 返回按钮的背景图片 **/
- (UIImage *)backButtonImage;
/// 自定义http-header参数
- (NSDictionary *)setURLRequestHeader;

IpuCommon/Frameworks/WadeMobile.framework/Headers/WDCommonTool.h

@@ -122,15 +122,34 @@
/*
 一个UILabel上显示不同颜色
 */
+(NSMutableAttributedString *)fetchAttributedText1:(NSString *)text1 Text2:(NSString *)text2 Text3:(NSString *)text3 Color1:(UIColor *)color1 Color2:(UIColor *)color2 Color3:(UIColor *)color3;
+ (NSMutableAttributedString *)fetchAttributedText1:(NSString *)text1
                                              Text2:(NSString *)text2
                                              Text3:(NSString *)text3
                                             Color1:(UIColor *)color1
                                             Color2:(UIColor *)color2
                                             Color3:(UIColor *)color3;
+(NSMutableAttributedString *)fetchAttributedText1:(NSString *)text1 Text2:(NSString *)text2 Text3:(NSString *)text3 Text4:(NSString *)text4 Text5:(NSString *)text5 Color1:(UIColor *)color1 Color2:(UIColor *)color2 Color3:(UIColor *)color3 Color4:(UIColor *)color4 Color5:(UIColor *)color5;
+ (NSMutableAttributedString *)fetchAttributedText1:(NSString *)text1
                                              Text2:(NSString *)text2
                                              Text3:(NSString *)text3
                                              Text4:(NSString *)text4
                                              Text5:(NSString *)text5
                                             Color1:(UIColor *)color1
                                             Color2:(UIColor *)color2
                                             Color3:(UIColor *)color3
                                             Color4:(UIColor *)color4
                                             Color5:(UIColor *)color5;
#pragma mark - 屏幕适配，(375,667)大小为标准
+(CGFloat)widthScale:(CGFloat)num;
+(CGFloat)heightScale:(CGFloat)num;
+ (CGFloat)widthScale:(CGFloat)num;
+ (CGFloat)heightScale:(CGFloat)num;
/// 判断刘海屏系列
+ (BOOL)isFringeSeries;
+(BOOL)isNullWithString:(NSString *)str;
///
+ (CGFloat)getStatusBarHeight;
+ (BOOL)isNullWithString:(NSString *)str;
@end

IpuCommon/Frameworks/WadeMobile.framework/Headers/WDMobileWebView.h

@@ -8,16 +8,12 @@
#import <Foundation/Foundation.h>
#import <UIKit/UIKit.h>
typedef void(^WebViewLoadCompletion)();
@class WDPlugin;
@interface WDMobileWebView : UIWebView
@property (nonatomic, strong) NSString *pageAction;
@property (nonatomic, copy, nullable) WebViewLoadCompletion loadCompletion;
//load remote resource
- (void)loadUrl:(NSString *)urlString;

IpuCommon/Frameworks/WadeMobile.framework/Headers/WDTemplateMainController.h

@@ -8,11 +8,6 @@
#import <Foundation/Foundation.h>
#import "WDTemplateController.h"
#import "WDServerConfig.h"
#import "WDConstant.h"
#import "WDMobileConfig.h"
#import "WDAutoUpdate.h"
#import "IpuAlertView.h"
#import "IpuProgressView.h"
@interface WDTemplateMainController : WDTemplateController

IpuCommon/Frameworks/WadeMobileFunc.framework/Headers/WDFMobileFile.h

@@ -70,4 +70,7 @@
//获取指定目录下所有文件列表
- (NSArray *)getAllFilesWithPath:(NSString *)filePath;
// 获取Document下指定目录的所有文件列表
- (void)listFiles:(NSArray *)param;
@end

IpuCommon/Frameworks/WadeMobileFunc.framework/Headers/WDFMobileUI.h

@@ -54,13 +54,13 @@
- (void)openTemplate:(NSString *)pageAction
            withData:(WDDataMap *)data
              isCurr:(BOOL)isCurr;
              isCurr:(NSNumber *)isCurr;
- (void)openPage:(NSArray *)param;
- (void)openPage:(NSString *)pageAction
            data:(NSString *)dataParam
      isCurrView:(BOOL)isCurr;
      isCurrView:(NSNumber *)isCurr;
- (void)loadPage:(NSArray *)param;

WadeMobileFunc/WadeMobileFunc.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,26 +7,26 @@
		<key>WadeMobileFunc.xcscheme</key>
		<dict>
			<key>orderHint</key>
			<integer>3</integer>
			<integer>0</integer>
		</dict>
		<key>WadeMobileFunc4Appstore.xcscheme</key>
		<dict>
			<key>isShown</key>
			<false/>
			<key>orderHint</key>
			<integer>5</integer>
			<integer>2</integer>
		</dict>
		<key>WadeMobileFuncAggregate.xcscheme</key>
		<dict>
			<key>isShown</key>
			<false/>
			<key>orderHint</key>
			<integer>4</integer>
			<integer>1</integer>
		</dict>
		<key>WadeMobileFuncBundle.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>48</integer>
			<integer>3</integer>
		</dict>
	</dict>
	<key>SuppressBuildableAutocreation</key>

WadeMobileFunc/WadeMobileFunc/WDFMobileStorage.m

@@ -42,7 +42,8 @@ static NSString* const DES_KEY = @"87382947";
    }
    NSMutableDictionary *cache = [self getCache];
    
    if ([key isKindOfClass:[WDDataMap class]]){
    if ([key isKindOfClass:[WDDataMap class]] ||
        [key isKindOfClass:[NSDictionary class]]){
        [cache addEntriesFromDictionary:key];   // 合并
    } else {
        if ([WDStringUtility isDataMap:key]) {
@@ -163,7 +164,8 @@ static NSString* const DES_KEY = @"87382947";
    }
    NSMutableDictionary *cache = [self offlineCache];
    
    if ([key isKindOfClass:[WDDataMap class]]) {
    if ([key isKindOfClass:[WDDataMap class]] ||
        [key isKindOfClass:[NSDictionary class]]) {
        [cache addEntriesFromDictionary:(WDDataMap *)key];//合并
    } else {
        if ([WDStringUtility isDataMap:key]) {

display-center/ReactNative/node_modules/react-native-camera/ios/RNCamera.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,7 +7,7 @@
		<key>RNCamera.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>40</integer>
			<integer>28</integer>
		</dict>
	</dict>
</dict>

display-center/ReactNative/node_modules/react-native/Libraries/ART/ART.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -14,7 +14,7 @@
		<key>ART.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>38</integer>
			<integer>36</integer>
		</dict>
	</dict>
	<key>SuppressBuildableAutocreation</key>

display-center/ReactNative/node_modules/react-native/Libraries/Blob/RCTBlob.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,12 +7,12 @@
		<key>RCTBlob-tvOS.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>29</integer>
			<integer>30</integer>
		</dict>
		<key>RCTBlob.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>37</integer>
			<integer>26</integer>
		</dict>
	</dict>
</dict>

display-center/ReactNative/node_modules/react-native/Libraries/Geolocation/RCTGeolocation.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,7 +7,7 @@
		<key>RCTGeolocation.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>28</integer>
			<integer>32</integer>
		</dict>
	</dict>
</dict>

display-center/ReactNative/node_modules/react-native/Libraries/Image/RCTImage.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -14,7 +14,7 @@
		<key>RCTImage.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>41</integer>
			<integer>33</integer>
		</dict>
	</dict>
	<key>SuppressBuildableAutocreation</key>

display-center/ReactNative/node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -14,7 +14,7 @@
		<key>RCTLinking.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>43</integer>
			<integer>46</integer>
		</dict>
	</dict>
	<key>SuppressBuildableAutocreation</key>

display-center/ReactNative/node_modules/react-native/Libraries/NativeAnimation/RCTAnimation.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -14,7 +14,7 @@
		<key>RCTAnimation.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>30</integer>
			<integer>45</integer>
		</dict>
	</dict>
	<key>SuppressBuildableAutocreation</key>

display-center/ReactNative/node_modules/react-native/Libraries/Network/RCTNetwork.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -14,7 +14,7 @@
		<key>RCTNetwork.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>32</integer>
			<integer>43</integer>
		</dict>
	</dict>
	<key>SuppressBuildableAutocreation</key>

display-center/ReactNative/node_modules/react-native/Libraries/Settings/RCTSettings.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -14,7 +14,7 @@
		<key>RCTSettings.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>33</integer>
			<integer>39</integer>
		</dict>
	</dict>
	<key>SuppressBuildableAutocreation</key>

display-center/ReactNative/node_modules/react-native/Libraries/Text/RCTText.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -14,7 +14,7 @@
		<key>RCTText.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>31</integer>
			<integer>24</integer>
		</dict>
	</dict>
	<key>SuppressBuildableAutocreation</key>

display-center/ReactNative/node_modules/react-native/Libraries/Vibration/RCTVibration.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,7 +7,7 @@
		<key>RCTVibration.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>39</integer>
			<integer>42</integer>
		</dict>
	</dict>
</dict>

display-center/ReactNative/node_modules/react-native/Libraries/WebSocket/RCTWebSocket.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -14,7 +14,7 @@
		<key>RCTWebSocket.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>36</integer>
			<integer>48</integer>
		</dict>
		<key>fishhook-tvOS.xcscheme_^#shared#^_</key>
		<dict>
@@ -26,7 +26,7 @@
		<key>fishhook.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>24</integer>
			<integer>41</integer>
		</dict>
	</dict>
	<key>SuppressBuildableAutocreation</key>

display-center/ReactNative/node_modules/react-native/React/React.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -26,7 +26,7 @@
		<key>cxxreact.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>25</integer>
			<integer>29</integer>
		</dict>
		<key>double-conversion-tvOS.xcscheme_^#shared#^_</key>
		<dict>
@@ -38,7 +38,7 @@
		<key>double-conversion.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>34</integer>
			<integer>25</integer>
		</dict>
		<key>jsi-tvOS.xcscheme_^#shared#^_</key>
		<dict>
@@ -50,7 +50,7 @@
		<key>jsi.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>47</integer>
			<integer>50</integer>
		</dict>
		<key>jsiexecutor-tvOS.xcscheme_^#shared#^_</key>
		<dict>
@@ -62,7 +62,7 @@
		<key>jsiexecutor.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>27</integer>
			<integer>49</integer>
		</dict>
		<key>jsinspector-tvOS.xcscheme_^#shared#^_</key>
		<dict>
@@ -74,7 +74,7 @@
		<key>jsinspector.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>35</integer>
			<integer>34</integer>
		</dict>
		<key>third-party-tvOS.xcscheme_^#shared#^_</key>
		<dict>
@@ -86,7 +86,7 @@
		<key>third-party.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>45</integer>
			<integer>35</integer>
		</dict>
		<key>yoga-tvOS.xcscheme_^#shared#^_</key>
		<dict>
@@ -98,7 +98,7 @@
		<key>yoga.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>42</integer>
			<integer>27</integer>
		</dict>
	</dict>
	<key>SuppressBuildableAutocreation</key>

display-center/Res/config/count-service.plist

@@ -3,6 +3,6 @@
<plist version="1.0">
<dict>
	<key>count_service_url</key>
	<string>http://121.42.183.206:8084/display/mobiledata?action=getCountServers</string>
	<string>http://121.42.183.206:8402/ipu/mobiledata?action=getCountServers</string>
</dict>
</plist>

display-center/display-center.xcworkspace/xcuserdata/benny.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -66,5 +66,69 @@
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
         <BreakpointContent
            uuid = "679B20E7-0A97-45A6-B7E7-4C15CD16C2F3"
            shouldBeEnabled = "Yes"
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "../WadeMobileFunc/WadeMobileFunc/WDFImageCache.m"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "76"
            endingLineNumber = "76"
            landmarkName = "-setImageWithURL:placeholderUrl:isRefresh:options:progress:completed:"
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
         <BreakpointContent
            uuid = "846AE16D-F3B6-4139-AC79-39ED5FF4B66A"
            shouldBeEnabled = "Yes"
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "../WadeMobileFunc/WadeMobileFunc/WDFImageCache.m"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "20"
            endingLineNumber = "20"
            landmarkName = "-setImageWithURL:"
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
         <BreakpointContent
            uuid = "A3FA2CED-6507-467C-BB23-DCF33442C914"
            shouldBeEnabled = "Yes"
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "../WadeMobileFunc/WadeMobileFunc/WDFImageCache.m"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "54"
            endingLineNumber = "54"
            landmarkName = "-setImageWithURL:placeholderUrl:isRefresh:options:progress:completed:"
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
         <BreakpointContent
            uuid = "BCF18E0C-C910-4C8E-B836-6BFD5C880D4B"
            shouldBeEnabled = "Yes"
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "../WadeMobileFunc/WadeMobileFunc/WDFImageCache.m"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "127"
            endingLineNumber = "127"
            landmarkName = "-setImageWithURLs:"
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
   </Breakpoints>
</Bucket>