Skip to content

R
re860_factory
Commit df1fb3b8 authored by lyong's avatar lyong
Browse files
Options

refactor(factoryTest): 修改字体路径判断逻辑为基于系统平台

parent d46432b5
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
factoryTestItem/factoryTestWifi.evue
View file @ df1fb3b8
...@@ -1233,7 +1233,8 @@ ...@@ -1233,7 +1233,8 @@
this.setPickPara("setTimePicker12Minute", 40, 26); this.setPickPara("setTimePicker12Minute", 40, 26);
this.setPickPara("setTimePickerAMPM", 40, 26); this.setPickPara("setTimePickerAMPM", 40, 26);
if (userData.factoryFlag == 0) { var process = require("@system.process")
if (process.platform == "win32") {
globalThat.$FontPath = "./../re860a-v1.0/GothamMedium.ttf"; globalThat.$FontPath = "./../re860a-v1.0/GothamMedium.ttf";
} else { } else {
globalThat.$FontPath = "./../RE860A/GothamMedium.ttf"; globalThat.$FontPath = "./../RE860A/GothamMedium.ttf";
......
factoryTestItem/factory_testList.evue
View file @ df1fb3b8
...@@ -230,7 +230,8 @@ ...@@ -230,7 +230,8 @@
onShow: function () { onShow: function () {
console.log(this.$uri + "===========onShow============="); console.log(this.$uri + "===========onShow=============");
if (userData.factoryFlag == 0) { var process = require("@system.process")
if (process.platform == "win32") {
globalThat.$FontPath = "./../re860a-v1.0/GothamMedium.ttf"; globalThat.$FontPath = "./../re860a-v1.0/GothamMedium.ttf";
} else { } else {
globalThat.$FontPath = "./../RE860A/GothamMedium.ttf"; globalThat.$FontPath = "./../RE860A/GothamMedium.ttf";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment