@aks-dev/easyui 1.0.60 → 1.0.64

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/README.md +16 -6
  2. package/android/build.gradle +4 -0
  3. package/android/src/main/java/com/easyui/UpgradeModule.java +5 -1
  4. package/android/src/main/res/layout/update_dialog.xml +24 -10
  5. package/lib/Echarts/helper.tsx +6 -4
  6. package/lib/TableCell/TableCell.tsx +0 -1
  7. package/package.json +5 -4
package/README.md CHANGED
@@ -2,7 +2,7 @@
2
2
  * @Author: shiguo
3
3
  * @Date: 2022-04-25 17:57:29
4
4
  * @LastEditors: shiguo
5
- * @LastEditTime: 2022-06-01 14:55:18
5
+ * @LastEditTime: 2022-06-14 13:56:32
6
6
  * @FilePath: /@aks-dev/easyui/README.md
7
7
  -->
8
8
 
@@ -14,14 +14,22 @@ or
14
14
 
15
15
  `$ yarn add @aks-dev/easyui`
16
16
 
17
- ### 禁止文本随系统缩放
18
- + <b>import '@aks-dev/easyui/screen/text-fit'</b>
19
-
20
- ### UI组件
17
+ ### screen
18
+ ---
19
+ + 禁止文本随系统缩放
20
+ ```
21
+ import '@aks-dev/easyui/screen/text-fit'
22
+ ```
23
+ + px2dp
24
+ + px2sp
25
+ + statusBarHeight
26
+ + navigationBarHeight
27
+
28
+ ### ui
21
29
  ---
22
30
 
23
31
  + Badge
24
- + EasyHub
32
+ + Hub
25
33
  + Modal
26
34
  + EchartsView
27
35
  + MutiPictureView
@@ -50,3 +58,5 @@ or
50
58
  |:----|:----|
51
59
  |getAppVersion|获取App版本号|
52
60
  |upgrade|app升级|
