From 2732cf892f8d94b1cb2568bc443d8497abb39d73 Mon Sep 17 00:00:00 2001
From: pc-ls <khz@khz.com>
Date: Thu, 9 Jun 2022 18:28:51 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=AB=98=E6=95=88=E3=80=91=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=20yeahmao/hexConvert=20=20=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=EF=BC=8C=E5=B0=86x64dbg=E6=B1=87=E7=BC=96=E8=BD=AC?=
 =?UTF-8?q?=E6=8D=A2=E4=B8=BA=E5=AD=97=E7=AC=A6=E4=B8=B2=E5=92=8C=E5=AD=97?=
 =?UTF-8?q?=E8=8A=82=E6=95=B0=E7=BB=84=EF=BC=8C=E6=8F=90=E9=AB=98=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81=E9=80=9F=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                |   5 ++
 src/config.js                            |   4 +
 src/i18n/locales/en/hexString.i18n.json5 |   2 +-
 src/i18n/locales/en/main.i18n.json5      |   2 +
 src/i18n/locales/zh_CN/main.i18n.json5   |   2 +
 src/tool.router.js                       |   4 +
 src/tool.vue                             |   6 +-
 src/views/yeahmao/hexConvert.vue         | 106 +++++++++++++++++++++++
 8 files changed, 129 insertions(+), 2 deletions(-)
 create mode 100644 src/views/yeahmao/hexConvert.vue

diff --git a/README.md b/README.md
index 20335f8..a04d0e4 100644
--- a/README.md
+++ b/README.md
@@ -75,3 +75,8 @@ npm run build -adapter=[chrome|edge|utools|firefox|web]
 | ARM/HEX      | `互转`                                                                                                                          |×|
 | Bcrypt       | `加密`,`验证`                                                                                                                     |√|
 | IP网络计算器      | `子网掩码各个进制表示换算,IP地址进制表示换算`                                                                                                     |√|
