From f40b7642d4de43126a7176b0352cf0c7858fa907 Mon Sep 17 00:00:00 2001
From: supervons <superfys@sina.com>
Date: Tue, 7 Nov 2023 15:23:44 +0800
Subject: [PATCH] =?UTF-8?q?[feature]=20Add=20new=20symbol=20@=E3=80=81?=
=?UTF-8?q?=C2=A5=E3=80=81=E2=82=AC.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
package.json | 1 +
src/component/ParcelKeyboardView.js | 2 +-
src/component/securityKeyboardBase.js | 11 +++++------
src/resource/json/keyboard.js | 5 ++++-
4 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/package.json b/package.json
index 56e28c4..69b3de4 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
"license": "",
"peerDependencies": {
"react-native": "^0.41.2",
+ "deprecated-react-native-prop-types": "^4.1.0",
"react-native-windows": "0.41.0-rc.1"
},
"dependencies": {
diff --git a/src/component/ParcelKeyboardView.js b/src/component/ParcelKeyboardView.js
index 2188a71..ceb2990 100644
--- a/src/component/ParcelKeyboardView.js
+++ b/src/component/ParcelKeyboardView.js
@@ -4,10 +4,10 @@ import {
LayoutAnimation,
Platform,
View,
- ViewPropTypes,
DeviceEventEmitter
} from "react-native"
import React from "react"
+import ViewPropTypes from "deprecated-react-native-prop-types"
const PropTypes = require("prop-types")
/* $FlowFixMe(>=0.54.0 site=react_native_oss) This comment suppresses an error
* found when Flow v0.54 was deployed. To see the error delete this comment and
diff --git a/src/component/securityKeyboardBase.js b/src/component/securityKeyboardBase.js
index 74eb255..d4d13de 100644
--- a/src/component/securityKeyboardBase.js
+++ b/src/component/securityKeyboardBase.js
@@ -350,7 +350,7 @@ class SecurityKeyboard extends Component {
} else if (this.state.keyboardType === "string") {
return this.addOrientationView(this.stringArr, 9, this._addStringView)
} else if (this.state.keyboardType === "symbol") {
- return this.addOrientationView(this.symbolArr, 9, this._addStringSymbol)
+ return this.addOrientationView(this.symbolArr, 10, this._addStringSymbol)
} else if (this.state.keyboardType === "upString") {
return this.addOrientationView(this.stringArrUp, 9, this._addStringView)
}
@@ -486,16 +486,16 @@ class SecurityKeyboard extends Component {
return numArr.slice(flag, flag + addNum).map((item, index) => {
let parent = styles.itemStringParentText4
let icon = styles.deleteIcon
- if (flag + index == 28) {
+ if (flag + index == 31) {
//设置返回键、空格、删除键的样式
parent = styles.itemStringParentSpace
icon = styles.spaceIcon
}
- if (flag + index == 27) {
+ if (flag + index == 30) {
icon = styles.backIcon
}
- if (flag == 27) {
+ if (flag == 30) {
return this.addItemImageView(
index,
parent,
@@ -583,8 +583,7 @@ class SecurityKeyboard extends Component {
<Image
style={styles.closeIcon}
source={{
- uri:
- "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACIAAAASCAYAAAA+PQxvAAAAAXNSR0IArs4c6QAAAppJREFUSA29lt9rUmEYx9+jZ2mh+YtMW41+0hhEdBFFV4XTfiyPP5awlED6s7wIQRBKULEu2nLOURQRFd1GQRfBIGgtXU2nx7fvMzxyFHUq6Xtz3vO+z4/P830edyb4JekJY0xrdzgexGKxv9hPbD2UJOMm54+ZIOxqkHWacx78sbGRi0aj+klR7EEw9pwzdptxbtJM6XSLgiB8xoFra3NzIjCRSOQwlFiGANcExj4JongPT8aWJOlYhfMiYM7hYMVss/ni8XhlHOoQxHa5vAwVrjYhXJlM5uceCCUMhULTtWp1HZRnxgWDHKbdapUgrqghKH8LhF6CweDxRr1eHAeM3+83M1legeqXMZwfNVqtm5SgvLRoWFsrnU5/14jidczMVzh4/tfMhMNhC2s08gSByj8c0Onm1RAE0KaIQtSmjCC8wED7UqnUjnI/zBPtsKIdebTjEgp8f8hgcCeTyV+dMbqCkJEaBlLmUYU0LEwgELDxen0VSlxEondMq/Vks9mtTgh6b2uN2kDdJlQzX6tUnqK6g2qbfnvYHuGyvEYQKOTtlF7v7gVBcXqC0KUCg0BfENA1KAyUsMO2gKG/ACXeGIxGD9T8TTF7rZ6tUTtQm+R6fQ3KnIXDKqrz9mrTfUk6iu9EAbZzmInXVsZuPcrlyup43fZ9FVEcSBmtKN5oKVOtPuvWJpw5djgn4DkAv8KQ3xwEgvIMpIgC1E8Z3DnlWq0A21ko8RIQd6DatuK733MoEArW+WuyWK3eUqlkabbuPAKuG83mhUQi8We/5Or7oUHI2efznRAaDfo2nUYA+ms5g+NZ7IuAuDssBMUcCYQcMQ8zzW/TSXonCLvTuTDq/zQjg1DykNd7qsZYDkP8zWgyLY2iBMWh9Q8m1EZzNShdSQAAAABJRU5ErkJggg=="
+ uri: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACIAAAASCAYAAAA+PQxvAAAAAXNSR0IArs4c6QAAAppJREFUSA29lt9rUmEYx9+jZ2mh+YtMW41+0hhEdBFFV4XTfiyPP5awlED6s7wIQRBKULEu2nLOURQRFd1GQRfBIGgtXU2nx7fvMzxyFHUq6Xtz3vO+z4/P830edyb4JekJY0xrdzgexGKxv9hPbD2UJOMm54+ZIOxqkHWacx78sbGRi0aj+klR7EEw9pwzdptxbtJM6XSLgiB8xoFra3NzIjCRSOQwlFiGANcExj4JongPT8aWJOlYhfMiYM7hYMVss/ni8XhlHOoQxHa5vAwVrjYhXJlM5uceCCUMhULTtWp1HZRnxgWDHKbdapUgrqghKH8LhF6CweDxRr1eHAeM3+83M1legeqXMZwfNVqtm5SgvLRoWFsrnU5/14jidczMVzh4/tfMhMNhC2s08gSByj8c0Onm1RAE0KaIQtSmjCC8wED7UqnUjnI/zBPtsKIdebTjEgp8f8hgcCeTyV+dMbqCkJEaBlLmUYU0LEwgELDxen0VSlxEondMq/Vks9mtTgh6b2uN2kDdJlQzX6tUnqK6g2qbfnvYHuGyvEYQKOTtlF7v7gVBcXqC0KUCg0BfENA1KAyUsMO2gKG/ACXeGIxGD9T8TTF7rZ6tUTtQm+R6fQ3KnIXDKqrz9mrTfUk6iu9EAbZzmInXVsZuPcrlyup43fZ9FVEcSBmtKN5oKVOtPuvWJpw5djgn4DkAv8KQ3xwEgvIMpIgC1E8Z3DnlWq0A21ko8RIQd6DatuK733MoEArW+WuyWK3eUqlkabbuPAKuG83mhUQi8We/5Or7oUHI2efznRAaDfo2nUYA+ms5g+NZ7IuAuDssBMUcCYQcMQ8zzW/TSXonCLvTuTDq/zQjg1DykNd7qsZYDkP8zWgyLY2iBMWh9Q8m1EZzNShdSQAAAABJRU5ErkJggg=="
}}
/>
</TouchableOpacity>
diff --git a/src/resource/json/keyboard.js b/src/resource/json/keyboard.js
index a700a61..64d8820 100644
--- a/src/resource/json/keyboard.js
+++ b/src/resource/json/keyboard.js
@@ -27,7 +27,10 @@ export const keyboardJSON = {
"~",
"#",
"%",
- "."
+ ".",
+ "@",
+ "¥",
+ "€"
],
stringArr: [
"q",