@aks-dev/easyui 1.0.156 → 1.0.157

package/android/src/main/res/drawable/update_cancel_btn.xml

@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <!-- 填充的颜色 -->
-    <!--<solid android:color="@android:color/transparent" />-->
-    <!-- 设置按钮的四个角为弧形 -->
-    <!-- android:radius 弧形的半径 -->
-    <corners android:radius="4dp" />
-    <!--边框的宽度及颜色-->
-    <stroke android:width="2px" android:color="#CCCCCC" />
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <!-- 填充的颜色 -->
+    <!--<solid android:color="@android:color/transparent" />-->
+    <!-- 设置按钮的四个角为弧形 -->
+    <!-- android:radius 弧形的半径 -->
+    <corners android:radius="4dp" />
+    <!--边框的宽度及颜色-->
+    <stroke android:width="2px" android:color="#CCCCCC" />
 </shape>

package/android/src/main/res/drawable/update_confirm_btn.xml

@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <!-- 填充的颜色 -->
-    <solid android:color="#EA6561" />
-    <!-- 设置按钮的四个角为弧形 -->
-    <!-- android:radius 弧形的半径 -->
-    <corners android:radius="4dp" />
-    <!--边框的宽度及颜色-->
-    <!--<stroke android:width="2px" android:color="#388e3c" />-->
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <!-- 填充的颜色 -->
+    <solid android:color="#EA6561" />
+    <!-- 设置按钮的四个角为弧形 -->
+    <!-- android:radius 弧形的半径 -->
+    <corners android:radius="4dp" />
+    <!--边框的宽度及颜色-->
+    <!--<stroke android:width="2px" android:color="#388e3c" />-->
 </shape>

package/android/src/main/res/layout/update_dialog.xml

@@ -1,65 +1,65 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/update_root"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@drawable/upgrade_bg"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:paddingLeft="15dp"
-        android:paddingRight="15dp"
-        android:orientation="vertical"
-        >
-
-        <TextView
-            android:id="@+id/txt_title"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="标题"
-            android:textColor="#333333"
-            android:textSize="16sp"
-            android:textStyle="bold" />
-
-        <TextView
-            android:id="@+id/content"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:minHeight="190dp"
-            android:singleLine="false"
-            android:text="1.升级说明123123\\n2.升级说明22222" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="120dp"
-        android:layout_alignParentBottom="true"
-        android:gravity="center"
-        android:orientation="vertical">
-
-        <Button
-            android:id="@+id/btn_comfirm"
-            style="?android:attr/borderlessButtonStyle"
-            android:layout_width="200dp"
-            android:layout_height="35dp"
-            android:background="@drawable/update_confirm_btn"
-            android:text="立即升级"
-            android:textColor="#FFFFFF" />
-
-        <Button
-            android:id="@+id/btn_cancel"
-            style="?android:attr/borderlessButtonStyle"
-            android:layout_width="200dp"
-            android:layout_height="35dp"
-            android:layout_alignBottom="@id/btn_comfirm"
-            android:layout_marginTop="10dp"
-            android:background="@drawable/update_cancel_btn"
-            android:text="残忍拒绝"
-            android:textColor="#CCCCCC" />
-    </LinearLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/update_root"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/upgrade_bg"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:paddingLeft="15dp"
+        android:paddingRight="15dp"
+        android:orientation="vertical"
+        >
+
+        <TextView
+            android:id="@+id/txt_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="标题"
+            android:textColor="#333333"
+            android:textSize="16sp"
+            android:textStyle="bold" />
+
+        <TextView
+            android:id="@+id/content"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:minHeight="190dp"
+            android:singleLine="false"
+            android:text="1.升级说明123123\\n2.升级说明22222" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="120dp"
+        android:layout_alignParentBottom="true"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <Button
+            android:id="@+id/btn_comfirm"
+            style="?android:attr/borderlessButtonStyle"
+            android:layout_width="200dp"
+            android:layout_height="35dp"
+            android:background="@drawable/update_confirm_btn"
+            android:text="立即升级"
+            android:textColor="#FFFFFF" />
+
+        <Button
+            android:id="@+id/btn_cancel"
+            style="?android:attr/borderlessButtonStyle"
+            android:layout_width="200dp"
+            android:layout_height="35dp"
+            android:layout_alignBottom="@id/btn_comfirm"
+            android:layout_marginTop="10dp"
+            android:background="@drawable/update_cancel_btn"
+            android:text="残忍拒绝"
+            android:textColor="#CCCCCC" />
+    </LinearLayout>
 </RelativeLayout>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aks-dev/easyui",
-  "version": "1.0.156",
+  "version": "1.0.157",
   "description": "工具箱",
   "main": "./src/index.ts",
   "typings": "./src/index.d.ts",

