@aks-dev/easyui 1.0.46 → 1.0.49

package/README.md

@@ -2,7 +2,7 @@
  * @Author: shiguo
  * @Date: 2022-04-25 17:57:29
  * @LastEditors: shiguo
- * @LastEditTime: 2022-05-27 12:03:27
+ * @LastEditTime: 2022-05-30 16:17:16
  * @FilePath: /@aks-dev/easyui/README.md
 -->
 
@@ -15,7 +15,7 @@ or
 `$ yarn add @aks-dev/easyui`
 
 
-### [UI组件](./README.md)
+### UI组件
 
 + Badge
 + EasyHub
@@ -30,6 +30,19 @@ or
 + WithLoadingContainer
 
 
-### [工具包](./README.md)
+### 工具包
+|函数|作用|
+|:----|:----|
+|sleep|睡眠时间|
+|keyboardDismissHandlers|通过手势关闭键盘|
+|panHandlersCallback|手势动作回调|
+|callTelephone|拨打电话|
+|randomcolor|获取随机色|
+|syncLoop|同步循环|
 
-### [jsbridge](./README.md)
+### jsbridge
+
+|函数|作用|
+|:----|:----|
+|getAppVersion|获取App版本号|
+|upgrade|app升级|

package/android/src/main/java/com/utils/RomUtil.java

