@aks-dev/easyui 1.0.58 → 1.0.61

package/android/src/main/java/com/easyui/RNEasyuiModule.java

@@ -2,7 +2,7 @@
  * @Author: shiguo
  * @Date: 2022-04-25 17:57:29
  * @LastEditors: shiguo
- * @LastEditTime: 2022-05-31 18:19:20
+ * @LastEditTime: 2022-06-02 13:16:45
  * @FilePath: /@aks-dev/easyui/android/src/main/java/com/easyui/RNEasyuiModule.java
  */
 
@@ -27,6 +27,8 @@ public class RNEasyuiModule extends ReactContextBaseJavaModule {
         return "RNEasyui";
     }
 
+
+    @Deprecated
     @ReactMethod
     public void getStatusBarHeight(final Promise promise) {
 
@@ -41,6 +43,8 @@ public class RNEasyuiModule extends ReactContextBaseJavaModule {
 
     }
 
+
+    @Deprecated
     @ReactMethod
     public void getNavigationBarHeight(final Promise promise) {
 

package/android/src/main/java/com/easyui/UpgradeModule.java

@@ -2,7 +2,7 @@
  * @Author: shiguo
  * @Date: 2022-05-05 13:57:25
  * @LastEditors: shiguo
- * @LastEditTime: 2022-05-25 11:47:17
+ * @LastEditTime: 2022-06-08 10:55:21
  * @FilePath: /@aks-dev/easyui/android/src/main/java/com/easyui/UpgradeModule.java
  */
 package com.easyui;
@@ -45,6 +45,7 @@ import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableMap;
 
 import org.jetbrains.annotations.NotNull;
+import org.w3c.dom.Text;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -104,6 +105,7 @@ public class UpgradeModule extends ReactContextBaseJavaModule {
     public void upgrade(final ReadableMap info, final Promise promise) {
         HashMap hashMap = info.toHashMap();
         String version = (String) hashMap.get("version");
+        String title = (String) hashMap.get("title");
         String downloadUrl = (String) hashMap.get("downloadUrl");
         String note = (String) hashMap.get("note");
         Boolean force = (Boolean) hashMap.get("force");
@@ -150,8 +152,10 @@ public class UpgradeModule extends ReactContextBaseJavaModule {
                 TextView contentView = view.findViewById(R.id.content);
                 Button confirmBtn = view.findViewById(R.id.btn_comfirm);
                 Button cancelBtn = view.findViewById(R.id.btn_cancel);
+                TextView titleView = view.findViewById(R.id.txt_title);
 
                 contentView.setText(note);
+                titleView.setText(title);
                 confirmBtn.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {

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

@@ -1,23 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/update_root"
-    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/upgrade_bg">
+    android:background="@drawable/upgrade_bg"
+    android:orientation="vertical">
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="190dp"
+        android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:paddingLeft="15dp"
-        android:paddingRight="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"/>
+            android:text="1.升级说明123123\\n2.升级说明22222" />
 
     </LinearLayout>
 
@@ -30,22 +44,22 @@
 
         <Button
             android:id="@+id/btn_comfirm"
+            style="?android:attr/borderlessButtonStyle"
             android:layout_width="200dp"
             android:layout_height="35dp"
-            android:textColor="#FFFFFF"
             android:background="@drawable/update_confirm_btn"
             android:text="立即升级"
-            style="?android:attr/borderlessButtonStyle" />
+            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:background="@drawable/update_cancel_btn"
             android:layout_marginTop="10dp"
-            android:textColor="#CCCCCC"
+            android:background="@drawable/update_cancel_btn"
             android:text="残忍拒绝"
-            style="?android:attr/borderlessButtonStyle" />
+            android:textColor="#CCCCCC" />
     </LinearLayout>
 </RelativeLayout>

package/jsbridge/index.ts

@@ -2,7 +2,7 @@
  * @Author: shiguo
  * @Date: 2022-04-19 10:23:01
  * @LastEditors: shiguo
- * @LastEditTime: 2022-05-31 18:19:53
+ * @LastEditTime: 2022-06-02 11:03:49
  * @FilePath: /@aks-dev/easyui/jsbridge/index.ts
  */
 
@@ -39,6 +39,7 @@ export declare const upgrade: (options: UpgradeOptions) => Promise<string>;
 export declare const getStatusBarHeight: () => Promise<number>;
 
 /**
+ * @deprecated 测量不准确，已放弃
  * @description: 获取navigation_bar_height
  * @return {*}
  */

package/lib/TableCell/TableCell.tsx

@@ -81,7 +81,6 @@ const styles = StyleSheet.create({
         paddingLeft: px2dp(15),
         paddingRight: px2dp(10),
         backgroundColor: 'white',
-
     },
     warpper: {
         flexGrow: 1,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aks-dev/easyui",
-  "version": "1.0.58",
+  "version": "1.0.61",
   "description": "移动端开发工具包",
   "main": "./src/index.ts",
   "typings": "./src/index.d.ts",

package/screen/px2dp.ts

@@ -2,7 +2,7 @@
  * @Author: shiguo
  * @Date: 2022-04-18 14:32:25
  * @LastEditors: shiguo
- * @LastEditTime: 2022-05-31 18:43:44
+ * @LastEditTime: 2022-06-02 11:04:21
  * @FilePath: /@aks-dev/easyui/screen/px2dp.ts
  */
 import { Dimensions, Platform, StatusBar } from 'react-native';
@@ -36,22 +36,16 @@ export const px2dp = (uiElePx: number) => {
 
 
 export const statusBarHeight = (() => {
-    if (isAndroid) {
-        if ((StatusBar.currentHeight || 0) > 20) return 40
-    }
+    if (isAndroid) return StatusBar.currentHeight || 24
     if (isiPhoneX) return 44
     return 20
 })()
 
 
 
-export let navigationBarHeight = 44
-
-
-
-import * as RNEasyui from '../jsbridge/RNEasyui';
-; (async () => {
-    navigationBarHeight = await RNEasyui.getNavigationBarHeight();
+export const navigationBarHeight = (() => {
+    if (isAndroid) return 56
+    return 44
 })()
 
 

package/screen/{text-fit.tsx → text-fit.ts}

@@ -2,8 +2,8 @@
  * @Author: shiguo
  * @Date: 2022-04-15 14:15:07
  * @LastEditors: shiguo
- * @LastEditTime: 2022-05-31 18:22:50
- * @FilePath: /@aks-dev/easyui/screen/init-fit.tsx
+ * @LastEditTime: 2022-06-02 11:03:59
+ * @FilePath: /@aks-dev/easyui/screen/text-fit.tsx
  */
 /**
  * 全局配置Text
@@ -58,5 +58,3 @@ Text.defaultProps.allowFontScaling = false
 TextInput.defaultProps.allowFontScaling = false
 
 
-
-import './px2dp'