[Feature][MD310][task-view-1041][LCD] Solve the problem of displaying multiple carriers
Change-Id: Id38c003a2354c2f247a772855c35c6499c0ce58a
diff --git a/lynq/MD310/ap/app/include/cfg_nv_def.h b/lynq/MD310/ap/app/include/cfg_nv_def.h
index d796c82..d18468d 100755
--- a/lynq/MD310/ap/app/include/cfg_nv_def.h
+++ b/lynq/MD310/ap/app/include/cfg_nv_def.h
@@ -238,6 +238,7 @@
#define NV_NET_PROVIDER_CMCC "China Mobile"
#define NV_NET_PROVIDER_CUCC "China Unicom"
#define NV_NET_PROVIDER_CTCC "China Telecom"
+#define NV_NET_PROVIDER_T_SEL "T-SEL"
#define NV_NET_BOLT_4G_1 "PLMN--51088"
#define NV_NET_BOLT_4G_2 "PLMN--51068"
#define NV_NET_BOLT_4G_3 "51088"
diff --git a/lynq/MD310/ap/app/zte_comm/zte_mmi/mmi_lcd.c b/lynq/MD310/ap/app/zte_comm/zte_mmi/mmi_lcd.c
index 1cb953d..c166eaf 100755
--- a/lynq/MD310/ap/app/zte_comm/zte_mmi/mmi_lcd.c
+++ b/lynq/MD310/ap/app/zte_comm/zte_mmi/mmi_lcd.c
@@ -257,50 +257,16 @@
{NET_MODE_NOSERVICE, 0, TRUE, "signalx.png", FALSE, {0}},
{NET_MODE_LIMITSERVICE, 0, TRUE, "signalx.png", FALSE, {0}},
{NET_MODE_DEFAULT, 0, TRUE, "signalx.png", FALSE, {0}},
- {NET_MODE_NOTREADY, 0, TRUE, "no-sim.png", FALSE, {0}},
+ {NET_MODE_NOTREADY, 0, TRUE, "no-sim.png", FALSE, {0}}
};
static T_NetSignalConfigInfo g_lcdOperatorConfigInfoTab[] = {
- {NET_MODE_4G, 5, FALSE, "t-sel.png", FALSE, {0}},
- {NET_MODE_4G, 4, FALSE, "t-sel.png", FALSE, {0}},
- {NET_MODE_4G, 3, FALSE, "t-sel.png", FALSE, {0}},
- {NET_MODE_4G, 2, FALSE, "t-sel.png", FALSE, {0}},
- {NET_MODE_4G, 1, FALSE, "t-sel.png", FALSE, {0}},
- {NET_MODE_4G, 0, FALSE, "t-sel.png", FALSE, {0}},
- {NET_MODE_4G, 5, TRUE, "t-sel.png", FALSE, {0}},
- {NET_MODE_4G, 4, TRUE, "t-sel.png", FALSE, {0}},
- {NET_MODE_4G, 3, TRUE, "t-sel.png", FALSE, {0}},
- {NET_MODE_4G, 2, TRUE, "t-sel.png", FALSE, {0}},
- {NET_MODE_4G, 1, TRUE, "t-sel.png", FALSE, {0}},
- {NET_MODE_4G, 0, TRUE, "t-sel.png", FALSE, {0}},
- {NET_MODE_3G, 5, FALSE, "t-sel.png", FALSE, {0}},
- {NET_MODE_3G, 4, FALSE, "t-sel.png", FALSE, {0}},
- {NET_MODE_3G, 3, FALSE, "t-sel.png", FALSE, {0}},
- {NET_MODE_3G, 2, FALSE, "t-sel.png", FALSE, {0}},
- {NET_MODE_3G, 1, FALSE, "t-sel.png", FALSE, {0}},
- {NET_MODE_3G, 0, FALSE, "t-sel.png", FALSE, {0}},
- {NET_MODE_3G, 5, TRUE, "t-sel.png", FALSE, {0}},
- {NET_MODE_3G, 4, TRUE, "t-sel.png", FALSE, {0}},
- {NET_MODE_3G, 3, TRUE, "t-sel.png", FALSE, {0}},
- {NET_MODE_3G, 2, TRUE, "t-sel.png", FALSE, {0}},
- {NET_MODE_3G, 1, TRUE, "t-sel.png", FALSE, {0}},
- {NET_MODE_3G, 0, TRUE, "t-sel.png", FALSE, {0}},
- {NET_MODE_2G, 5, FALSE, "t-sel.png", FALSE, {0}},
- {NET_MODE_2G, 4, FALSE, "t-sel.png", FALSE, {0}},
- {NET_MODE_2G, 3, FALSE, "t-sel.png", FALSE, {0}},
- {NET_MODE_2G, 2, FALSE, "t-sel.png", FALSE, {0}},
- {NET_MODE_2G, 1, FALSE, "t-sel.png", FALSE, {0}},
- {NET_MODE_2G, 0, FALSE, "t-sel.png", FALSE, {0}},
- {NET_MODE_2G, 5, TRUE, "t-sel.png", FALSE, {0}},
- {NET_MODE_2G, 4, TRUE, "t-sel.png", FALSE, {0}},
- {NET_MODE_2G, 3, TRUE, "t-sel.png", FALSE, {0}},
- {NET_MODE_2G, 2, TRUE, "t-sel.png", FALSE, {0}},
- {NET_MODE_2G, 1, TRUE, "t-sel.png", FALSE, {0}},
- {NET_MODE_2G, 0, TRUE, "t-sel.png", FALSE, {0}},
- {NET_MODE_NOSERVICE, 0, TRUE, "not-found.png", FALSE, {0}},
- {NET_MODE_LIMITSERVICE, 0, TRUE, "not-found.png", FALSE, {0}},
{NET_MODE_DEFAULT, 0, TRUE, "not-found.png", FALSE, {0}},
{NET_MODE_NOTREADY, 0, TRUE, "no-sim.png", FALSE, {0}},
+ {NET_MODE_4G, 0, FALSE, "cmcc.png", FALSE, {0}},
+ {NET_MODE_4G, 0, FALSE, "cucc.png", FALSE, {0}},
+ {NET_MODE_4G, 0, FALSE, "ctcc.png", FALSE, {0}},
+ {NET_MODE_4G, 0, FALSE, "t-sel.png", FALSE, {0}}
};
static CHAR* g_lcdNetConnectPicPath = "download.png";
@@ -1281,6 +1247,7 @@
T_zMMINetInfo * pNetInfo = (T_zMMINetInfo *)taskInfo;
UINT32 nettab_index = 0;
char mmi_nv_value[32] = {0};
+ char nv_net_pro [64] = {0};
g_LcdShowInfoTab[LCD_SHOW_NET_SIGNAL].type = LCD_SHOW_INVLAID;
//g_LcdShowInfoTab[LCD_SHOW_NET_CONNECT].type = LCD_SHOW_INVLAID;
@@ -1295,12 +1262,40 @@
g_LcdShowInfoTab[LCD_SHOW_NET_SIGNAL].type = LCD_SHOW_PICTURE;
}
+ slog(MMI_PRINT, SLOG_DEBUG, "ZTE_MMI mmi_getLcdNetInfo nettab_index:%d\n", nettab_index);
+
if (pNetInfo->net_mode == NET_MODE_NOSERVICE || pNetInfo->net_mode == NET_MODE_LIMITSERVICE || pNetInfo->net_mode == NET_MODE_DEFAULT)
{
+ nettab_index = 0; // no network
cfg_get_item(NV_MODEM_MAIN_STATE, mmi_nv_value, sizeof(mmi_nv_value));
if (strcmp(mmi_nv_value, NV_SIM_STATE_INIT_COMPLETE))
{
- nettab_index = sizeof(g_lcdOperatorConfigInfoTab) / sizeof(T_NetSignalConfigInfo) - 1; // no sim
+ nettab_index = 1; // no sim
+ }
+ }
+ else
+ {
+ cfg_get_item(NV_NETWORK_PROVIDER, nv_net_pro, 64);
+ slog(MMI_PRINT, SLOG_DEBUG, "ZTE_MMI mmi_getLcdNetInfo nv_net_pro:%s\n", nv_net_pro);
+ if (!strcasecmp(nv_net_pro, NV_NET_PROVIDER_CMCC))
+ {
+ nettab_index = 2;
+ }
+ else if (!strcasecmp(nv_net_pro, NV_NET_PROVIDER_CUCC))
+ {
+ nettab_index = 3;
+ }
+ else if (!strcasecmp(nv_net_pro, NV_NET_PROVIDER_CTCC))
+ {
+ nettab_index = 4;
+ }
+ else if(!strcasecmp(nv_net_pro, NV_NET_PROVIDER_T_SEL))
+ {
+ nettab_index = 5;
+ }
+ else
+ {
+ nettab_index = 0; // new operator
}
}
if (mmi_getBitmapFromFile(g_LcdShowInfoTab[LCD_SHOW_OPERATOR].bitmap, g_lcdOperatorConfigInfoTab[nettab_index].path,
diff --git a/lynq/MD310/ap/project/zx297520v3/prj_cpe_min/fs/normal/rootfs/etc_ro/mmi/cmcc.png b/lynq/MD310/ap/project/zx297520v3/prj_cpe_min/fs/normal/rootfs/etc_ro/mmi/cmcc.png
new file mode 100755
index 0000000..89ad0d3
--- /dev/null
+++ b/lynq/MD310/ap/project/zx297520v3/prj_cpe_min/fs/normal/rootfs/etc_ro/mmi/cmcc.png
Binary files differ
diff --git a/lynq/MD310/ap/project/zx297520v3/prj_cpe_min/fs/normal/rootfs/etc_ro/mmi/ctcc.png b/lynq/MD310/ap/project/zx297520v3/prj_cpe_min/fs/normal/rootfs/etc_ro/mmi/ctcc.png
new file mode 100755
index 0000000..7f891ad
--- /dev/null
+++ b/lynq/MD310/ap/project/zx297520v3/prj_cpe_min/fs/normal/rootfs/etc_ro/mmi/ctcc.png
Binary files differ
diff --git a/lynq/MD310/ap/project/zx297520v3/prj_cpe_min/fs/normal/rootfs/etc_ro/mmi/cucc.png b/lynq/MD310/ap/project/zx297520v3/prj_cpe_min/fs/normal/rootfs/etc_ro/mmi/cucc.png
new file mode 100755
index 0000000..069e048
--- /dev/null
+++ b/lynq/MD310/ap/project/zx297520v3/prj_cpe_min/fs/normal/rootfs/etc_ro/mmi/cucc.png
Binary files differ
