commit 4ac8c636c91458c5cde0dc019baec52a8d24e3c3
author liuyang <leo.liu@mobiletek.cn> Fri May 24 14:42:31 2024 +0800
committer liuyang <leo.liu@mobiletek.cn> Fri May 24 14:44:21 2024 +0800
tree 840ae1075bd6564238893b5fc8f450b9a097be95
parent e1404b3366bc0b0d9130b7653bf1285ff5822671

Bug 86498 - [network]qser_nw_set_config网络设置无法设置组合网络只能进行only设置

Change-Id: I44611c0aa29c1b6442bb89e361da3117d2c23e26

mbtk/liblynq_lib/src/lynq_network.c

diff --git a/mbtk/liblynq_lib/src/lynq_network.c b/mbtk/liblynq_lib/src/lynq_network.c
old mode 100755
new mode 100644
index 86bd562..795539c
--- a/mbtk/liblynq_lib/src/lynq_network.c
+++ b/mbtk/liblynq_lib/src/lynq_network.c
@@ -392,7 +392,8 @@
     15 : GSM/UMTS/LTE(LTE preferred)
     */
 
-    if(mbtk_2_lynq) {
+    if(mbtk_2_lynq) 
+    {
         switch(net_mode)
         {
             //使用之前set的tmp_mode的值来进行回显get
@@ -418,31 +419,40 @@
                 mbtk_net_pre = 0xFF;
                 break;
         }
-    } else {
-        switch(net_mode)
+    } 
+    else 
+   {
+        if(QSER_NW_MODE_GSM == net_mode)
         {
-            //只做234G的下配 MBTK_NET_PREF_GSM_ONLY/MBTK_NET_PREF_UMTS_ONLY/MBTK_NET_PREF_LTE_ONLY
-            case QSER_NW_MODE_GSM:
-                mbtk_net_pre = MBTK_NET_PREF_GSM_ONLY;
-                break;
-            case QSER_NW_MODE_WCDMA:
-                mbtk_net_pre = MBTK_NET_PREF_UMTS_ONLY;
-                break;
-            case QSER_NW_MODE_CDMA:
-                //mbtk_net_pre = MBTK_NET_PREF_GSM_UMTS_UMTS_PREF;
-                break;
-            case QSER_NW_MODE_EVDO:
-                //mbtk_net_pre = MBTK_NET_PREF_GSM_UMTS_UMTS_PREF;
-                break;
-            case QSER_NW_MODE_LTE:
-                mbtk_net_pre = MBTK_NET_PREF_LTE_ONLY;
-                break;
-            case QSER_NW_MODE_TDSCDMA:
-                //mbtk_net_pre = MBTK_NET_PREF_GSM_UMTS_UMTS_PREF;
-                break;
-            default:
-                mbtk_net_pre = 0xFF;
-                break;
+            mbtk_net_pre = MBTK_NET_PREF_GSM_ONLY;
+        }
+        else if(QSER_NW_MODE_WCDMA == net_mode)
+        {
+            mbtk_net_pre = MBTK_NET_PREF_UMTS_ONLY;
+        }
+        else if(QSER_NW_MODE_LTE == net_mode)
+        {
+            mbtk_net_pre = MBTK_NET_PREF_LTE_ONLY;
+        }
+        else if((QSER_NW_MODE_GSM | QSER_NW_MODE_WCDMA) == net_mode)
+        {
+            mbtk_net_pre = MBTK_NET_PREF_GSM_UMTS_UMTS_PREF;
+        }
+        else if((QSER_NW_MODE_WCDMA | QSER_NW_MODE_LTE) == net_mode)
+        {
+            mbtk_net_pre = MBTK_NET_PREF_UMTS_LTE_LTE_PREF;
+        }
+        else if((QSER_NW_MODE_GSM | QSER_NW_MODE_LTE) == net_mode)
+        {
+            mbtk_net_pre = MBTK_NET_PREF_GSM_LTE_LTE_PREF;
+        }
+        else if((QSER_NW_MODE_GSM | QSER_NW_MODE_WCDMA | QSER_NW_MODE_LTE) == net_mode)
+        {
+            mbtk_net_pre = MBTK_NET_PREF_GSM_UMTS_LTE_LTE_PREF;
+        }
+        else
+        {
+            mbtk_net_pre = 0xFF;
         }
     }
     return mbtk_net_pre;