[Feature][MD310][task-view-792][project] synchronize MD310 modifications according to R307 customer requirements

Change-Id: I96bf139abc6f4c592a83ec7d996d4260afaede0e
diff --git a/lynq/MD310/ap/app/zte_webui/js/com.js b/lynq/MD310/ap/app/zte_webui/js/com.js
index a4de910..73e9c0d 100755
--- a/lynq/MD310/ap/app/zte_webui/js/com.js
+++ b/lynq/MD310/ap/app/zte_webui/js/com.js
@@ -497,6 +497,25 @@
             }

         }

     }

+    function getNetworkStatus() {

+        return stuffMake(arguments, {}, prepare, deal, null, false);

+        function prepare(values, isPost) {

+            var valueReq = {};

+            valueReq.cmd = "NETWORK_INFO";

+            return valueReq;

+        }

+        function deal(result) {

+            return {

+                sinr: result.lte_sinr,

+                rsrp: result.lte_rsrp,

+                rsrq: result.lte_rsrq,

+                plmn: result.lte_plmn,

+                pci: result.lte_pci,

+                cellid: result.lte_cellid,

+                band: result.lte_band

+            };

+       }

+    }

     function deleteApn() {

         return stuffMake(arguments, {}, prepare, deal, null, true);

         function prepare(values, isPost) {

@@ -2888,7 +2907,7 @@
         function prepare(values, isPost) {

 	    var wpask = config.PASSWORD_ENCODE ? "WPAPSK1_encode,m_WPAPSK1_encode," : "rnum_js,WPAPSK1_enaes,m_WPAPSK1_enaes,";

             var valueReq = {

-                cmd: "wifi_coverage,m_ssid_enable,imei,network_type,sub_network_type,rssi,rscp,lte_rsrp,imsi,sim_imsi,cr_version,hw_version,MAX_Access_num," + wpask + "SSID1,AuthMode,m_SSID,m_AuthMode,m_HideSSID,m_MAX_Access_num,lan_ipaddr," + "mac_address,msisdn,LocalDomain,wan_ipaddr,static_wan_ipaddr,ipv6_wan_ipaddr,ipv6_pdp_type,pdp_type,ppp_status,sta_ip_status,rj45_state,ethwan_mode",

+                cmd: "wifi_coverage,m_ssid_enable,imei,ziccid,cell_id,network_type,sub_network_type,rssi,rscp,lte_rsrp,imsi,sim_imsi,cr_version,hw_version,MAX_Access_num," + wpask + "SSID1,AuthMode,m_SSID,m_AuthMode,m_HideSSID,m_MAX_Access_num,lan_ipaddr," + "mac_address,msisdn,LocalDomain,wan_ipaddr,static_wan_ipaddr,ipv6_wan_ipaddr,ipv6_pdp_type,pdp_type,ppp_status,sta_ip_status,rj45_state,ethwan_mode",

                 multi_data: 1

             };

             return valueReq;

@@ -2915,6 +2934,8 @@
                     imei: paramD.imei,

                     signal: convertSignal(paramD),

                     imsi: paramD.imsi || paramD.sim_imsi,

+                    iccid: paramD.ziccid,

+                    cellid: paramD.cell_id,

                     sw_version: paramD.cr_version,

                     hw_version: paramD.hw_version,

                     max_access_num: paramD.MAX_Access_num,

@@ -5475,6 +5496,7 @@
         getLanInfo: getLanInfo,

         setLanInfo: setLanInfo,       

         getApnSettings: getApnSettings,

+        getNetworkStatus: getNetworkStatus,

         deleteApn: deleteApn,

         setDefaultApn: setDefaultApn,

         addOrEditApn: addOrEditApn,

@@ -6135,14 +6157,14 @@
                     minHeight: minHeight

                 };

                 popup(option);

-                

+

                 $('#yesbtn, #nobtn, #okbtn').hide();

-                

+

                 setTimeout(function() {

                     $.modal.close();

                 }, 1000);

             }

-            

+

             setInterval(target.loadFileContent, 1000);

 

             target.pingStart = function () {

@@ -7800,6 +7822,7 @@
         target.hasRj45 = set.RJ45_SUPPORT;

         target.notDataCard = set.PRODUCT_TYPE != 'DATACARD';

         target.hasParentalControl = set.HAS_PARENTAL_CONTROL;

+        target.hasUssd = set.HAS_USSD;

         var wifiInfo = fnc.getWifiBasic();

         if (set.WIFI_SUPPORT_QR_SWITCH) {

             target.showQRCode = set.WIFI_SUPPORT_QR_CODE && wifiInfo.show_qrcode_flag;

@@ -7849,6 +7872,8 @@
         target.simSerialNumber = libko.observable('');

         target.imei = libko.observable('');

         target.imsi = libko.observable('');

+        target.iccid = libko.observable('');

+        target.cellid = libko.observable('');

         target.ssid = libko.observable('');

         target.hasWifi = set.HAS_WIFI;

         target.showMultiSsid = libko.observable(set.HAS_MULTI_SSID && wifiInfo.multi_ssid_enable == "1");

@@ -7885,6 +7910,8 @@
             target.simSerialNumber(verifyDeviceInfo(data.simSerialNumber));

             target.imei(verifyDeviceInfo(data.imei));

             target.imsi(verifyDeviceInfo(data.imsi));

+            target.iccid(verifyDeviceInfo(data.iccid));

+            target.cellid(verifyDeviceInfo(data.cellid));

             target.ssid(verifyDeviceInfo(data.ssid));

             target.showMultiSsid(set.HAS_MULTI_SSID && data.multi_ssid_enable == "1");

             return data;

@@ -7899,6 +7926,8 @@
                 simSerialNumber: verifyDeviceInfo(data.simSerialNumber),

                 imei: verifyDeviceInfo(data.imei),

                 imsi: verifyDeviceInfo(data.imsi),

+                iccid : verifyDeviceInfo(data.iccid),

+                cellid: verifyDeviceInfo(data.cellid),

                 signal: signalFormat(data.signal),

                 hasWifi: set.HAS_WIFI,

                 isCPE: set.PRODUCT_TYPE == 'CPE',