From f096d1fd973f33fea8ce6e8031696968b9615343 Mon Sep 17 00:00:00 2001 From: tongkai0808fh Date: Thu, 9 May 2024 03:42:11 +0000 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9setting/setting/src/main/?= =?UTF-8?q?cpp/wpa=5Fwork.c=E6=96=87=E4=BB=B6=EF=BC=8C=E6=B6=88=E9=99=A4?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E8=B7=AF=E5=BE=84=E5=AD=97=E7=AC=A6=E4=B8=B2?= =?UTF-8?q?=E8=BF=87=E9=95=BF=E5=91=8A=E8=AD=A6=20=E5=88=A0=E9=99=A4strcpy?= =?UTF-8?q?=E5=92=8Cstrcat=E5=87=BD=E6=95=B0=EF=BC=8C=E7=94=A8=E5=AD=97?= =?UTF-8?q?=E7=AC=A6=E4=B8=B2=E4=BE=BF=E5=88=A9=E6=9B=BF=E4=BB=A3=EF=BC=8C?= =?UTF-8?q?=E6=B6=88=E9=99=A4=E6=96=87=E4=BB=B6=E8=B7=AF=E5=BE=84=E5=AD=97?= =?UTF-8?q?=E7=AC=A6=E4=B8=B2=E8=BF=87=E9=95=BF=E5=91=8A=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: tongkai0808fh --- setting/setting/src/main/cpp/wpa_work.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/setting/setting/src/main/cpp/wpa_work.c b/setting/setting/src/main/cpp/wpa_work.c index 7f93487..909ff0a 100755 --- a/setting/setting/src/main/cpp/wpa_work.c +++ b/setting/setting/src/main/cpp/wpa_work.c @@ -15,7 +15,6 @@ #include "wpa_work.h" #include -#include #define WPA_IFACE_NAME "wlan0" #define WIFI_AUTH_FAILED_REASON_STR "WRONG_KEY" @@ -486,11 +485,13 @@ static void *ThreadMain() int i = 0; int myfor = 5; char *arg[20] = {0}; - char argstr1[] = "/storage/app/run/com.huawei.setting/setting/assets"; - char argstr2[] = "/setting/resources/base/element/wpa_supplicant.conf"; + string argstr1 = "/storage/app/run/com.huawei.setting/setting/assets"; + string argstr2 = "/setting/resources/base/element/wpa_supplicant.conf"; char argstr[120]; - strcpy_s(argstr, strlen(argstr1) + 1, argstr1); - strcat_s(argstr, strlen(argstr2) + 1, argstr2); + string argstr3 = argstr1 + argstr2; + for (int i = 0; i < argstr3.length(); ++i) { + argstr[i] = argstr3[i]; + } arg[i] = (char *)"wpa_supplicant"; arg[++i] = (char *)"-i"; arg[++i] = (char *)"wlan0"; From 938a0c7c18657b67e128b321275bda9e02b948d3 Mon Sep 17 00:00:00 2001 From: tongkai0808fh Date: Thu, 9 May 2024 06:38:16 +0000 Subject: [PATCH 2/7] =?UTF-8?q?=E5=BC=95=E5=85=A5string.h=E5=A4=B4?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: tongkai0808fh --- setting/setting/src/main/cpp/wpa_work.c | 1 + 1 file changed, 1 insertion(+) diff --git a/setting/setting/src/main/cpp/wpa_work.c b/setting/setting/src/main/cpp/wpa_work.c index 909ff0a..16c1020 100755 --- a/setting/setting/src/main/cpp/wpa_work.c +++ b/setting/setting/src/main/cpp/wpa_work.c @@ -15,6 +15,7 @@ #include "wpa_work.h" #include +#include #define WPA_IFACE_NAME "wlan0" #define WIFI_AUTH_FAILED_REASON_STR "WRONG_KEY" From d6eb8c7fcdf27cd1fa62911f2ad82ab4019a1908 Mon Sep 17 00:00:00 2001 From: tongkai0808fh Date: Thu, 9 May 2024 07:28:12 +0000 Subject: [PATCH 3/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9update=20setting/setting/?= =?UTF-8?q?src/main/cpp/wpa=5Fwork.c=E6=96=87=E4=BB=B6=EF=BC=8C=E5=A4=B4?= =?UTF-8?q?=E6=96=87=E4=BB=B6string.h=E6=94=B9=E6=88=90string?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: tongkai0808fh --- setting/setting/src/main/cpp/wpa_work.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setting/setting/src/main/cpp/wpa_work.c b/setting/setting/src/main/cpp/wpa_work.c index 16c1020..4bd8018 100755 --- a/setting/setting/src/main/cpp/wpa_work.c +++ b/setting/setting/src/main/cpp/wpa_work.c @@ -15,7 +15,7 @@ #include "wpa_work.h" #include -#include +#include #define WPA_IFACE_NAME "wlan0" #define WIFI_AUTH_FAILED_REASON_STR "WRONG_KEY" From 8df0508de51a9f70d553ca83026af9905cea3e9c Mon Sep 17 00:00:00 2001 From: tongkai0808fh Date: Thu, 9 May 2024 07:43:40 +0000 Subject: [PATCH 4/7] update setting/setting/src/main/cpp/wpa_work.c. Signed-off-by: tongkai0808fh --- setting/setting/src/main/cpp/wpa_work.c | 1 + 1 file changed, 1 insertion(+) diff --git a/setting/setting/src/main/cpp/wpa_work.c b/setting/setting/src/main/cpp/wpa_work.c index 4bd8018..97d5bf8 100755 --- a/setting/setting/src/main/cpp/wpa_work.c +++ b/setting/setting/src/main/cpp/wpa_work.c @@ -15,6 +15,7 @@ #include "wpa_work.h" #include +#include #include #define WPA_IFACE_NAME "wlan0" From f9ec787c8afaa0a4cb45275f83e5a7a248b604a3 Mon Sep 17 00:00:00 2001 From: tongkai0808fh Date: Thu, 9 May 2024 08:25:46 +0000 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9setting/setting/src/main/?= =?UTF-8?q?cpp/wpa=5Fwork.c=EF=BC=8C=E5=B0=86=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E8=B7=AF=E5=BE=84=E5=AE=9A=E4=B9=89=E6=88=90=E5=AE=8F?= =?UTF-8?q?=20=E6=B6=88=E9=99=A4=E5=8D=95=E8=A1=8C=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E8=BF=87=E9=95=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: tongkai0808fh --- setting/setting/src/main/cpp/wpa_work.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/setting/setting/src/main/cpp/wpa_work.c b/setting/setting/src/main/cpp/wpa_work.c index 97d5bf8..d3f734c 100755 --- a/setting/setting/src/main/cpp/wpa_work.c +++ b/setting/setting/src/main/cpp/wpa_work.c @@ -23,6 +23,7 @@ #define WIFI_AUTH_FAILED_REASON_CODE "reason=2" #define WPA_CTRL_REQUEST_OK "OK" #define WPA_CTRL_REQUEST_FAIL "FAIL" +#define PATH "/storage/app/run/com.huawei.setting/setting/assets/setting/resources/base/element/wpa_supplicant.conf" #define SAMPLE_INFO(format, args...) \ do { \ @@ -487,18 +488,11 @@ static void *ThreadMain() int i = 0; int myfor = 5; char *arg[20] = {0}; - string argstr1 = "/storage/app/run/com.huawei.setting/setting/assets"; - string argstr2 = "/setting/resources/base/element/wpa_supplicant.conf"; - char argstr[120]; - string argstr3 = argstr1 + argstr2; - for (int i = 0; i < argstr3.length(); ++i) { - argstr[i] = argstr3[i]; - } arg[i] = (char *)"wpa_supplicant"; arg[++i] = (char *)"-i"; arg[++i] = (char *)"wlan0"; arg[++i] = (char *)"-c"; - arg[++i] = (char *)argstr; + arg[++i] = (char *)PATH; for (i = 0; i < myfor; i++) { printf("[LOG]arg[%d]->%s \n", i, arg[i]); From 29ab9ce4daf88473a57564f8436484d0456e422d Mon Sep 17 00:00:00 2001 From: tongkai0808fh Date: Thu, 9 May 2024 08:42:14 +0000 Subject: [PATCH 6/7] =?UTF-8?q?update=20setting/setting/src/main/cpp/wpa?= =?UTF-8?q?=5Fwork.c.=20=E5=88=A0=E9=99=A4=E7=94=A8=E4=B8=8D=E4=B8=8A?= =?UTF-8?q?=E5=A4=B4=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: tongkai0808fh --- setting/setting/src/main/cpp/wpa_work.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/setting/setting/src/main/cpp/wpa_work.c b/setting/setting/src/main/cpp/wpa_work.c index d3f734c..709aa64 100755 --- a/setting/setting/src/main/cpp/wpa_work.c +++ b/setting/setting/src/main/cpp/wpa_work.c @@ -15,8 +15,6 @@ #include "wpa_work.h" #include -#include -#include #define WPA_IFACE_NAME "wlan0" #define WIFI_AUTH_FAILED_REASON_STR "WRONG_KEY" From 70c8083f40da1ac453f7d0faf1e59d1473d112f6 Mon Sep 17 00:00:00 2001 From: tongkai0808fh Date: Sat, 11 May 2024 08:30:39 +0000 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9setting/setting/src/main/?= =?UTF-8?q?cpp/setting=5Fwifi=5Finput=5Fpassword=5Fability=5Fslice.cpp?= =?UTF-8?q?=E6=96=87=E4=BB=B6=EF=BC=8C188=E8=A1=8C=E5=8A=A0=E5=85=A5?= =?UTF-8?q?=E6=8D=A2=E8=A1=8C=E7=AC=A6=20188=E8=A1=8C=E5=8A=A0=E5=85=A5?= =?UTF-8?q?=E6=8D=A2=E8=A1=8C=E7=AC=A6=EF=BC=8C=E6=B6=88=E9=99=A4=E5=8D=95?= =?UTF-8?q?=E8=A1=8C=E5=AD=97=E7=AC=A6=E6=95=B0=E8=BF=87=E5=A4=9A=E5=91=8A?= =?UTF-8?q?=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: tongkai0808fh --- .../src/main/cpp/setting_wifi_input_password_ability_slice.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setting/setting/src/main/cpp/setting_wifi_input_password_ability_slice.cpp b/setting/setting/src/main/cpp/setting_wifi_input_password_ability_slice.cpp index 4b8ecba..4f7ceb6 100755 --- a/setting/setting/src/main/cpp/setting_wifi_input_password_ability_slice.cpp +++ b/setting/setting/src/main/cpp/setting_wifi_input_password_ability_slice.cpp @@ -185,7 +185,8 @@ void SettingWifiInputPasswordAbilitySlice::AddInputKeyBoardZero(void) inputButton->SetStyle(STYLE_TEXT_COLOR, DE_TITLE_TEXT_COLOR); inputButton->SetFont(DE_FONT_OTF, DE_TITLE_TEXT_SIZE); - clickLeftListener_ = new TestBtnOnClickInputPasswordChangeListener((UILabel*)lablelInputText_, (UILabel*)lablelCursorText_, inputNum, CURSOR_POSITION_OFFSET); + clickLeftListener_ = new TestBtnOnClickInputPasswordChangeListener((UILabel*)lablelInputText_, \ + (UILabel*)lablelCursorText_, inputNum, CURSOR_POSITION_OFFSET); inputButton->SetOnClickListener(clickLeftListener_); scrollView_->Add(inputButton); }