Merge branch 'master' of http://10.1.235.20:3000/ipu/ios-share

IpuCommon/Frameworks/IpuCount.framework/Headers/IpuCommonUtil.h

@@ -40,6 +40,10 @@
 系统版本
 */
+ (NSString *)getOSVersion;
/*
 获取手机电量
 */
+(double)getAvailableBattery;
/*
 应用名
@@ -55,7 +59,15 @@
+ (NSString *)getAppVersion;
+ (NSString *)getIP;
+ (NSString *)getIPAddress;
/*
 判断当前WLAN是否可用，可用返回YES
 */
+ (BOOL)activeWLAN;
/*
 连网状态是否正常，YES为正常
 */
+ (BOOL)isNetReachable;
+ (NSString *)getIPV4Address;
+ (NSString *)getIPV6Address;
/*
@@ -66,17 +78,26 @@
 获取网络信息
 */
+ (NSString *)getNetWorkInfo;
///*
// 获取UDID 设备唯一标识码，并保存到keychain中
// */
//+ (NSString *)getUDID;
//
///*
// 获取seedid:
// 在KeychainItemWrapper初始化时变量accessgroup使用bundleseed.com.xxx.xxx
// */
//+ (NSString *)bundleSeedID;
/*
 获取WIFI信号强度
 */
+ (int)getWifiSignal;
/*
 获取wifi ssid
 */
+ (NSString *)getWifiSSID;
/*
 获取当前手机CPU使用率，已*100
 */
+(float)cpu_usag;
/*
 获取当前未使用手机内存
 */
+ (double)availableMemory;
/*
 获取当前已使用手机内存
 */
+ (double)usedMemory;
#pragma mark - 路径相关
/*

IpuCommon/Frameworks/IpuCount.framework/Headers/IpuCountReport.h

@@ -22,7 +22,7 @@
 *发送基本设备信息和应用信息:ipu_device
 **/