+
+## 功能列表-yeahmao
+| 功能           | 说明                                                                                                                            |离线使用|
+|--------------|-------------------------------------------------------------------------------------------------------------------------------|---|
+| 字节转码           | `16进制字节流`, `美化后`, `字符串格式`, `字节数组格式`,``                                                                                       |√|
\ No newline at end of file
diff --git a/src/config.js b/src/config.js
index 495cb5d..864dcd2 100644
--- a/src/config.js
+++ b/src/config.js
@@ -21,6 +21,7 @@ const category = [
     {'name': 'check'},
     {'name': 'generate'},
     {'name': 'other'},
+    {'name': 'yeahmao'},
 ]
 
 const tool = [
@@ -64,6 +65,9 @@ const tool = [
     {'name': 'armConverter', 'cat': ['conversion']},
     {'name': 'bcrypt', 'cat': ['encryption','check']},
     {'name': 'ipcalc', 'cat': ['generate']},
+
+    // yeahmao
+    {'name': 'hexConvert', 'cat': ['yeahmao']},
 ]
 
 // 工具类功能配置
diff --git a/src/i18n/locales/en/hexString.i18n.json5 b/src/i18n/locales/en/hexString.i18n.json5
index 693c48b..b456be9 100644
--- a/src/i18n/locales/en/hexString.i18n.json5
+++ b/src/i18n/locales/en/hexString.i18n.json5
@@ -1,5 +1,5 @@
 {
-    "input": "Input",
+    "input": "assemble",
     "output": "Output",
     "uppercase": "Uppercase",
 }
diff --git a/src/i18n/locales/en/main.i18n.json5 b/src/i18n/locales/en/main.i18n.json5
index ca07ec8..ae68cf3 100644
--- a/src/i18n/locales/en/main.i18n.json5
+++ b/src/i18n/locales/en/main.i18n.json5
@@ -39,6 +39,7 @@
     "category_check": "Validator",
     "category_generate": "Generate",
     "category_other": "Other",
+    "category_yeahmao": "yeahmao",
     // tool
     "tool_hash": "Hash",
     "tool_encrypt": "Encrypt & Decrypt",
@@ -73,6 +74,7 @@
     "tool_armConverter": "ARM/HEX",
     "tool_bcrypt": "Bcrypt",
     "tool_ipcalc": "Ipcalc",
+    "tool_hexConvert": "hexConvert",
     // other
     "css_main_category_item_style": "padding: 0 10px",
     "editor_line_wrapping": "Line Wrapping",
diff --git a/src/i18n/locales/zh_CN/main.i18n.json5 b/src/i18n/locales/zh_CN/main.i18n.json5
index 8aa2293..d66b5a4 100644
--- a/src/i18n/locales/zh_CN/main.i18n.json5
+++ b/src/i18n/locales/zh_CN/main.i18n.json5
@@ -39,6 +39,7 @@
     "category_check": "校验",
     "category_generate": "生成",
     "category_other": "其他",
+    "category_yeahmao": "夜猫逐梦",
     // 工具
     "tool_hash": "哈希(hash)",
     "tool_encrypt": "加密/解密",
@@ -73,6 +74,7 @@
     "tool_armConverter": "ARM/HEX",
     "tool_bcrypt": "Bcrypt",
     "tool_ipcalc": "IP网络计算器",
+    "tool_hexConvert": "字节转换",
     // 其他
     "css_main_category_item_style": "padding: 0 20px",
     "editor_line_wrapping": "自动换行",
diff --git a/src/tool.router.js b/src/tool.router.js
index e6e05fc..5d02f99 100644
--- a/src/tool.router.js
+++ b/src/tool.router.js
@@ -161,6 +161,10 @@ const routes = [
     {
         path: '/tool/ipcalc',
         component: r => require(['./views/tool/ipcalc.vue'], r)
+    },
+    {
+        path: '/yeahmao/hexConvert',
+        component: r => require(['./views/yeahmao/hexConvert.vue'], r)
     }
 ]
 
diff --git a/src/tool.vue b/src/tool.vue
index bd2a94c..c7c928a 100644
--- a/src/tool.vue
+++ b/src/tool.vue
@@ -57,7 +57,11 @@ export default {
     watch: {
         currentTool(name) {
             model.setCurrentTool(name)
-            this.$router.push('/tool/' + name)
+            if (name == 'hexConvert') {
+                this.$router.push('/yeahmao/' + name)
+            } else {
+                this.$router.push('/tool/' + name)
+            }
         },
     },
     created() {
diff --git a/src/views/yeahmao/hexConvert.vue b/src/views/yeahmao/hexConvert.vue
new file mode 100644
index 0000000..690552b
--- /dev/null
+++ b/src/views/yeahmao/hexConvert.vue
@@ -0,0 +1,106 @@
+<template>
+    <heightResize ignore :append="['.page-option-block']" @resize="resize">
+        <autoHeightTextarea v-model="current.input" :height="inputHeight" :placeholder="$t('hexString_input')"/>
+        <option-block class="page-option-block">
+            <FormItem>
+                <ButtonGroup>
+                    <Button type="primary" @click="handle()">Convert</Button>
+                    <!-- <Button type="primary" @click="handle('str')">Hex -> String</Button> -->
+                </ButtonGroup>
+            </FormItem>
+            <FormItem>
+                <Checkbox v-model="current.isUppercase">{{ $t('hexString_uppercase') }}</Checkbox>
+            </FormItem>
+        </option-block>
+        <span>美化的内容&nbsp;&nbsp;&nbsp;&nbsp;：</span><input class="input_width_100" type="text" v-model="current.output_beautiful">
+        <br>
+        <span>字符串格式&nbsp;&nbsp;&nbsp;&nbsp;：</span><input class="input_width_100" type="text" v-model="current.output_str">
+        <br>
+        <span>字节数组格式：</span><input class="input_width_100" type="text" v-model="current.output_bytes">
+        <autoHeightTextarea :value="current.output" :height="outputHeight" :placeholder="$t('hexString_output')"/>
+    </heightResize>
+</template>
+<script>
+import heightResize from "../tool/components/heightResize";
+import autoHeightTextarea from "../tool/components/autoHeightTextarea";
+
+export default {
+    components: {
+        heightResize,
+        autoHeightTextarea
+    },
+    created() {
+        this.$initToolData('input')
+    },
+    methods: {
+        handle() {
+            console.log('enter...')
+            var bytes = ''
+            if (this.current.input) {
+                var lines = this.current.input.split('\n');
+                lines.forEach(line => {
+                    console.log(line)
+                    var items = line.split('|')
+                    if (items.length != 4) {
+                        return
+                    }
+
+                    bytes += items[1]
+                    // items.forEach(item => {
+                    //     console.log(item)
+                    // })
+                })
+            }
+            console.log('leave...', bytes)
+            this.current.output = bytes
+
+            // 
+            this.current.output_beautiful = bytes.replaceAll(':', '').replaceAll(' ', '')
+            if (this.current.output_beautiful.length % 2 == 1) {
+                alert('数据有误，请检查后再尝试')
+                return;
+            }
+
+            var lst = []
+            for (var i = 0; i < this.current.output_beautiful.length / 2; ++i) {
+                lst.push(this.current.output_beautiful.slice(2*i, 2*i + 2))
+            }
+            this.current.output_str = ''
+            lst.forEach(item => {
+                this.current.output_str += '\\x' + item;
+            })
+            this.current.output_bytes = ''
+            lst.forEach(item => {
+                this.current.output_bytes += '0x' + item + ', ';
+            })
+        },
+        resize(height) {
+            this.inputHeight = Math.min(320, Math.ceil(height / 2))
+            // this.outputHeight = height - this.inputHeight
+            this.outputHeight = 180
+        }
+    },
+    data() {
+        return {
+            current: {
+                input: "",
+                isUppercase: false,
+                output_beautiful: "",       // 一行，全字节内容，美化的内容
+                output_str: "",             // 字符串格式
+                output_bytes: "",           // 字节数组格式
+                output: "",
+                operation: ""
+            },
+            inputHeight: 100,
+            outputHeight: 100
+        }
+    },
+}
+</script>
+
+<style scoped>
+.input_width_100 {
+    width: 80%;
+    margin: 8px 0;
+}
+</style>
\ No newline at end of file
-- 
GitLab