package/screen/px2sp.ts

@@ -1,80 +1,80 @@
-/*
- * @Author: shiguo
- * @Date: 2021-04-27 10:40:36
- * @LastEditors: shiguo
- * @LastEditTime: 2022-10-28 17:14:14
- * @FilePath: /@aks-dev/easyui/screen/px2sp.ts
- */
-import { Dimensions, PixelRatio } from 'react-native';
-const pixelRatio = PixelRatio.get();
-const width = Dimensions.get('window').width;      //设备的宽度
-const height = Dimensions.get('window').height;    //设备的高度
-
-export const px2sp = (size: number) => {
-
-// console.log({
-//     pixelRatio,
-//     width,
-//     height
-// })
-
-    if (pixelRatio === 2) {
-        // iphone 5s and older Androids
-        if (width < 360) {
-            return size * 0.95;
-        }
-        // iphone 5
-        if (height < 667) {
-            return size;
-            // iphone 6-6s
-        } else if (height >= 667 && height <= 735) {
-            return size * 1.15;
-        }
-        // older phablets
-        return size * 1.25;
-    }
-    if (pixelRatio === 3) {
-        // catch Android font scaling on small machines
-        // where pixel ratio / font scale ratio => 3:3
-        if (width <= 360) {
-            return size;
-        }
-        // Catch other weird android width sizings
-        if (height < 667) {
-            return size * 1.15;
-            // catch in-between size Androids and scale font up
-            // a tad but not too much
-        }
-        if (height >= 667 && height <= 735) {
-            return size * 1.2;
-        }
-        // catch larger devices
-        // ie iphone 6s plus / 7 plus / mi note 等等
-        return size * 1.27;
-    }
-    if (pixelRatio === 3.5) {
-        // catch Android font scaling on small machines
-        // where pixel ratio / font scale ratio => 3:3
-        if (width <= 360) {
-            return size;
-            // Catch other smaller android height sizings
-        }
-        if (height < 667) {
-            return size * 1.15;//older:1.20
-            // catch in-between size Androids and scale font up
-            // a tad but not too much
-        }
-        if (height >= 667 && height <= 735) {
-            return size * 1.20;//older:1.25
-        }
-        // catch larger phablet devices
-
-        return size * 1.25;//older:1.30
-    }
-    // if older device ie pixelRatio !== 2 || 3 || 3.5
-    return size;
-};
-
-
-
-
+/*
+ * @Author: shiguo
+ * @Date: 2021-04-27 10:40:36
+ * @LastEditors: shiguo
+ * @LastEditTime: 2022-10-28 17:14:14
+ * @FilePath: /@aks-dev/easyui/screen/px2sp.ts
+ */
+import { Dimensions, PixelRatio } from 'react-native';
+const pixelRatio = PixelRatio.get();
+const width = Dimensions.get('window').width;      //设备的宽度
+const height = Dimensions.get('window').height;    //设备的高度
+
+export const px2sp = (size: number) => {
+
+// console.log({
+//     pixelRatio,
+//     width,
+//     height
+// })
+
+    if (pixelRatio === 2) {
+        // iphone 5s and older Androids
+        if (width < 360) {
+            return size * 0.95;
+        }
+        // iphone 5
+        if (height < 667) {
+            return size;
+            // iphone 6-6s
+        } else if (height >= 667 && height <= 735) {
+            return size * 1.15;
+        }
+        // older phablets
+        return size * 1.25;
+    }
+    if (pixelRatio === 3) {
+        // catch Android font scaling on small machines
+        // where pixel ratio / font scale ratio => 3:3
+        if (width <= 360) {
+            return size;
+        }
+        // Catch other weird android width sizings
+        if (height < 667) {
+            return size * 1.15;
+            // catch in-between size Androids and scale font up
+            // a tad but not too much
+        }
+        if (height >= 667 && height <= 735) {
+            return size * 1.2;
+        }
+        // catch larger devices
+        // ie iphone 6s plus / 7 plus / mi note 等等
+        return size * 1.27;
+    }
+    if (pixelRatio === 3.5) {
+        // catch Android font scaling on small machines
+        // where pixel ratio / font scale ratio => 3:3
+        if (width <= 360) {
+            return size;
+            // Catch other smaller android height sizings
+        }
+        if (height < 667) {
+            return size * 1.15;//older:1.20
+            // catch in-between size Androids and scale font up
+            // a tad but not too much
+        }
+        if (height >= 667 && height <= 735) {
+            return size * 1.20;//older:1.25
+        }
+        // catch larger phablet devices
+
+        return size * 1.25;//older:1.30
+    }
+    // if older device ie pixelRatio !== 2 || 3 || 3.5
+    return size;
+};
+
+
+
+