61
+
62
+
package/android/build.gradle CHANGED
@@ -4,6 +4,10 @@ buildscript {
4
4
  repositories {
5
5
  mavenCentral()
6
6
  google()
7
+ ///https://blog.csdn.net/xiaopihair123/article/details/119422895
8
+ maven{ url 'https://maven.aliyun.com/repository/google'}
9
+ maven{ url 'https://maven.aliyun.com/repository/gradle-plugin'}
10
+ maven{ url 'https://maven.aliyun.com/repository/public'}
7
11
  }
8
12
 
9
13
  dependencies {
package/android/src/main/java/com/easyui/UpgradeModule.java CHANGED
@@ -2,7 +2,7 @@
2
2
  * @Author: shiguo
3
3
  * @Date: 2022-05-05 13:57:25
4
4
  * @LastEditors: shiguo
5
- * @LastEditTime: 2022-05-25 11:47:17
5
+ * @LastEditTime: 2022-06-08 10:55:21
6
6
  * @FilePath: /@aks-dev/easyui/android/src/main/java/com/easyui/UpgradeModule.java
7
7
  */
8
8
  package com.easyui;
@@ -45,6 +45,7 @@ import com.facebook.react.bridge.ReactMethod;
45
45
  import com.facebook.react.bridge.ReadableMap;
46
46
 
47
47
  import org.jetbrains.annotations.NotNull;
48
+ import org.w3c.dom.Text;
48
49
 
49
50
  import java.io.File;
50
51
  import java.io.FileOutputStream;
@@ -104,6 +105,7 @@ public class UpgradeModule extends ReactContextBaseJavaModule {
104
105
  public void upgrade(final ReadableMap info, final Promise promise) {
105
106
  HashMap hashMap = info.toHashMap();
106
107
  String version = (String) hashMap.get("version");
108
+ String title = (String) hashMap.get("title");
107
109
  String downloadUrl = (String) hashMap.get("downloadUrl");
108
110
  String note = (String) hashMap.get("note");
109
111
  Boolean force = (Boolean) hashMap.get("force");
@@ -150,8 +152,10 @@ public class UpgradeModule extends ReactContextBaseJavaModule {
150
152
  TextView contentView = view.findViewById(R.id.content);
151
153
  Button confirmBtn = view.findViewById(R.id.btn_comfirm);
152
154
  Button cancelBtn = view.findViewById(R.id.btn_cancel);
155
+ TextView titleView = view.findViewById(R.id.txt_title);
153
156
 
154
157
  contentView.setText(note);
158
+ titleView.setText(title);
155
159
  confirmBtn.setOnClickListener(new View.OnClickListener() {
156
160
  @Override
157
161
  public void onClick(View v) {
package/android/src/main/res/layout/update_dialog.xml CHANGED
@@ -1,23 +1,37 @@
1
1
  <?xml version="1.0" encoding="utf-8"?>
2
2
  <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3
3
  android:id="@+id/update_root"
4
- android:orientation="vertical" android:layout_width="match_parent"
4
+ android:layout_width="match_parent"
5
5
  android:layout_height="wrap_content"
6
- android:background="@drawable/upgrade_bg">
6
+ android:background="@drawable/upgrade_bg"
7
+ android:orientation="vertical">
7
8
 
8
9
  <LinearLayout
9
10
  android:layout_width="match_parent"
10
- android:layout_height="190dp"
11
+ android:layout_height="wrap_content"
11
12
  android:layout_alignParentBottom="true"
12
13
  android:paddingLeft="15dp"
13
- android:paddingRight="15dp">
14
+ android:paddingRight="15dp"
15
+ android:orientation="vertical"
16
+ >
17
+
18
+ <TextView
19
+ android:id="@+id/txt_title"
20
+ android:layout_width="match_parent"
21
+ android:layout_height="wrap_content"
22
+ android:gravity="center"
23
+ android:text="标题"
24
+ android:textColor="#333333"
25
+ android:textSize="16sp"
26
+ android:textStyle="bold" />
14
27
 
15
28
  <TextView
16
29
  android:id="@+id/content"
17
30
  android:layout_width="wrap_content"
18
31
  android:layout_height="wrap_content"
32
+ android:minHeight="190dp"
19
33
  android:singleLine="false"
20
- android:text="1.升级说明123123\\n2.升级说明22222"/>
34
+ android:text="1.升级说明123123\\n2.升级说明22222" />
21
35
 
22
36
  </LinearLayout>
23
37
 
@@ -30,22 +44,22 @@
30
44
 
31
45
  <Button
32
46
  android:id="@+id/btn_comfirm"
47
+ style="?android:attr/borderlessButtonStyle"
33
48
  android:layout_width="200dp"
34
49
  android:layout_height="35dp"
35
- android:textColor="#FFFFFF"
36
50
  android:background="@drawable/update_confirm_btn"
37
51
  android:text="立即升级"
38
- style="?android:attr/borderlessButtonStyle" />
52
+ android:textColor="#FFFFFF" />
39
53
 
40
54
  <Button
41
55
  android:id="@+id/btn_cancel"
56
+ style="?android:attr/borderlessButtonStyle"
42
57
  android:layout_width="200dp"
43
58
  android:layout_height="35dp"
44
59
  android:layout_alignBottom="@id/btn_comfirm"
45
- android:background="@drawable/update_cancel_btn"
46
60
  android:layout_marginTop="10dp"
47
- android:textColor="#CCCCCC"
61
+ android:background="@drawable/update_cancel_btn"
48
62
  android:text="残忍拒绝"
49
- style="?android:attr/borderlessButtonStyle" />
63
+ android:textColor="#CCCCCC" />
50
64
  </LinearLayout>
51
65
  </RelativeLayout>
package/lib/Echarts/helper.tsx CHANGED
@@ -2,8 +2,8 @@
2
2
  * @Author: shiguo
3
3
  * @Date: 2022-05-05 15:56:21
4
4
  * @LastEditors: shiguo
5
- * @LastEditTime: 2022-05-17 09:17:19
6
- * @FilePath: /@aks/easyui/lib/Echarts/helper.tsx
5
+ * @LastEditTime: 2022-06-27 18:01:39
6
+ * @FilePath: /@aks-dev/easyui/lib/Echarts/helper.tsx
7
7
  */
8
8
 
9
9
 
@@ -55,9 +55,11 @@ export const getHtml = (props: { backgroundColor: any }) => {
55
55
  });
56
56
  // 再进行还原
57
57
  do {
58
- result = result.replace('\"~ha~', '').replace('~ha~\"', '').replace(/\\n/g, '').replace(/\\\"/g, "\"");//最后一个replace将release模式中莫名生成的\"转换成"
58
+ result = result.replace('\"~ha~', '').replace('~ha~\"', '').replace(/\\\"/g, "\"");//最后一个replace将release模式中莫名生成的\"转换成"
59
59
  } while (result.indexOf('~ha~') >= 0);
60
60
 
61
61
  return result;
62
62
  }
63
-
63
+
64
+
65
+ ///.replace(/\\n/g, '')
package/lib/TableCell/TableCell.tsx CHANGED
@@ -81,7 +81,6 @@ const styles = StyleSheet.create({
81
81
  paddingLeft: px2dp(15),
82
82
  paddingRight: px2dp(10),
83
83
  backgroundColor: 'white',
84
-
85
84
  },
86
85
  warpper: {
87
86
  flexGrow: 1,
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@aks-dev/easyui",
3
- "version": "1.0.60",
4
- "description": "移动端开发工具包",
3
+ "version": "1.0.64",
4
+ "description": "移动端App开发工具包",
5
5
  "main": "./src/index.ts",
6
6
  "typings": "./src/index.d.ts",
7
7
  "scripts": {
@@ -28,10 +28,10 @@
28
28
  "!/tsconfig.json",
29
29
  "!/tsconfig.md"
30
30
  ],
31
- "homepage": "https://gitee.com/the_period_of_the_ten_kingdoms/aks-easyui",
31
+ "homepage": "https://gitee.com/the_period_of_the_ten_kingdoms",
32
32
  "repository": {
33
33
  "type": "git",
34
- "url": "https://gitee.com/the_period_of_the_ten_kingdoms/aks-easyui"
34
+ "url": "https://gitee.com/the_period_of_the_ten_kingdoms/easyui"
35
35
  },
36
36
  "author": "shiguo",
37
37
  "license": "MIT",
@@ -45,6 +45,7 @@
45
45
  "echarts": "^5.3.2",
46
46
  "react-native-image-zoom-viewer": "^3.0.1",
47
47
  "react-native-modal": "^13.0.1",
48
+ "react-native-smart-refresh": "^1.1.6",
48
49
  "react-native-swipe-list-view": "^3.2.9"
49
50
  },
50
51
  "devDependencies": {