@@ -0,0 +1,124 @@
+package com.utils;
+
+import android.os.Build;
+import android.text.TextUtils;
+import android.util.Log;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+
+public class RomUtil {
+    private static final String TAG = "RomUtil";
+
+    public static final String ROM_MIUI = "MIUI";
+    public static final String ROM_EMUI = "EMUI";
+    public static final String ROM_FLYME = "FLYME";
+    public static final String ROM_OPPO = "OPPO";
+    public static final String ROM_SMARTISAN = "SMARTISAN";
+    public static final String ROM_VIVO = "VIVO";
+    public static final String ROM_QIKU = "QIKU";
+
+    private static final String KEY_VERSION_MIUI = "ro.miui.ui.version.name";
+    private static final String KEY_VERSION_EMUI = "ro.build.version.emui";
+    private static final String KEY_VERSION_OPPO = "ro.build.version.opporom";
+    private static final String KEY_VERSION_SMARTISAN = "ro.smartisan.version";
+    private static final String KEY_VERSION_VIVO = "ro.vivo.os.version";
+
+    private static String sName;
+    private static String sVersion;
+
+    /** 华为 */
+    public static boolean isEmui() {
+        return check(ROM_EMUI);
+    }
+    /** 小米 */
+    public static boolean isMiui() {
+        return check(ROM_MIUI);
+    }
+    /** vivo */
+    public static boolean isVivo() {
+        return check(ROM_VIVO);
+    }
+    /** oppo */
+    public static boolean isOppo() {
+        return check(ROM_OPPO);
+    }
+    /** 魅族 */
+    public static boolean isFlyme() {
+        return check(ROM_FLYME);
+    }
+    /** 360 */
+    public static boolean is360() {
+        return check(ROM_QIKU) || check("360");
+    }
+
+    public static boolean isSmartisan() {
+        return check(ROM_SMARTISAN);
+    }
+
+    public static String getName() {
+        if (sName == null) {
+            check("");
+        }
+        return sName;
+    }
+
+    public static String getVersion() {
+        if (sVersion == null) {
+            check("");
+        }
+        return sVersion;
+    }
+
+    public static boolean check(String rom) {
+        if (sName != null) {
+            return sName.equals(rom);
+        }
+
+        if (!TextUtils.isEmpty(sVersion = getProp(KEY_VERSION_MIUI))) {
+            sName = ROM_MIUI;
+        } else if (!TextUtils.isEmpty(sVersion = getProp(KEY_VERSION_EMUI))) {
+            sName = ROM_EMUI;
+        } else if (!TextUtils.isEmpty(sVersion = getProp(KEY_VERSION_OPPO))) {
+            sName = ROM_OPPO;
+        } else if (!TextUtils.isEmpty(sVersion = getProp(KEY_VERSION_VIVO))) {
+            sName = ROM_VIVO;
+        } else if (!TextUtils.isEmpty(sVersion = getProp(KEY_VERSION_SMARTISAN))) {
+            sName = ROM_SMARTISAN;
+        } else {
+            sVersion = Build.DISPLAY;
+            if (sVersion.toUpperCase().contains(ROM_FLYME)) {
+                sName = ROM_FLYME;
+            } else {
+                sVersion = Build.UNKNOWN;
+                sName = Build.MANUFACTURER.toUpperCase();
+            }
+        }
+        return sName.equals(rom);
+    }
+
+    public static String getProp(String name) {
+        String line = null;
+        BufferedReader input = null;
+        try {
+            Process p = Runtime.getRuntime().exec("getprop " + name);
+            input = new BufferedReader(new InputStreamReader(p.getInputStream()), 1024);
+            line = input.readLine();
+            input.close();
+        } catch (IOException ex) {
+            Log.e(TAG, "Unable to read prop " + name, ex);
+            return null;
+        } finally {
+            if (input != null) {
+                try {
+                    input.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return line;
+    }
+
+}

package/ios/RNEasyui.podspec

@@ -1,7 +1,7 @@
 
 Pod::Spec.new do |s|
   s.name         = "RNEasyui"
-  s.version      = "1.0.3"
+  s.version      = "1.0.5"
   s.summary      = "RNEasyui"
   s.description  = <<-DESC
                   RNEasyui
@@ -12,8 +12,9 @@ Pod::Spec.new do |s|
   s.author             = { "author" => "author@domain.cn" }
   s.platform     = :ios, "11.0"
   s.source       = { :git => "https://gitee.com/the_period_of_the_ten_kingdoms/aks-easyui.git", :tag => "master" }
-  s.source_files  = "**/*.{h,m,swift,xib,c,bundle}"
+  s.source_files  = "**/*.{h,m,swift,xib,c}"
   s.requires_arc = true
+  s.resource_bundles = { 'RNEasyui' => ['assets/*'] }
 
 
   s.dependency "React"

package/ios/utils/RomUtil.h

@@ -0,0 +1,16 @@
+//
+//  RomUtil.h
+//  officeServiceApp
+//
+//  Created by mac on 2021/1/19.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface RomUtil : NSObject
++ (NSString *)getCurrentDeviceModel;
+@end
+
+NS_ASSUME_NONNULL_END

package/ios/utils/RomUtil.m

@@ -0,0 +1,104 @@
+//
+//  RomUtil.m
+//  officeServiceApp
+//
+//  Created by mac on 2021/1/19.
+//
+
+#import "RomUtil.h"
+#import <sys/utsname.h>//要导入头文件
+@implementation RomUtil
+
+
++ (NSString *)getCurrentDeviceModel{
+   struct utsname systemInfo;
+   uname(&systemInfo);
+   
+   NSString *deviceModel = [NSString stringWithCString:systemInfo.machine encoding:NSASCIIStringEncoding];
+   
+   
+if ([deviceModel isEqualToString:@"iPhone3,1"])    return @"iPhone 4";
+if ([deviceModel isEqualToString:@"iPhone3,2"])    return @"iPhone 4";
+if ([deviceModel isEqualToString:@"iPhone3,3"])    return @"iPhone 4";
+if ([deviceModel isEqualToString:@"iPhone4,1"])    return @"iPhone 4S";
+if ([deviceModel isEqualToString:@"iPhone5,1"])    return @"iPhone 5";
+if ([deviceModel isEqualToString:@"iPhone5,2"])    return @"iPhone 5 (GSM+CDMA)";
+if ([deviceModel isEqualToString:@"iPhone5,3"])    return @"iPhone 5c (GSM)";
+if ([deviceModel isEqualToString:@"iPhone5,4"])    return @"iPhone 5c (GSM+CDMA)";
+if ([deviceModel isEqualToString:@"iPhone6,1"])    return @"iPhone 5s (GSM)";
+if ([deviceModel isEqualToString:@"iPhone6,2"])    return @"iPhone 5s (GSM+CDMA)";
+if ([deviceModel isEqualToString:@"iPhone7,1"])    return @"iPhone 6 Plus";
+if ([deviceModel isEqualToString:@"iPhone7,2"])    return @"iPhone 6";
+if ([deviceModel isEqualToString:@"iPhone8,1"])    return @"iPhone 6s";
+if ([deviceModel isEqualToString:@"iPhone8,2"])    return @"iPhone 6s Plus";
+if ([deviceModel isEqualToString:@"iPhone8,4"])    return @"iPhone SE";
+// 日行两款手机型号均为日本独占，可能使用索尼FeliCa支付方案而不是苹果支付
+if ([deviceModel isEqualToString:@"iPhone9,1"])    return @"iPhone 7";
+if ([deviceModel isEqualToString:@"iPhone9,2"])    return @"iPhone 7 Plus";
+if ([deviceModel isEqualToString:@"iPhone9,3"])    return @"iPhone 7";
+if ([deviceModel isEqualToString:@"iPhone9,4"])    return @"iPhone 7 Plus";
+if ([deviceModel isEqualToString:@"iPhone10,1"])   return @"iPhone_8";
+if ([deviceModel isEqualToString:@"iPhone10,4"])   return @"iPhone_8";
+if ([deviceModel isEqualToString:@"iPhone10,2"])   return @"iPhone_8_Plus";
+if ([deviceModel isEqualToString:@"iPhone10,5"])   return @"iPhone_8_Plus";
+if ([deviceModel isEqualToString:@"iPhone10,3"])   return @"iPhone X";
+if ([deviceModel isEqualToString:@"iPhone10,6"])   return @"iPhone X";
+if ([deviceModel isEqualToString:@"iPhone11,8"])   return @"iPhone XR";
+if ([deviceModel isEqualToString:@"iPhone11,2"])   return @"iPhone XS";
+if ([deviceModel isEqualToString:@"iPhone11,6"])   return @"iPhone XS Max";
+if ([deviceModel isEqualToString:@"iPhone11,4"])   return @"iPhone XS Max";
+if ([deviceModel isEqualToString:@"iPhone12,1"])   return @"iPhone 11";
+if ([deviceModel isEqualToString:@"iPhone12,3"])   return @"iPhone 11 Pro";
+if ([deviceModel isEqualToString:@"iPhone12,5"])   return @"iPhone 11 Pro Max";
+if ([deviceModel isEqualToString:@"iPhone12,8"])   return @"iPhone SE2";
+if ([deviceModel isEqualToString:@"iPhone13,1"])   return @"iPhone 12 mini";
+if ([deviceModel isEqualToString:@"iPhone13,2"])   return @"iPhone 12";
+if ([deviceModel isEqualToString:@"iPhone13,3"])   return @"iPhone 12 Pro";
+if ([deviceModel isEqualToString:@"iPhone13,4"])   return @"iPhone 12 Pro Max";
+if ([deviceModel isEqualToString:@"iPod1,1"])      return @"iPod Touch 1G";
+if ([deviceModel isEqualToString:@"iPod2,1"])      return @"iPod Touch 2G";
+if ([deviceModel isEqualToString:@"iPod3,1"])      return @"iPod Touch 3G";
+if ([deviceModel isEqualToString:@"iPod4,1"])      return @"iPod Touch 4G";
+if ([deviceModel isEqualToString:@"iPod5,1"])      return @"iPod Touch (5 Gen)";
+if ([deviceModel isEqualToString:@"iPad1,1"])      return @"iPad";
+if ([deviceModel isEqualToString:@"iPad1,2"])      return @"iPad 3G";
+if ([deviceModel isEqualToString:@"iPad2,1"])      return @"iPad 2 (WiFi)";
+if ([deviceModel isEqualToString:@"iPad2,2"])      return @"iPad 2";
+if ([deviceModel isEqualToString:@"iPad2,3"])      return @"iPad 2 (CDMA)";
+if ([deviceModel isEqualToString:@"iPad2,4"])      return @"iPad 2";
+if ([deviceModel isEqualToString:@"iPad2,5"])      return @"iPad Mini (WiFi)";
+if ([deviceModel isEqualToString:@"iPad2,6"])      return @"iPad Mini";
+if ([deviceModel isEqualToString:@"iPad2,7"])      return @"iPad Mini (GSM+CDMA)";
+if ([deviceModel isEqualToString:@"iPad3,1"])      return @"iPad 3 (WiFi)";
+if ([deviceModel isEqualToString:@"iPad3,2"])      return @"iPad 3 (GSM+CDMA)";
+if ([deviceModel isEqualToString:@"iPad3,3"])      return @"iPad 3";
+if ([deviceModel isEqualToString:@"iPad3,4"])      return @"iPad 4 (WiFi)";
+if ([deviceModel isEqualToString:@"iPad3,5"])      return @"iPad 4";
+if ([deviceModel isEqualToString:@"iPad3,6"])      return @"iPad 4 (GSM+CDMA)";
+if ([deviceModel isEqualToString:@"iPad4,1"])      return @"iPad Air (WiFi)";
+if ([deviceModel isEqualToString:@"iPad4,2"])      return @"iPad Air (Cellular)";
+if ([deviceModel isEqualToString:@"iPad4,4"])      return @"iPad Mini 2 (WiFi)";
+if ([deviceModel isEqualToString:@"iPad4,5"])      return @"iPad Mini 2 (Cellular)";
+if ([deviceModel isEqualToString:@"iPad4,6"])      return @"iPad Mini 2";
+if ([deviceModel isEqualToString:@"iPad4,7"])      return @"iPad Mini 3";
+if ([deviceModel isEqualToString:@"iPad4,8"])      return @"iPad Mini 3";
+if ([deviceModel isEqualToString:@"iPad4,9"])      return @"iPad Mini 3";
+if ([deviceModel isEqualToString:@"iPad5,1"])      return @"iPad Mini 4 (WiFi)";
+if ([deviceModel isEqualToString:@"iPad5,2"])      return @"iPad Mini 4 (LTE)";
+if ([deviceModel isEqualToString:@"iPad5,3"])      return @"iPad Air 2";
+if ([deviceModel isEqualToString:@"iPad5,4"])      return @"iPad Air 2";
+if ([deviceModel isEqualToString:@"iPad6,3"])      return @"iPad Pro 9.7";
+if ([deviceModel isEqualToString:@"iPad6,4"])      return @"iPad Pro 9.7";
+if ([deviceModel isEqualToString:@"iPad6,7"])      return @"iPad Pro 12.9";
+if ([deviceModel isEqualToString:@"iPad6,8"])      return @"iPad Pro 12.9";
+
+if ([deviceModel isEqualToString:@"AppleTV2,1"])      return @"Apple TV 2";
+if ([deviceModel isEqualToString:@"AppleTV3,1"])      return @"Apple TV 3";
+if ([deviceModel isEqualToString:@"AppleTV3,2"])      return @"Apple TV 3";
+if ([deviceModel isEqualToString:@"AppleTV5,3"])      return @"Apple TV 4";
+
+if ([deviceModel isEqualToString:@"i386"])         return @"Simulator";
+if ([deviceModel isEqualToString:@"x86_64"])       return @"Simulator";
+    return deviceModel;
+}
+@end

package/ios/views/UpgradeView.m

@@ -36,7 +36,7 @@
 
 
 -(NSData *)getpng:(NSString*) name{
-    NSString *bundlePath = [[NSBundle mainBundle] pathForResource:@"upgrade" ofType:@"bundle"];
+    NSString *bundlePath = [[NSBundle mainBundle] pathForResource:@"RNEasyui" ofType:@"bundle"];
     NSBundle *bundle = [NSBundle bundleWithPath:bundlePath];
     NSString *imagePath = [bundle pathForResource:name ofType:@"png"];
     NSData *data = [NSData dataWithContentsOfFile:imagePath];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aks-dev/easyui",
-  "version": "1.0.46",
+  "version": "1.0.49",
   "description": "爱科森开发工具包(react-native)",
   "main": "./src/index.ts",
   "typings": "./src/index.d.ts",

package/utils/index.ts

@@ -2,8 +2,8 @@
  * @Author: shiguo
  * @Date: 2022-04-19 10:25:43
  * @LastEditors: shiguo
- * @LastEditTime: 2022-05-12 12:27:10
- * @FilePath: /@aks/easyui/utils/index.ts
+ * @LastEditTime: 2022-05-30 16:15:07
+ * @FilePath: /@aks-dev/easyui/utils/index.ts
  */
 
 
@@ -17,6 +17,10 @@ import * as rn from 'react-native'
 export declare const sleep: (msec?: number) => void;
 
 
+/**
+ * @description: 通过手势关闭键盘
+ * @return {*}
+ */
 export declare const keyboardDismissHandlers: rn.GestureResponderHandlers;
 
 export type CallBack = (...args: any[]) => void;

package/ios/Resources/upgrade.bundle/Contents/Info.plist

@@ -1,53 +0,0 @@
-<?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">
-<dict>
-	<key>BuildMachineOSBuild</key>
-	<string>21E258</string>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleExecutable</key>
-	<string>upgrade</string>
-	<key>CFBundleIdentifier</key>
-	<string>cn.sg.upgrade</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>upgrade</string>
-	<key>CFBundlePackageType</key>
-	<string>BNDL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleSupportedPlatforms</key>
-	<array>
-		<string>MacOSX</string>
-	</array>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-	<key>DTCompiler</key>
-	<string>com.apple.compilers.llvm.clang.1_0</string>
-	<key>DTPlatformBuild</key>
-	<string>13E500a</string>
-	<key>DTPlatformName</key>
-	<string>macosx</string>
-	<key>DTPlatformVersion</key>
-	<string>12.3</string>
-	<key>DTSDKBuild</key>
-	<string>21E226</string>
-	<key>DTSDKName</key>
-	<string>macosx12.3</string>
-	<key>DTXcode</key>
-	<string>1331</string>
-	<key>DTXcodeBuild</key>
-	<string>13E500a</string>
-	<key>LSMinimumSystemVersion</key>
-	<string>10.15</string>
-	<key>NSHumanReadableCopyright</key>
-	<string></string>
-	<key>UIDeviceFamily</key>
-	<array>
-		<integer>2</integer>
-		<integer>6</integer>
-	</array>
-</dict>
-</plist>

package/ios/Resources/upgrade.bundle/Contents/_CodeSignature/CodeResources

@@ -1,147 +0,0 @@
-<?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">
-<dict>
-	<key>files</key>
-	<dict>
-		<key>Resources/infor_colse_image.png</key>
-		<data>
-		yAZj03Sp3iiW2mUt9GhqoLV1AXY=
-		</data>
-		<key>Resources/upgrade_bg.png</key>
-		<data>
-		wsXDQwF8x6MyZpYcxUhpkYjS/Vo=
-		</data>
-	</dict>
-	<key>files2</key>
-	<dict>
-		<key>Resources/infor_colse_image.png</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			yAZj03Sp3iiW2mUt9GhqoLV1AXY=
-			</data>
-			<key>hash2</key>
-			<data>
-			ZN7WdHZkcQmFZmGgenwGO7gYong25Q8v6nLdTROcVJc=
-			</data>
-		</dict>
-		<key>Resources/upgrade_bg.png</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			wsXDQwF8x6MyZpYcxUhpkYjS/Vo=
-			</data>
-			<key>hash2</key>
-			<data>
-			NEIit2qfuxpK9fhEsuUszoKuN2F5lzwwwnWm3/HKyzY=
-			</data>
-		</dict>
-	</dict>
-	<key>rules</key>
-	<dict>
-		<key>^Resources/</key>
-		<true/>
-		<key>^Resources/.*\.lproj/</key>
-		<dict>
-			<key>optional</key>
-			<true/>
-			<key>weight</key>
-			<real>1000</real>
-		</dict>
-		<key>^Resources/.*\.lproj/locversion.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>1100</real>
-		</dict>
-		<key>^Resources/Base\.lproj/</key>
-		<dict>
-			<key>weight</key>
-			<real>1010</real>
-		</dict>
-		<key>^version.plist$</key>
-		<true/>
-	</dict>
-	<key>rules2</key>
-	<dict>
-		<key>.*\.dSYM($|/)</key>
-		<dict>
-			<key>weight</key>
-			<real>11</real>
-		</dict>
-		<key>^(.*/)?\.DS_Store$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>2000</real>
-		</dict>
-		<key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>
-		<dict>
-			<key>nested</key>
-			<true/>
-			<key>weight</key>
-			<real>10</real>
-		</dict>
-		<key>^.*</key>
-		<true/>
-		<key>^Info\.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^PkgInfo$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^Resources/</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^Resources/.*\.lproj/</key>
-		<dict>
-			<key>optional</key>
-			<true/>
-			<key>weight</key>
-			<real>1000</real>
-		</dict>
-		<key>^Resources/.*\.lproj/locversion.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>1100</real>
-		</dict>
-		<key>^Resources/Base\.lproj/</key>
-		<dict>
-			<key>weight</key>
-			<real>1010</real>
-		</dict>
-		<key>^[^/]+$</key>
-		<dict>
-			<key>nested</key>
-			<true/>
-			<key>weight</key>
-			<real>10</real>
-		</dict>
-		<key>^embedded\.provisionprofile$</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^version\.plist$</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-	</dict>
-</dict>
-</plist>