+ (void)reportGeneralInfo;
+(void)reportAppStartWithRemark1:(NSString *)mark1 Remark2:(NSString *)mark2;
+ (void)reportAppStartWithRemark1:(NSString *)mark1 Remark2:(NSString *)mark2;
/**
 *崩溃信息日志封装:ipu_crash

SuperMenu/SuperMenu.xcodeproj/xcuserdata/mac.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -106,7 +106,7 @@
                  moduleName = "SuperMenu"
                  usesParentBreakpointCondition = "Yes"
                  urlString = "file:///Users/mac/work/asiainfo/ios-share/SuperMenu/SuperMenu/multiple/AppManagePlugin.m"
                  timestampString = "566930488.527329"
                  timestampString = "568697468.179831"
                  startingColumnNumber = "9223372036854775807"
                  endingColumnNumber = "9223372036854775807"
                  startingLineNumber = "285"
@@ -121,7 +121,7 @@
                  moduleName = "SuperMenu"
                  usesParentBreakpointCondition = "Yes"
                  urlString = "file:///Users/mac/work/asiainfo/ios-share/SuperMenu/SuperMenu/multiple/AppManagePlugin.m"
                  timestampString = "566930488.528883"
                  timestampString = "568697468.18135"
                  startingColumnNumber = "9223372036854775807"
                  endingColumnNumber = "9223372036854775807"
                  startingLineNumber = "287"
@@ -474,7 +474,7 @@
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "../WadeMobileFunc/WadeMobileFunc/WDFMobileUI.m"
            timestampString = "566930488.389179"
            timestampString = "568194087.600445"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "756"
@@ -698,7 +698,7 @@
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "../WadeMobileFunc/WadeMobileFunc/WDFMobileUI.m"
            timestampString = "566930488.3906029"
            timestampString = "568194087.601091"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "167"

SuperMenu/SuperMenu.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,7 +7,7 @@
		<key>SuperMenu.xcscheme</key>
		<dict>
			<key>orderHint</key>
			<integer>3</integer>
			<integer>2</integer>
		</dict>
	</dict>
</dict>

WadeMobileFunc/WadeMobileFunc.xcodeproj/xcuserdata/mac.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -26,7 +26,7 @@
                  moduleName = "WadeMobileFunc"
                  usesParentBreakpointCondition = "Yes"
                  urlString = "file:///Users/mac/work/asiainfo/ios-share/WadeMobileFunc/WadeMobileFunc/WDFSocial.m"
                  timestampString = "566930488.913711"
                  timestampString = "568697468.66079"
                  startingColumnNumber = "9223372036854775807"
                  endingColumnNumber = "9223372036854775807"
                  startingLineNumber = "291"
@@ -41,7 +41,7 @@
                  moduleName = "WadeMobileFunc"
                  usesParentBreakpointCondition = "Yes"
                  urlString = "file:///Users/mac/work/asiainfo/ios-share/WadeMobileFunc/WadeMobileFunc/WDFSocial.m"
                  timestampString = "566930488.916468"
                  timestampString = "568697468.6630909"
                  startingColumnNumber = "9223372036854775807"
                  endingColumnNumber = "9223372036854775807"
                  startingLineNumber = "292"
@@ -56,7 +56,7 @@
                  moduleName = "WadeMobileFunc"
                  usesParentBreakpointCondition = "Yes"
                  urlString = "file:///Users/mac/work/asiainfo/ios-share/WadeMobileFunc/WadeMobileFunc/WDFSocial.m"
                  timestampString = "566930488.918768"
                  timestampString = "568697468.664977"
                  startingColumnNumber = "9223372036854775807"
                  endingColumnNumber = "9223372036854775807"
                  startingLineNumber = "291"

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

@@ -7,17 +7,17 @@
		<key>WadeMobileFunc.xcscheme</key>
		<dict>
			<key>orderHint</key>
			<integer>8</integer>
			<integer>13</integer>
		</dict>
		<key>WadeMobileFunc4Appstore.xcscheme</key>
		<dict>
			<key>orderHint</key>
			<integer>10</integer>
			<integer>15</integer>
		</dict>
		<key>WadeMobileFuncAggregate.xcscheme</key>
		<dict>
			<key>orderHint</key>
			<integer>9</integer>
			<integer>14</integer>
		</dict>
	</dict>
</dict>

WadeMobileFunc/WadeMobileFunc/WDFMobileUI.m

@@ -340,10 +340,10 @@
        isCurr = [@"true" isEqualToString:param[2]];
    }
    
    [self openPage:pageAction data:dataParam isCurrView:isCurr];
//    [self openPage:pageAction data:dataParam isCurrView:isCurr];
    
//    IpuDynaProxy *obj = [[IpuDynaProxy alloc] initWithObject:self];
//    [obj performMethod:@"openPage:data:isCurrView:" Param:pageAction,dataParam,isCurr,nil];
    IpuDynaProxy *obj = [[IpuDynaProxy alloc] initWithObject:self];
    [obj performMethod:@"openPage:data:isCurrView:" Param:pageAction,dataParam,isCurr,nil];
}
/**

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

@@ -7,7 +7,7 @@
		<key>RNCamera.xcscheme</key>
		<dict>
			<key>orderHint</key>
			<integer>32</integer>
			<integer>22</integer>
		</dict>
	</dict>
</dict>

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

@@ -17,7 +17,7 @@
		<key>ART.xcscheme</key>
		<dict>
			<key>orderHint</key>
			<integer>34</integer>
			<integer>24</integer>
		</dict>
	</dict>
</dict>

display-center/ReactNative/node_modules/react-native/Libraries/ActionSheetIOS/RCTActionSheet.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,7 +7,7 @@
		<key>RCTActionSheet.xcscheme</key>
		<dict>
			<key>orderHint</key>
			<integer>33</integer>
			<integer>23</integer>
		</dict>
	</dict>
</dict>

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

@@ -12,12 +12,12 @@
		<key>RCTBlob-tvOS.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>10</integer>
			<integer>8</integer>
		</dict>
		<key>RCTBlob.xcscheme</key>
		<dict>
			<key>orderHint</key>
			<integer>36</integer>
			<integer>25</integer>
		</dict>
	</dict>
</dict>

display-center/ReactNative/node_modules/react-native/Libraries/CameraRoll/RCTCameraRoll.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,7 +7,7 @@
		<key>RCTCameraRoll.xcscheme</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/mac.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,7 +7,7 @@
		<key>RCTGeolocation.xcscheme</key>
		<dict>
			<key>orderHint</key>
			<integer>38</integer>
			<integer>27</integer>
		</dict>
	</dict>
</dict>

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

@@ -12,12 +12,12 @@
		<key>RCTImage-tvOS.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>11</integer>
			<integer>9</integer>
		</dict>
		<key>RCTImage.xcscheme</key>
		<dict>
			<key>orderHint</key>
			<integer>39</integer>
			<integer>28</integer>
		</dict>
	</dict>
</dict>

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

@@ -12,12 +12,12 @@
		<key>RCTLinking-tvOS.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>12</integer>
			<integer>10</integer>
		</dict>
		<key>RCTLinking.xcscheme</key>
		<dict>
			<key>orderHint</key>
			<integer>40</integer>
			<integer>29</integer>
		</dict>
	</dict>
</dict>

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

@@ -12,12 +12,12 @@
		<key>RCTAnimation-tvOS.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>9</integer>
			<integer>7</integer>
		</dict>
		<key>RCTAnimation.xcscheme</key>
		<dict>
			<key>orderHint</key>
			<integer>47</integer>
			<integer>37</integer>
		</dict>
	</dict>
</dict>

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

@@ -12,12 +12,12 @@
		<key>RCTNetwork-tvOS.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>13</integer>
			<integer>11</integer>
		</dict>
		<key>RCTNetwork.xcscheme</key>
		<dict>
			<key>orderHint</key>
			<integer>48</integer>
			<integer>38</integer>
		</dict>
	</dict>
</dict>

display-center/ReactNative/node_modules/react-native/Libraries/PushNotificationIOS/RCTPushNotification.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -12,12 +12,12 @@
		<key>RCTPushNotification-tvOS.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>14</integer>
			<integer>12</integer>
		</dict>
		<key>RCTPushNotification.xcscheme</key>
		<dict>
			<key>orderHint</key>
			<integer>49</integer>
			<integer>39</integer>
		</dict>
	</dict>
</dict>

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

@@ -12,12 +12,12 @@
		<key>RCTSettings-tvOS.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>15</integer>
			<integer>13</integer>
		</dict>
		<key>RCTSettings.xcscheme</key>
		<dict>
			<key>orderHint</key>
			<integer>50</integer>
			<integer>40</integer>
		</dict>
	</dict>
</dict>

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

@@ -12,7 +12,7 @@
		<key>RCTText-tvOS.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>17</integer>
			<integer>15</integer>
		</dict>
		<key>RCTText.xcscheme</key>
		<dict>
@@ -22,7 +22,7 @@
		<key>RCTText.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>16</integer>
			<integer>14</integer>
		</dict>
	</dict>
</dict>

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

@@ -7,7 +7,7 @@
		<key>RCTVibration.xcscheme</key>
		<dict>
			<key>orderHint</key>
			<integer>51</integer>
			<integer>41</integer>
		</dict>
	</dict>
</dict>

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

@@ -12,12 +12,12 @@
		<key>RCTWebSocket-tvOS.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>18</integer>
			<integer>16</integer>
		</dict>
		<key>RCTWebSocket.xcscheme</key>
		<dict>
			<key>orderHint</key>
			<integer>52</integer>
			<integer>42</integer>
		</dict>
		<key>fishhook-tvOS.xcscheme</key>
		<dict>
@@ -27,12 +27,12 @@
		<key>fishhook-tvOS.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>5</integer>
			<integer>3</integer>
		</dict>
		<key>fishhook.xcscheme</key>
		<dict>
			<key>orderHint</key>
			<integer>53</integer>
			<integer>43</integer>
		</dict>
	</dict>
</dict>

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

@@ -12,7 +12,7 @@
		<key>React-tvOS.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>20</integer>
			<integer>18</integer>
		</dict>
		<key>React.xcscheme</key>
		<dict>
@@ -22,7 +22,7 @@
		<key>React.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>19</integer>
			<integer>17</integer>
		</dict>
		<key>cxxreact-tvOS.xcscheme</key>
		<dict>
@@ -32,12 +32,12 @@
		<key>cxxreact-tvOS.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>3</integer>
			<integer>1</integer>
		</dict>
		<key>cxxreact.xcscheme</key>
		<dict>
			<key>orderHint</key>
			<integer>35</integer>
			<integer>31</integer>
		</dict>
		<key>double-conversion-tvOS.xcscheme</key>
		<dict>
@@ -47,12 +47,12 @@
		<key>double-conversion-tvOS.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>4</integer>
			<integer>2</integer>
		</dict>
		<key>double-conversion.xcscheme</key>
		<dict>
			<key>orderHint</key>
			<integer>45</integer>
			<integer>35</integer>
		</dict>
		<key>jschelpers-tvOS.xcscheme</key>
		<dict>
@@ -62,12 +62,12 @@
		<key>jschelpers-tvOS.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>6</integer>
			<integer>4</integer>
		</dict>
		<key>jschelpers.xcscheme</key>
		<dict>
			<key>orderHint</key>
			<integer>42</integer>
			<integer>32</integer>
		</dict>
		<key>jsinspector-tvOS.xcscheme</key>
		<dict>
@@ -77,12 +77,12 @@
		<key>jsinspector-tvOS.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>7</integer>
			<integer>5</integer>
		</dict>
		<key>jsinspector.xcscheme</key>
		<dict>
			<key>orderHint</key>
			<integer>43</integer>
			<integer>33</integer>
		</dict>
		<key>privatedata-tvOS.xcscheme</key>
		<dict>
@@ -92,12 +92,12 @@
		<key>privatedata-tvOS.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>8</integer>
			<integer>6</integer>
		</dict>
		<key>privatedata.xcscheme</key>
		<dict>
			<key>orderHint</key>
			<integer>46</integer>
			<integer>36</integer>
		</dict>
		<key>third-party-tvOS.xcscheme</key>
		<dict>
@@ -107,12 +107,12 @@
		<key>third-party-tvOS.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>21</integer>
			<integer>19</integer>
		</dict>
		<key>third-party.xcscheme</key>
		<dict>
			<key>orderHint</key>
			<integer>44</integer>
			<integer>34</integer>
		</dict>
		<key>yoga-tvOS.xcscheme</key>
		<dict>
@@ -122,12 +122,12 @@
		<key>yoga-tvOS.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>22</integer>
			<integer>20</integer>
		</dict>
		<key>yoga.xcscheme</key>
		<dict>
			<key>orderHint</key>
			<integer>41</integer>
			<integer>30</integer>
		</dict>
	</dict>
	<key>SuppressBuildableAutocreation</key>

display-center/display-center.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,7 +7,7 @@
		<key>display-center.xcscheme</key>
		<dict>
			<key>orderHint</key>
			<integer>23</integer>
			<integer>21</integer>
		</dict>
	</dict>
	<key>SuppressBuildableAutocreation</key>