lmh188
/
newtx
mirror of http://192.168.1.51:8099/scanner/newtx.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

属性visible域只作为是否在界面显示功能

This commit is contained in:
gb 2024-03-12 17:47:40 +08:00
parent 2d57b6ea74
commit 3e45a71083
12 changed files with 15 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/sane-opts/color_correct.txt
View File

@ -8,7 +8,6 @@
"pos": 24,
"ui-pos": 15,
"auth": 100,
"visible": 2,
"size": 4,
"cur": true,
"default": true
@ -23,7 +22,6 @@
"ui-pos": 16,
"auth": 100,
"bind": true,
"visible": 2,
"size": 80,
"default": {
"cis-mode==彩色&&resolution>200&&resolution<400": "\/usr\/local\/huago\/Textlut300clr.bmp",

52
docs/sane-opts/hardware.txt
View File

@ -8,7 +8,6 @@
"ui-pos": 10,
"auth": 100,
"bind": true,
"visible": 2,
"size": 12,
"default": {
"(mode.enabled&&(mode==256级灰度||mode==黑白)) || (multiout-type.enabled&&multiout-type==灰度+黑白)": "灰度",
@ -25,7 +24,6 @@
"ui-pos": 11,
"auth": 100,
"bind": true,
"visible": 2,
"size": 4,
"default": {
"resolution>=400": 600,
@ -55,7 +53,6 @@
"type": "bool",
"ui-pos": 12,
"auth": 100,
"visible": 2,
"size": 4,
"cur": true,
"default": true
@ -90,7 +87,6 @@
"ui-pos": 31,
"auth": 0,
"affect": 6,
"visible": 0,
"size": 4,
"cur": false,
"default": false,
@ -107,7 +103,6 @@
"auth": 0,
"unit": "mm",
"readonly": true,
"visible": 0,
"size": 8,
"auto": false,
"ownread": true,
@ -125,7 +120,6 @@
"auth": 0,
"unit": "mm",
"readonly": true,
"visible": 0,
"size": 8,
"auto": false,
"ownread": true,
@ -258,7 +252,6 @@
"type": "int",
"ui-pos": 20,
"auth": 100,
"visible": 2,
"size": 4,
"cur": 921600,
"default": 921600,
@ -273,7 +266,6 @@
"ui-pos": 21,
"auth": 100,
"unit": "microsec",
"visible": 2,
"size": 4,
"cur": 1000,
"default": 1000
@ -286,7 +278,6 @@
"type": "int",
"ui-pos": 22,
"auth": 100,
"visible": 2,
"size": 4,
"cur": 12,
"default": 12
@ -299,7 +290,6 @@
"type": "int",
"ui-pos": 23,
"auth": 100,
"visible": 2,
"size": 4,
"cur": 201,
"default": 201
@ -354,7 +344,6 @@
"type": "int",
"ui-pos": 25,
"auth": 100,
"visible": 2,
"size": 4,
"cur": 100,
"default": 100,
@ -381,7 +370,6 @@
"fix-id": 34868,
"ui-pos": 22,
"auth": 100,
"visible": 2,
"size": 4,
"cur": true,
"default": true
@ -395,7 +383,6 @@
"fix-id": 34869,
"ui-pos": 23,
"auth": 100,
"visible": 2,
"size": 4,
"cur": 3,
"default": 3,
@ -416,7 +403,6 @@
"ui-pos": 16,
"auth": 100,
"readonly": true,
"visible": 2,
"size": 24,
"auto": false,
"cur": "",
@ -431,7 +417,6 @@
"ui-pos": 17,
"auth": 100,
"readonly": true,
"visible": 2,
"size": 24,
"auto": false,
"cur": "",
@ -447,7 +432,6 @@
"auth": 100,
"unit": "mm",
"readonly": true,
"visible": 2,
"size": 4,
"auto": false,
"cur": 3888,
@ -461,7 +445,6 @@
"type": "float",
"ui-pos": 40,
"auth": 100,
"visible": 2,
"size": 8,
"auto": false,
"default": {
@ -484,7 +467,6 @@
"type": "float",
"ui-pos": 41,
"auth": 100,
"visible": 2,
"size": 8,
"auto": false,
"default": {
@ -508,7 +490,6 @@
"ui-pos": 42,
"auth": 100,
"bind": true,
"visible": 2,
"size": 4,
"auto": false,
"default": {
@ -527,7 +508,6 @@
"ui-pos": 70,
"auth": 100,
"bind": true,
"visible": 2,
"size": 4,
"default": {
"cis-mode==灰度 && cis-dpi==300": 336,
@ -550,7 +530,6 @@
"ui-pos": 71,
"auth": 100,
"bind": true,
"visible": 2,
"size": 4,
"default": {
"cis-mode==灰度 && cis-dpi==300": 336,
@ -573,7 +552,6 @@
"ui-pos": 72,
"auth": 100,
"bind": true,
"visible": 2,
"size": 4,
"default": {
"cis-mode==灰度 && cis-dpi==300": 336,
@ -596,7 +574,6 @@
"ui-pos": 73,
"auth": 100,
"bind": true,
"visible": 2,
"size": 4,
"default": {
"cis-mode==灰度 && cis-dpi==300": 410,
@ -619,7 +596,6 @@
"ui-pos": 74,
"auth": 100,
"bind": true,
"visible": 2,
"size": 4,
"default": {
"cis-mode==灰度 && cis-dpi==300": 410,
@ -642,7 +618,6 @@
"ui-pos": 75,
"auth": 100,
"bind": true,
"visible": 2,
"size": 4,
"default": {
"cis-mode==灰度 && cis-dpi==300": 410,
@ -665,7 +640,6 @@
"ui-pos": 90,
"auth": 100,
"bind": true,
"visible": 2,
"size": 4,
"default": {
"cis-mode==灰度 && cis-dpi==300": 170,
@ -688,7 +662,6 @@
"ui-pos": 91,
"auth": 100,
"bind": true,
"visible": 2,
"size": 4,
"default": {
"cis-mode==灰度 && cis-dpi==300": 170,
@ -711,7 +684,6 @@
"ui-pos": 92,
"auth": 100,
"bind": true,
"visible": 2,
"size": 4,
"default": {
"cis-mode==灰度 && cis-dpi==300": 170,
@ -734,7 +706,6 @@
"ui-pos": 93,
"auth": 100,
"bind": true,
"visible": 2,
"size": 4,
"default": {
"cis-mode==灰度 && cis-dpi==300": 170,
@ -757,7 +728,6 @@
"ui-pos": 94,
"auth": 100,
"bind": true,
"visible": 2,
"size": 4,
"default": {
"cis-mode==灰度 && cis-dpi==300": 170,
@ -780,7 +750,6 @@
"ui-pos": 95,
"auth": 100,
"bind": true,
"visible": 2,
"size": 4,
"default": {
"cis-mode==灰度 && cis-dpi==300": 170,
@ -803,7 +772,6 @@
"ui-pos": 120,
"auth": 100,
"bind": true,
"visible": 2,
"size": 4,
"default": {
"cis-mode==灰度 && cis-dpi==300": 170,
@ -826,7 +794,6 @@
"ui-pos": 121,
"auth": 100,
"bind": true,
"visible": 2,
"size": 4,
"default": {
"cis-mode==灰度 && cis-dpi==300": 170,
@ -849,7 +816,6 @@
"ui-pos": 122,
"auth": 100,
"bind": true,
"visible": 2,
"size": 4,
"default": {
"cis-mode==灰度 && cis-dpi==300": 170,
@ -872,7 +838,6 @@
"ui-pos": 123,
"auth": 100,
"bind": true,
"visible": 2,
"size": 4,
"default": {
"cis-mode==灰度 && cis-dpi==300": 170,
@ -895,7 +860,6 @@
"ui-pos": 124,
"auth": 100,
"bind": true,
"visible": 2,
"size": 4,
"default": {
"cis-mode==灰度 && cis-dpi==300": 170,
@ -918,7 +882,6 @@
"ui-pos": 125,
"auth": 100,
"bind": true,
"visible": 2,
"size": 4,
"default": {
"cis-mode==灰度 && cis-dpi==300": 170,
@ -941,7 +904,6 @@
"ui-pos": 160,
"auth": 100,
"bind": true,
"visible": 2,
"size": 4,
"default": {
"cis-mode==灰度 && cis-dpi==300": 116,
@ -964,7 +926,6 @@
"ui-pos": 161,
"auth": 100,
"bind": true,
"visible": 2,
"size": 4,
"default": {
"cis-mode==灰度 && cis-dpi==300": 121,
@ -987,7 +948,6 @@
"ui-pos": 162,
"auth": 100,
"bind": true,
"visible": 2,
"size": 4,
"default": {
"cis-mode==灰度 && cis-dpi==300": 119,
@ -1010,7 +970,6 @@
"ui-pos": 163,
"auth": 100,
"bind": true,
"visible": 2,
"size": 4,
"default": {
"cis-mode==灰度 && cis-dpi==300": 128,
@ -1033,7 +992,6 @@
"ui-pos": 164,
"auth": 100,
"bind": true,
"visible": 2,
"size": 4,
"default": {
"cis-mode==灰度 && cis-dpi==300": 129,
@ -1056,7 +1014,6 @@
"ui-pos": 165,
"auth": 100,
"bind": true,
"visible": 2,
"size": 4,
"default": {
"cis-mode==灰度 && cis-dpi==300": 127,
@ -1079,7 +1036,6 @@
"ui-pos": 200,
"auth": 100,
"bind": true,
"visible": 2,
"size": 4,
"default": {
"cis-mode==灰度 && cis-dpi==300": 110,
@ -1102,7 +1058,6 @@
"ui-pos": 201,
"auth": 100,
"bind": true,
"visible": 2,
"size": 4,
"default": {
"cis-mode==灰度 && cis-dpi==300": 120,
@ -1125,7 +1080,6 @@
"ui-pos": 202,
"auth": 100,
"bind": true,
"visible": 2,
"size": 4,
"default": {
"cis-mode==灰度 && cis-dpi==300": 115,
@ -1148,7 +1102,6 @@
"ui-pos": 203,
"auth": 100,
"bind": true,
"visible": 2,
"size": 4,
"default": {
"cis-mode==灰度 && cis-dpi==300": 117,
@ -1171,7 +1124,6 @@
"ui-pos": 204,
"auth": 100,
"bind": true,
"visible": 2,
"size": 4,
"default": {
"cis-mode==灰度 && cis-dpi==300": 118,
@ -1194,7 +1146,6 @@
"ui-pos": 205,
"auth": 100,
"bind": true,
"visible": 2,
"size": 4,
"default": {
"cis-mode==灰度 && cis-dpi==300": 121,
@ -1216,7 +1167,6 @@
"type": "int",
"ui-pos": 26,
"auth": 100,
"visible": 2,
"size": 4,
"cur": 66,
"default": 66,
@ -1234,7 +1184,6 @@
"type": "int",
"ui-pos": 27,
"auth": 100,
"visible": 2,
"size": 4,
"cur": 67,
"default": 67,
@ -1253,7 +1202,6 @@
"pos": 50,
"ui-pos": 40,
"auth": 100,
"visible": 2,
"size": 4,
"cur": false,
"default": false

2
docs/sane-opts/image_encoder.txt
View File

@ -9,7 +9,6 @@
"pos": 9900,
"ui-pos": 10,
"auth": 10,
"visible": 2,
"size": 16,
"cur": "JPEG",
"default": "JPEG",
@ -27,7 +26,6 @@
"auth": 10,
"affect": 4,
"unit": "%",
"visible": 2,
"size": 4,
"cur": 100,
"default": 100,

1
docs/sane-opts/imgprc_mgr.txt
View File

@ -8,7 +8,6 @@
"ui-pos": 20,
"auth": 10,
"affect": 2,
"visible": 2,
"size": 4,
"cur": false,
"default": false

1
docs/sane-opts/rebuild.txt
View File

@ -8,7 +8,6 @@
"pos": 10,
"ui-pos": 1,
"auth": 100,
"visible": 2,
"size": 4,
"auto": false,
"cur": true,

6
hardware/hardware.cpp
View File

File diff suppressed because one or more lines are too long

2
imgproc/algs/color_correct.cpp
View File

@ -11,7 +11,7 @@
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//
static std::string device_opt_json[] = {
"{\"clr-correct\":{\"cat\":\"imgp\",\"group\":\"advance\",\"title\":\"\\u989c\\u8272\\u6821\\u6b63\",\"desc\":\"\\u6839\\u636e\\u6821\\u6b63\\u53c2\\u6570\\uff0c\\u8c03\\u6574\\u4eceCIS\\u51fa\\u6765\\u7684\\u539f\\u59cb\\u56fe\\u50cf\\u989c\\u8272\",\"type\":\"bool\",\"pos\":24,\"ui-pos\":15,\"auth\":100,\"visible\":2,\"size\":4,\"cur\":true,\"default\":true},\"lut-file\":{\"cat\":\"imgp\",\"group\":\"advance\",\"title\":\"\\u6821\\u6b63\\u6a21\\u677f\",\"desc\":\"\\u989c\\u8272\\u6821\\u6b63\\u4f7f\\u7528\\u7684\\u57fa\\u51c6\\u56fe\\u50cf\\u6570\\u636e\",\"type\":\"string\",\"pos\":25,\"ui-pos\":16,\"auth\":100,\"bind\":true,\"visible\":2,\"size\":80,\"default\":{\"cis-mode==\\u5f69\\u8272&&resolution>200&&resolution<400\":\"\\/usr\\/local\\/huago\\/Textlut300clr.bmp\",\"cis-mode==\\u5f69\\u8272&&resolution>=400\":\"\\/usr\\/local\\/huago\\/Textlut600clr.bmp\",\"cis-mode==\\u7070\\u5ea6&&resolution<=200\":\"\\/usr\\/local\\/huago\\/Textlut200gray.bmp\",\"cis-mode==\\u7070\\u5ea6&&resolution>200&&resolution<400\":\"\\/usr\\/local\\/huago\\/Textlut300gray.bmp\",\"cis-mode==\\u7070\\u5ea6&&resolution>=400\":\"\\/usr\\/local\\/huago\\/Textlut600gray.bmp\",\"default\":\"\\/usr\\/local\\/huago\\/Textlut200clr.bmp\"}},\"cis-mode\":{\"cat\":\"none\",\"group\":\"CIS\",\"title\":\"CIS\\u989c\\u8272\\u6a21\\u5f0f\",\"desc\":\"\\u9009\\u62e9\\u955c\\u5934\\u8272\\u5f69\\u5de5\\u4f5c\\u6a21\\u5f0f\",\"type\":\"string\",\"pos\":1000,\"ui-pos\":10,\"auth\":0,\"bind\":true,\"size\":12,\"default\":{\"(mode.enabled&&(mode==256\\u7ea7\\u7070\\u5ea6||mode==\\u9ed1\\u767d)) || (multiout-type.enabled&&multiout-type==\\u7070\\u5ea6+\\u9ed1\\u767d)\":\"\\u7070\\u5ea6\",\"default\":\"\\u5f69\\u8272\"},\"range\":[\"\\u5f69\\u8272\",\"\\u7070\\u5ea6\"]}}"
"{\"clr-correct\":{\"cat\":\"imgp\",\"group\":\"advance\",\"title\":\"\\u989c\\u8272\\u6821\\u6b63\",\"desc\":\"\\u6839\\u636e\\u6821\\u6b63\\u53c2\\u6570\\uff0c\\u8c03\\u6574\\u4eceCIS\\u51fa\\u6765\\u7684\\u539f\\u59cb\\u56fe\\u50cf\\u989c\\u8272\",\"type\":\"bool\",\"pos\":24,\"ui-pos\":15,\"auth\":100,\"size\":4,\"cur\":true,\"default\":true},\"lut-file\":{\"cat\":\"imgp\",\"group\":\"advance\",\"title\":\"\\u6821\\u6b63\\u6a21\\u677f\",\"desc\":\"\\u989c\\u8272\\u6821\\u6b63\\u4f7f\\u7528\\u7684\\u57fa\\u51c6\\u56fe\\u50cf\\u6570\\u636e\",\"type\":\"string\",\"pos\":25,\"ui-pos\":16,\"auth\":100,\"bind\":true,\"size\":80,\"default\":{\"cis-mode==\\u5f69\\u8272&&resolution>200&&resolution<400\":\"\\/usr\\/local\\/huago\\/Textlut300clr.bmp\",\"cis-mode==\\u5f69\\u8272&&resolution>=400\":\"\\/usr\\/local\\/huago\\/Textlut600clr.bmp\",\"cis-mode==\\u7070\\u5ea6&&resolution<=200\":\"\\/usr\\/local\\/huago\\/Textlut200gray.bmp\",\"cis-mode==\\u7070\\u5ea6&&resolution>200&&resolution<400\":\"\\/usr\\/local\\/huago\\/Textlut300gray.bmp\",\"cis-mode==\\u7070\\u5ea6&&resolution>=400\":\"\\/usr\\/local\\/huago\\/Textlut600gray.bmp\",\"default\":\"\\/usr\\/local\\/huago\\/Textlut200clr.bmp\"}},\"cis-mode\":{\"cat\":\"none\",\"group\":\"CIS\",\"title\":\"CIS\\u989c\\u8272\\u6a21\\u5f0f\",\"desc\":\"\\u9009\\u62e9\\u955c\\u5934\\u8272\\u5f69\\u5de5\\u4f5c\\u6a21\\u5f0f\",\"type\":\"string\",\"pos\":1000,\"ui-pos\":10,\"auth\":0,\"bind\":true,\"size\":12,\"default\":{\"(mode.enabled&&(mode==256\\u7ea7\\u7070\\u5ea6||mode==\\u9ed1\\u767d)) || (multiout-type.enabled&&multiout-type==\\u7070\\u5ea6+\\u9ed1\\u767d)\":\"\\u7070\\u5ea6\",\"default\":\"\\u5f69\\u8272\"},\"range\":[\"\\u5f69\\u8272\",\"\\u7070\\u5ea6\"]}}"
};

2
imgproc/algs/image_encoder.cpp
View File

@ -6,7 +6,7 @@
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// img_encoder
static std::string device_opt_json[] = {
"{\"img-fmt\":{\"cat\":\"imgp\",\"group\":\"output\",\"title\":\"\\u56fe\\u7247\\u683c\\u5f0f\",\"desc\":\"\\u8bbe\\u5907\\u8f93\\u51fa\\u7684\\u56fe\\u7247\\u6587\\u4ef6\\u683c\\u5f0f\",\"type\":\"string\",\"ver\":1,\"pos\":9900,\"ui-pos\":10,\"auth\":10,\"visible\":2,\"size\":16,\"cur\":\"JPEG\",\"default\":\"JPEG\",\"range\":[\"JPEG\",\"PNG\",\"BMP\"]},\"jpeg-quality\":{\"cat\":\"imgp\",\"group\":\"output\",\"title\":\"JPEG\\u8d28\\u91cf\",\"desc\":\"\\u8bbe\\u7f6eJPEG\\u538b\\u7f29\\u8d28\\u91cf\\uff0c\\u8d28\\u91cf\\u8d8a\\u9ad8\\uff0c\\u538b\\u7f29\\u7387\\u8d8a\\u4f4e\",\"type\":\"int\",\"ver\":1,\"pos\":9901,\"ui-pos\":11,\"auth\":10,\"affect\":4,\"unit\":\"%\",\"visible\":2,\"size\":4,\"cur\":100,\"default\":100,\"range\":{\"min\":10,\"max\":100,\"step\":1},\"depend\":\"img-fmt==JPEG\"}}"
"{\"img-fmt\":{\"cat\":\"imgp\",\"group\":\"output\",\"title\":\"\\u56fe\\u7247\\u683c\\u5f0f\",\"desc\":\"\\u8bbe\\u5907\\u8f93\\u51fa\\u7684\\u56fe\\u7247\\u6587\\u4ef6\\u683c\\u5f0f\",\"type\":\"string\",\"ver\":1,\"pos\":9900,\"ui-pos\":10,\"auth\":10,\"size\":16,\"cur\":\"JPEG\",\"default\":\"JPEG\",\"range\":[\"JPEG\",\"PNG\",\"BMP\"]},\"jpeg-quality\":{\"cat\":\"imgp\",\"group\":\"output\",\"title\":\"JPEG\\u8d28\\u91cf\",\"desc\":\"\\u8bbe\\u7f6eJPEG\\u538b\\u7f29\\u8d28\\u91cf\\uff0c\\u8d28\\u91cf\\u8d8a\\u9ad8\\uff0c\\u538b\\u7f29\\u7387\\u8d8a\\u4f4e\",\"type\":\"int\",\"ver\":1,\"pos\":9901,\"ui-pos\":11,\"auth\":10,\"affect\":4,\"unit\":\"%\",\"size\":4,\"cur\":100,\"default\":100,\"range\":{\"min\":10,\"max\":100,\"step\":1},\"depend\":\"img-fmt==JPEG\"}}"
};

2
imgproc/algs/rebuild.cpp
View File

@ -8,7 +8,7 @@
static std::string device_opt_json[] = {
"{\"rebuild\":{\"cat\":\"imgp\",\"group\":\"advance\",\"title\":\"CIS\\u56fe\\u50cf\\u8fd8\\u539f\",\"desc\":\"\\u5c06\\u4eceCIS\\u8f93\\u51fa\\u7684\\u539f\\u59cb\\u6570\\u636e\\u6d41\\uff0c\\u8fd8\\u539f\\u4e3aBMP\\u56fe\\u7247\\uff0c\\u5e76\\u62c6\\u5206\\u6b63\\u53cd\\u9762\",\"type\":\"bool\",\"pos\":10,\"ui-pos\":1,\"auth\":100,\"visible\":2,\"size\":4,\"auto\":false,\"cur\":true,\"default\":true}}"
"{\"rebuild\":{\"cat\":\"imgp\",\"group\":\"advance\",\"title\":\"CIS\\u56fe\\u50cf\\u8fd8\\u539f\",\"desc\":\"\\u5c06\\u4eceCIS\\u8f93\\u51fa\\u7684\\u539f\\u59cb\\u6570\\u636e\\u6d41\\uff0c\\u8fd8\\u539f\\u4e3aBMP\\u56fe\\u7247\\uff0c\\u5e76\\u62c6\\u5206\\u6b63\\u53cd\\u9762\",\"type\":\"bool\",\"pos\":10,\"ui-pos\":1,\"auth\":100,\"size\":4,\"auto\":false,\"cur\":true,\"default\":true}}"
};
rebuild::rebuild(bool weaker) : image_processor("rebuild")

2
imgproc/imgprc_mgr.cpp
View File

@ -25,7 +25,7 @@
}
static std::string device_opt_json[] = {
"{\"dump-img\":{\"cat\":\"base\",\"group\":\"advance\",\"title\":\"\\u8f93\\u51fa\\u4e2d\\u95f4\\u56fe\\u50cf\",\"desc\":\"\\u8f93\\u51fa\\u5404\\u7b97\\u6cd5\\u4e2d\\u95f4\\u7ed3\\u679c\\u56fe\\u50cf\",\"type\":\"bool\",\"ui-pos\":20,\"auth\":10,\"affect\":2,\"visible\":2,\"size\":4,\"cur\":false,\"default\":false}}"
"{\"dump-img\":{\"cat\":\"base\",\"group\":\"advance\",\"title\":\"\\u8f93\\u51fa\\u4e2d\\u95f4\\u56fe\\u50cf\",\"desc\":\"\\u8f93\\u51fa\\u5404\\u7b97\\u6cd5\\u4e2d\\u95f4\\u7ed3\\u679c\\u56fe\\u50cf\",\"type\":\"bool\",\"ui-pos\":20,\"auth\":10,\"affect\":2,\"size\":4,\"cur\":false,\"default\":false}}"
};

15
sdk/sane_opt_json/device_opt.cpp
View File

@ -1801,17 +1801,13 @@ void device_option::remove_empty_group(gb_json* root)
}
bool device_option::is_hidden_option(gb_json* opt)
{
int pub = visibility(opt);
bool hidden = false;
int auth = 0;
if (pub != OPT_VISIBLE_ALL)
opt->get_value("auth", auth);
if (!user_ || !user_(auth))
{
int auth = 0;
opt->get_value("auth", auth);
if (pub == OPT_VISIBLE_HIDE || pub == OPT_VISIBLE_NOT_SUPPORT || !user_ || !user_(auth))
{
hidden = true;
}
hidden = true;
}
return hidden;
@ -2051,7 +2047,8 @@ int device_option::update_data(const char* name, void* value, bool reorder_if_ne
if (err == SCANNER_ERR_OK || err == SCANNER_ERR_NOT_EXACT
|| err == SCANNER_ERR_RELOAD_IMAGE_PARAM || err == SCANNER_ERR_RELOAD_OPT_PARAM
|| err == SCANNER_ERR_CONFIGURATION_CHANGED)
// || err == SCANNER_ERR_CONFIGURATION_CHANGED
)
{
gb_json* org = nullptr;

2
xmake.lua
View File

@ -61,7 +61,7 @@ add_defines("BUILD_AS_DEVICE")
add_defines("VER_MAIN=2")
add_defines("VER_FAMILY=200")
add_defines("VER_DATE=20240312")
add_defines("VER_BUILD=7")
add_defines("VER_BUILD=10")
target("conf")
set_kind("phony")