diff --git a/README.md b/README.md index d02fd41ed51db7f852f61113866811f44818d33e..48d08e30c387ded5b745e920a5516603328fb957 100644 --- a/README.md +++ b/README.md @@ -19,6 +19,7 @@ 1. 搭建Node.js环境：本示例的服务端是基于Node.js实现的，如果本地已有Node.js环境可以跳过此步骤。 1. 检查本地Node.js环境：在本示例工程的根目录下打开DevEco Studio的Terminal，执行`node -v`命令，如果可以看到版本信息，说明已经具备Node.js环境。 + ![image](screenshots/readme/node_version.png) 2. 如果本地没有Node.js环境，可以去Node.js官网上下载所需版本进行安装配置。 3. 配置完环境变量后，重新打开Terminal，输入`node -v`命令，如果可以看到版本信息，说明已安装成功。 @@ -26,12 +27,15 @@ 2. 构建局域网环境：测试配置公共请求头场景时要确保运行服务端代码的电脑和测试机连接的是同一局域网。可以开一个个人热点，然后将测试机和运行服务端代码的电脑都连接该热点进行测试。 3. 运行服务端代码：在根目录下打开DevEco Studio的Terminal，执行`hvigorw startHeaderServer`命令，启动本地服务器。 + ![image](screenshots/readme/start_server.png) 4. 连接服务器地址：将Terminal中Server URL后面的URL复制到[src/main/ets/common/CommonConstants.ets](./entry/src/main/ets/common/CommonConstants.ets)文件下的COMMON_HEADER_REQUEST_URL中，保存好后即可运行本工程进行测试。 + ![image](screenshots/readme/server_url.png) 注：也可以直接运行本工程，在配置公共请求头页面的输入框中，手动输入运行服务端代码电脑的IP地址后进行访问请求。可以在Terminal中Local Network IP后面读取IP地址，或者在命令行工具中通过`ipconfig`命令查看IP地址。 + ![image](screenshots/readme/local_network_ip.png) 5. 重启本地服务器：执行`hvigorw restartHeaderServer`命令。 @@ -97,13 +101,13 @@ │ │ │ │ │ └──PageWhitelistView.ets // 页面白名单配置UI界面 │ │ │ │ └──viewmodel │ │ │ │ └──PageWhitelistViewModel.ets // 页面白名单配置UI和数据交互管理 -│ │ │ ├──RedirectRequestInterceptor // 请求重定向拦截器 -│ │ │ │ ├──model -│ │ │ │ │ └──RedirectRequestModel.ets // 请求重定向数据及相关处理 -│ │ │ │ ├──view -│ │ │ │ │ └──RedirectRequestView.ets // 请求重定向UI界面 -│ │ │ │ └──viewmodel -│ │ │ │ └──RedirectRequestViewModel.ets // 请求重定向UI和数据交互管理 +│ │ │ └──RedirectRequestInterceptor // 请求重定向拦截器 +│ │ │ ├──model +│ │ │ │ └──RedirectRequestModel.ets // 请求重定向数据及相关处理 +│ │ │ ├──view +│ │ │ │ └──RedirectRequestView.ets // 请求重定向UI界面 +│ │ │ └──viewmodel +│ │ │ └──RedirectRequestViewModel.ets // 请求重定向UI和数据交互管理 │ │ └──pages │ │ └──Index.ets // 首页 │ └──resources // 应用静态资源目录 diff --git a/entry/src/main/ets/Interceptors/CommonHeaderInterceptor/view/CommonHeaderView.ets b/entry/src/main/ets/Interceptors/CommonHeaderInterceptor/view/CommonHeaderView.ets index 625eb28126b8faf0f3266e0ff6367a192ed2abbb..7a60e277a946351cce7f2273532909407805182a 100644 --- a/entry/src/main/ets/Interceptors/CommonHeaderInterceptor/view/CommonHeaderView.ets +++ b/entry/src/main/ets/Interceptors/CommonHeaderInterceptor/view/CommonHeaderView.ets @@ -83,7 +83,7 @@ struct CommonHeader { }) } } - .title($r('app.string.configure_public_request_header')) + .title($r('app.string.configure_common_request_header')) .backgroundColor($r('app.color.home_page_background')) .onBackPressed(() => { // If there is a previous web page, go back to the previous page; otherwise, close the web page. diff --git a/entry/src/main/ets/common/CommonConstants.ets b/entry/src/main/ets/common/CommonConstants.ets index 5d58b7c8063742adc615a4cf13741dac92c94e4a..431f41f4935069db861613ea16efd373253fd385 100644 --- a/entry/src/main/ets/common/CommonConstants.ets +++ b/entry/src/main/ets/common/CommonConstants.ets @@ -25,7 +25,7 @@ export class PageNames { static readonly CUSTOM_RESOURCE_LOADING: string = 'CustomLoadingStrategy'; - static readonly PUBLIC_REQUEST_HEADER: string = 'CommonHeader'; + static readonly COMMON_REQUEST_HEADER: string = 'CommonHeader'; } export interface RouteItem { @@ -59,7 +59,7 @@ export class CommonConstants { { title: $r('app.string.based_on_WebSchemeHandler'), items: [ - { index: 4, title: $r('app.string.configure_public_request_header'), name: PageNames.PUBLIC_REQUEST_HEADER } + { index: 4, title: $r('app.string.configure_common_request_header'), name: PageNames.COMMON_REQUEST_HEADER } ] } ] diff --git a/entry/src/main/resources/base/element/string.json b/entry/src/main/resources/base/element/string.json index e94a2f7b716d73ea7f6974bcc3ca7b87b71b5df2..633d4ec8531b30ebb30b2d88f45e414eb8a4317c 100644 --- a/entry/src/main/resources/base/element/string.json +++ b/entry/src/main/resources/base/element/string.json @@ -33,8 +33,8 @@ "value": "Custom resource loading strategy" }, { - "name": "configure_public_request_header", - "value": "Configure public request header" + "name": "configure_common_request_header", + "value": "Configure common request header" }, { "name": "based_on_onLoadIntercept", diff --git a/entry/src/main/resources/en_US/element/string.json b/entry/src/main/resources/en_US/element/string.json index e1ec63648357a039aa500353489a88a35c113cb0..c466065967b49b169903df509c3cf87d91d3a3fa 100644 --- a/entry/src/main/resources/en_US/element/string.json +++ b/entry/src/main/resources/en_US/element/string.json @@ -45,8 +45,8 @@ "value": "Request interception based on WebSchemeHandler" }, { - "name": "configure_public_request_header", - "value": "Configure public request header" + "name": "configure_common_request_header", + "value": "Configure common request header" }, { "name": "url_input_alert", diff --git a/entry/src/main/resources/zh_CN/element/string.json b/entry/src/main/resources/zh_CN/element/string.json index 668f02baabfbb0b9b0d60b7e85aea4f400eb5d1e..c02589e39304ff40fb3e88c5357668bd98f755ee 100644 --- a/entry/src/main/resources/zh_CN/element/string.json +++ b/entry/src/main/resources/zh_CN/element/string.json @@ -45,7 +45,7 @@ "value": "基于WebSchemeHandler的请求拦截" }, { - "name": "configure_public_request_header", + "name": "configure_common_request_header", "value": "配置公共请求头" }, { diff --git a/screenshots/device_en/CommonHeaderResult_en.png b/screenshots/device_en/CommonHeaderResult_en.png new file mode 100644 index 0000000000000000000000000000000000000000..6a531fa6b764e9872e47b073659fff0c77b83f2c Binary files /dev/null and b/screenshots/device_en/CommonHeaderResult_en.png differ diff --git a/screenshots/device_en/CommonHeader_en.png b/screenshots/device_en/CommonHeader_en.png new file mode 100644 index 0000000000000000000000000000000000000000..32f5656afe3c5e779bbed0665c95f0b28b19ca71 Binary files /dev/null and b/screenshots/device_en/CommonHeader_en.png differ diff --git a/screenshots/device_en/CustomLoadingResult_en.png b/screenshots/device_en/CustomLoadingResult_en.png new file mode 100644 index 0000000000000000000000000000000000000000..9160cbe6a5f709d5739e8c8b1a046d0d38bbece4 Binary files /dev/null and b/screenshots/device_en/CustomLoadingResult_en.png differ diff --git a/screenshots/device_en/CustomLoading_en.png b/screenshots/device_en/CustomLoading_en.png new file mode 100644 index 0000000000000000000000000000000000000000..888ea8ab54e78625d1d254da5d844fd0424256a7 Binary files /dev/null and b/screenshots/device_en/CustomLoading_en.png differ diff --git a/screenshots/device_en/LocalResourceResult_en.png b/screenshots/device_en/LocalResourceResult_en.png new file mode 100644 index 0000000000000000000000000000000000000000..bce16d204e44218653ae63f4210b961b225d6a80 Binary files /dev/null and b/screenshots/device_en/LocalResourceResult_en.png differ diff --git a/screenshots/device_en/LocalResource_en.png b/screenshots/device_en/LocalResource_en.png new file mode 100644 index 0000000000000000000000000000000000000000..1a406e61556fb8e2d645dec79cdfb00e0f7eabad Binary files /dev/null and b/screenshots/device_en/LocalResource_en.png differ diff --git a/screenshots/device_en/PageWhitelistResult_en.png b/screenshots/device_en/PageWhitelistResult_en.png new file mode 100644 index 0000000000000000000000000000000000000000..44ae77fb4df348bd53943ca8b7310342d7cc40aa Binary files /dev/null and b/screenshots/device_en/PageWhitelistResult_en.png differ diff --git a/screenshots/device_en/PageWhitelist_en.png b/screenshots/device_en/PageWhitelist_en.png new file mode 100644 index 0000000000000000000000000000000000000000..223bdc23148ffd063e5eb8c8aa593769ed72602b Binary files /dev/null and b/screenshots/device_en/PageWhitelist_en.png differ diff --git a/screenshots/device_en/RedirectRequestResult_en.png b/screenshots/device_en/RedirectRequestResult_en.png new file mode 100644 index 0000000000000000000000000000000000000000..45ecc4a4057aa3ea494f69166d0ed8eed51dc548 Binary files /dev/null and b/screenshots/device_en/RedirectRequestResult_en.png differ diff --git a/screenshots/device_en/RedirectRequest_en.png b/screenshots/device_en/RedirectRequest_en.png new file mode 100644 index 0000000000000000000000000000000000000000..f81429fef9a212600ec2612f2375f2915f95ec95 Binary files /dev/null and b/screenshots/device_en/RedirectRequest_en.png differ