[Bug][R307][bug-view-558][webui] fix the manual search function for the second time has been waiting
Change-Id: I0cd2b675cda9770bc64ae6c18050696c11d7eba2
diff --git a/lynq/CPE_COMMON/ap/app/zte_webui/js/net.js b/lynq/CPE_COMMON/ap/app/zte_webui/js/net.js
index ac6b5c9..650aeb5 100755
--- a/lynq/CPE_COMMON/ap/app/zte_webui/js/net.js
+++ b/lynq/CPE_COMMON/ap/app/zte_webui/js/net.js
@@ -2233,6 +2233,7 @@
}
}
} else {
+ errorOverlay();
target.networkList([]);
}
});
diff --git a/lynq/CPE_TELKOMSEL/ap/app/zte_webui/js/net.js b/lynq/CPE_TELKOMSEL/ap/app/zte_webui/js/net.js
index 22a9d2b..ff0ee40 100755
--- a/lynq/CPE_TELKOMSEL/ap/app/zte_webui/js/net.js
+++ b/lynq/CPE_TELKOMSEL/ap/app/zte_webui/js/net.js
@@ -2233,6 +2233,7 @@
}
}
} else {
+ errorOverlay();
target.networkList([]);
}
});
diff --git a/lynq/MD310/ap/app/goahead/interface5.0/zte_web_wan.c b/lynq/MD310/ap/app/goahead/interface5.0/zte_web_wan.c
index 3130955..9464f6a 100755
--- a/lynq/MD310/ap/app/goahead/interface5.0/zte_web_wan.c
+++ b/lynq/MD310/ap/app/goahead/interface5.0/zte_web_wan.c
@@ -348,8 +348,8 @@
(void)zte_web_write("net_select_mode", "manual_select");
slog(MISC_PRINT, SLOG_NORMAL, "zte_wan_scan_network send message ZUFI_MODULE_ID_AT_MAIN,MSG_CMD_WEB_REQ_NET_SELECT");
- ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_AT_CTL, MSG_CMD_NET_SELECT_REQ, 0, NULL, 0);
(void)zte_web_write("m_netselect_status", "manual_selecting");
+ ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_AT_CTL, MSG_CMD_NET_SELECT_REQ, 0, NULL, 0);
zte_write_result_to_web(wp, SUCCESS);
}
diff --git a/lynq/MD310/ap/app/zte_comm/at_ctl/src/atconfig/ps_normal.c b/lynq/MD310/ap/app/zte_comm/at_ctl/src/atconfig/ps_normal.c
index 43b28fd..57944da 100755
--- a/lynq/MD310/ap/app/zte_comm/at_ctl/src/atconfig/ps_normal.c
+++ b/lynq/MD310/ap/app/zte_comm/at_ctl/src/atconfig/ps_normal.c
@@ -1115,6 +1115,8 @@
}
iCount=0;
}
+ cfg_set(NV_NET_NUM, "0");
+ cfg_set(NV_M_NETSELECT_STATUS, "manual_search_fail");
return 0;
}
@@ -3917,6 +3919,7 @@
{
cfg_set(NV_NET_NUM, "0");
cfg_set(NV_M_NETSELECT_STATUS, "manual_search_fail");
+ DeleteSoftTimer(CopstestTimerID);
return AT_END;
}
diff --git a/lynq/MD310/ap/app/zte_webui/js/net.js b/lynq/MD310/ap/app/zte_webui/js/net.js
index ac6b5c9..650aeb5 100755
--- a/lynq/MD310/ap/app/zte_webui/js/net.js
+++ b/lynq/MD310/ap/app/zte_webui/js/net.js
@@ -2233,6 +2233,7 @@
}
}
} else {
+ errorOverlay();
target.networkList([]);
}
});
diff --git a/lynq/R305/ap/app/goahead/interface5.0/zte_web_wan.c b/lynq/R305/ap/app/goahead/interface5.0/zte_web_wan.c
index 3130955..9464f6a 100755
--- a/lynq/R305/ap/app/goahead/interface5.0/zte_web_wan.c
+++ b/lynq/R305/ap/app/goahead/interface5.0/zte_web_wan.c
@@ -348,8 +348,8 @@
(void)zte_web_write("net_select_mode", "manual_select");
slog(MISC_PRINT, SLOG_NORMAL, "zte_wan_scan_network send message ZUFI_MODULE_ID_AT_MAIN,MSG_CMD_WEB_REQ_NET_SELECT");
- ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_AT_CTL, MSG_CMD_NET_SELECT_REQ, 0, NULL, 0);
(void)zte_web_write("m_netselect_status", "manual_selecting");
+ ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_AT_CTL, MSG_CMD_NET_SELECT_REQ, 0, NULL, 0);
zte_write_result_to_web(wp, SUCCESS);
}
diff --git a/lynq/R305/ap/app/zte_comm/at_ctl/src/atconfig/ps_normal.c b/lynq/R305/ap/app/zte_comm/at_ctl/src/atconfig/ps_normal.c
index 43b28fd..57944da 100755
--- a/lynq/R305/ap/app/zte_comm/at_ctl/src/atconfig/ps_normal.c
+++ b/lynq/R305/ap/app/zte_comm/at_ctl/src/atconfig/ps_normal.c
@@ -1115,6 +1115,8 @@
}
iCount=0;
}
+ cfg_set(NV_NET_NUM, "0");
+ cfg_set(NV_M_NETSELECT_STATUS, "manual_search_fail");
return 0;
}
@@ -3917,6 +3919,7 @@
{
cfg_set(NV_NET_NUM, "0");
cfg_set(NV_M_NETSELECT_STATUS, "manual_search_fail");
+ DeleteSoftTimer(CopstestTimerID);
return AT_END;
}
diff --git a/lynq/R305/ap/app/zte_webui/js/net.js b/lynq/R305/ap/app/zte_webui/js/net.js
index 22a9d2b..ff0ee40 100755
--- a/lynq/R305/ap/app/zte_webui/js/net.js
+++ b/lynq/R305/ap/app/zte_webui/js/net.js
@@ -2233,6 +2233,7 @@
}
}
} else {
+ errorOverlay();
target.networkList([]);
}
});
diff --git a/lynq/R306/ap/app/zte_webui/js/net.js b/lynq/R306/ap/app/zte_webui/js/net.js
index 22a9d2b..ff0ee40 100755
--- a/lynq/R306/ap/app/zte_webui/js/net.js
+++ b/lynq/R306/ap/app/zte_webui/js/net.js
@@ -2233,6 +2233,7 @@
}
}
} else {
+ errorOverlay();
target.networkList([]);
}
});
diff --git a/lynq/R307/ap/app/goahead/interface5.0/zte_web_wan.c b/lynq/R307/ap/app/goahead/interface5.0/zte_web_wan.c
index 3130955..9464f6a 100755
--- a/lynq/R307/ap/app/goahead/interface5.0/zte_web_wan.c
+++ b/lynq/R307/ap/app/goahead/interface5.0/zte_web_wan.c
@@ -348,8 +348,8 @@
(void)zte_web_write("net_select_mode", "manual_select");
slog(MISC_PRINT, SLOG_NORMAL, "zte_wan_scan_network send message ZUFI_MODULE_ID_AT_MAIN,MSG_CMD_WEB_REQ_NET_SELECT");
- ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_AT_CTL, MSG_CMD_NET_SELECT_REQ, 0, NULL, 0);
(void)zte_web_write("m_netselect_status", "manual_selecting");
+ ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_AT_CTL, MSG_CMD_NET_SELECT_REQ, 0, NULL, 0);
zte_write_result_to_web(wp, SUCCESS);
}
diff --git a/lynq/R307/ap/app/zte_comm/at_ctl/src/atconfig/ps_normal.c b/lynq/R307/ap/app/zte_comm/at_ctl/src/atconfig/ps_normal.c
index 43b28fd..57944da 100755
--- a/lynq/R307/ap/app/zte_comm/at_ctl/src/atconfig/ps_normal.c
+++ b/lynq/R307/ap/app/zte_comm/at_ctl/src/atconfig/ps_normal.c
@@ -1115,6 +1115,8 @@
}
iCount=0;
}
+ cfg_set(NV_NET_NUM, "0");
+ cfg_set(NV_M_NETSELECT_STATUS, "manual_search_fail");
return 0;
}
@@ -3917,6 +3919,7 @@
{
cfg_set(NV_NET_NUM, "0");
cfg_set(NV_M_NETSELECT_STATUS, "manual_search_fail");
+ DeleteSoftTimer(CopstestTimerID);
return AT_END;
}
diff --git a/lynq/R307/ap/app/zte_webui/js/net.js b/lynq/R307/ap/app/zte_webui/js/net.js
index ac6b5c9..650aeb5 100755
--- a/lynq/R307/ap/app/zte_webui/js/net.js
+++ b/lynq/R307/ap/app/zte_webui/js/net.js
@@ -2233,6 +2233,7 @@
}
}
} else {
+ errorOverlay();
target.networkList([]);
}
});