[Bugfix][R305][bug-view-1599][led] LED light not flashing during network registration process
Change-Id: I80d2c35b28536ece0b9f93d9860e469863338611
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 801b3b1..e6af01b 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
@@ -4795,9 +4795,9 @@
//{
// normal_sysinfodomainpdpdail(tPara.srvDomain);
//}
- cfg_get_item("signalbar", strSignalbar, sizeof(strSignalbar));
- signalbar = atoi(strSignalbar);
- ipc_send_message(MODULE_ID_AT_CTL, MODULE_ID_MMI,MSG_CMD_OUT_REG_GET_SIGNAL_NUM, sizeof(signalbar), (UINT8 *)&signalbar,0);
+ //cfg_get_item("signalbar", strSignalbar, sizeof(strSignalbar));
+ //signalbar = atoi(strSignalbar);
+ //ipc_send_message(MODULE_ID_AT_CTL, MODULE_ID_MMI,MSG_CMD_OUT_REG_GET_SIGNAL_NUM, sizeof(signalbar), (UINT8 *)&signalbar,0);
//zhangfen for PDP
//ipc_send_message(MODULE_ID_AT_CTL,MODULE_ID_MAIN_CTRL, MSG_CMD_NET_AUTO_DIAL, 0, NULL, 0);
diff --git a/lynq/R305/ap/app/zte_comm/zte_mmi/mmi_cfg.c b/lynq/R305/ap/app/zte_comm/zte_mmi/mmi_cfg.c
index 60717f5..38ff828 100755
--- a/lynq/R305/ap/app/zte_comm/zte_mmi/mmi_cfg.c
+++ b/lynq/R305/ap/app/zte_comm/zte_mmi/mmi_cfg.c
@@ -67,6 +67,9 @@
{CUSTOMER_SDK_MIN, {NET_MODE_4G, 0, 0, 0, 0, NET_SOCKET_INACTIVE}, {LED_WAN, LED_STATE_ON, LED_STATE_DEFAULT_BLINK, {0}, LED_COLOR_YELLOW, TRAFFIC_LED_MAX}},
{CUSTOMER_SDK_MIN, {NET_MODE_4G, 0, 0, 1, 0, NET_SOCKET_INACTIVE}, {LED_WAN, LED_STATE_ON, LED_STATE_DEFAULT_BLINK, {0}, LED_COLOR_BLUE, TRAFFIC_LED_MAX}},
{CUSTOMER_SDK_MIN, {NET_MODE_4G, 0, 0, 2, 0, NET_SOCKET_INACTIVE}, {LED_WAN, LED_STATE_ON, LED_STATE_DEFAULT_BLINK, {0}, LED_COLOR_GREEN, TRAFFIC_LED_MAX}},
+ {CUSTOMER_SDK_MIN, {NET_MODE_4G, 2, 0, 0, 0, NET_SOCKET_INACTIVE}, {LED_WAN, LED_STATE_BLINK, LED_STATE_DEFAULT_BLINK, {0}, LED_COLOR_YELLOW, TRAFFIC_LED_MAX}},
+ {CUSTOMER_SDK_MIN, {NET_MODE_4G, 2, 0, 1, 0, NET_SOCKET_INACTIVE}, {LED_WAN, LED_STATE_BLINK, LED_STATE_DEFAULT_BLINK, {0}, LED_COLOR_BLUE, TRAFFIC_LED_MAX}},
+ {CUSTOMER_SDK_MIN, {NET_MODE_4G, 2, 0, 2, 0, NET_SOCKET_INACTIVE}, {LED_WAN, LED_STATE_BLINK, LED_STATE_DEFAULT_BLINK, {0}, LED_COLOR_GREEN, TRAFFIC_LED_MAX}},
{CUSTOMER_SDK_MIN, {NET_MODE_NOSERVICE, 0, 0, 0, 0, NET_SOCKET_INACTIVE}, {LED_WAN, LED_STATE_ON, LED_STATE_DEFAULT_BLINK, {0}, LED_COLOR_RED, TRAFFIC_LED_MAX}},
{CUSTOMER_SDK_MIN, {NET_MODE_LIMITSERVICE, 0, 0, 0, 0, NET_SOCKET_INACTIVE}, {LED_WAN, LED_STATE_ON, LED_STATE_DEFAULT_BLINK, {0}, LED_COLOR_RED, TRAFFIC_LED_MAX}},
{CUSTOMER_SDK_MIN, {NET_MODE_NOTREADY, 0, 0, 0, 0, NET_SOCKET_INACTIVE}, {LED_WAN, LED_STATE_BLINK, LED_STATE_WAN_BLINK, {0}, LED_COLOR_RED, TRAFFIC_LED_MAX}},
diff --git a/lynq/R305/ap/app/zte_comm/zte_mmi/mmi_led.c b/lynq/R305/ap/app/zte_comm/zte_mmi/mmi_led.c
index b234063..f2a0cf1 100755
--- a/lynq/R305/ap/app/zte_comm/zte_mmi/mmi_led.c
+++ b/lynq/R305/ap/app/zte_comm/zte_mmi/mmi_led.c
@@ -567,10 +567,22 @@
return MMI_SUCCESS;
} else {
//if ((pNetInfo->connect_status == g_mmi_netled_config_tab[i].net_info.connect_status) && (pNetInfo->socket_state == g_mmi_netled_config_tab[i].net_info.socket_state)) {
- if ((pNetInfo->signal_weak == g_mmi_netled_config_tab[i].net_info.signal_weak)) {
- mmi_setLedShowInfo(pLedInfo, g_mmi_netled_config_tab[i].led_info);
- slog(MMI_PRINT, SLOG_NORMAL, "ZTE_MMI mmi_getLedNetInfo netmode = %d, signal_weak = %d,i = %d,ledsta = %d\n", net_mode, pNetInfo->signal_weak, i, g_mmi_netled_config_tab[i].led_info.led_state);
- return MMI_SUCCESS;
+ if (pNetInfo->connect_status == 2)
+ {
+ if ((pNetInfo->connect_status == g_mmi_netled_config_tab[i].net_info.connect_status) && (pNetInfo->signal_weak == g_mmi_netled_config_tab[i].net_info.signal_weak))
+ {
+ mmi_setLedShowInfo(pLedInfo, g_mmi_netled_config_tab[i].led_info);
+ slog(MMI_PRINT, SLOG_NORMAL, "**ZTE_MMI mmi_getLedNetInfo netmode = %d, signal_weak = %d,i = %d,ledsta = %d\n", net_mode, pNetInfo->signal_weak, i, g_mmi_netled_config_tab[i].led_info.led_state);
+ return MMI_SUCCESS;
+ }
+ }
+ else
+ {
+ if ((pNetInfo->signal_weak == g_mmi_netled_config_tab[i].net_info.signal_weak)) {
+ mmi_setLedShowInfo(pLedInfo, g_mmi_netled_config_tab[i].led_info);
+ slog(MMI_PRINT, SLOG_NORMAL, "ZTE_MMI mmi_getLedNetInfo netmode = %d, signal_weak = %d,i = %d,ledsta = %d\n", net_mode, pNetInfo->signal_weak, i, g_mmi_netled_config_tab[i].led_info.led_state);
+ return MMI_SUCCESS;
+ }
}
}
}
diff --git a/lynq/R305/ap/app/zte_comm/zte_mmi/mmi_net.c b/lynq/R305/ap/app/zte_comm/zte_mmi/mmi_net.c
index 2cf2665..f911052 100755
--- a/lynq/R305/ap/app/zte_comm/zte_mmi/mmi_net.c
+++ b/lynq/R305/ap/app/zte_comm/zte_mmi/mmi_net.c
@@ -161,10 +161,11 @@
}
slog(MMI_PRINT, SLOG_NORMAL, "ZTE_MMI svr_handle_msg_connect_status NET_Connect_State = %d\n", NET_Connect_State);
if (NET_Connect_State == 1 || NET_Connect_State == 0) {
- mmi_set_net_update();
+ //mmi_set_net_update();
ipc_send_message(MODULE_ID_MMI, MODULE_ID_FLUXSTAT, MSG_CMD_CHANNEL_CONNECT_STATUS, sizeof(NET_Connect_State), (UCHAR *)&NET_Connect_State, 0);
}
mmi_update_net_tip(NET_Connect_State, s_mmi_net_mode);
+ mmi_set_net_update();
return 0;
}