now LBS location work

diff --git a/.idea/libraries/Gradle____local_jars___D__workspace_icsupport_app_libs_IAtChannel_classes_jar_unspecified_jar.xml b/.idea/libraries/Gradle____local_jars___D__workspace_icsupport_app_libs_IAtChannel_classes_jar_unspecified_jar.xml
deleted file mode 100644 (file)
index 9801cf8..0000000
--- a/.idea/libraries/Gradle____local_jars___D__workspace_icsupport_app_libs_IAtChannel_classes_jar_unspecified_jar.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">\r
-  <library name="Gradle: __local_jars__:D.\workspace\icsupport\app\libs\IAtChannel_classes.jar:unspecified@jar">\r
-    <CLASSES>\r
-      <root url="jar://$PROJECT_DIR$/app/libs/IAtChannel_classes.jar!/" />\r
-    </CLASSES>\r
-    <JAVADOC />\r
-    <SOURCES />\r
-  </library>\r
-</component>
\ No newline at end of file

diff --git a/.idea/libraries/Gradle____local_jars___D__workspace_icsupport_app_libs_framework_jar_unspecified_jar.xml b/.idea/libraries/Gradle____local_jars___D__workspace_icsupport_app_libs_framework_jar_unspecified_jar.xml
deleted file mode 100644 (file)
index bd2db02..0000000
--- a/.idea/libraries/Gradle____local_jars___D__workspace_icsupport_app_libs_framework_jar_unspecified_jar.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">\r
-  <library name="Gradle: __local_jars__:D.\workspace\icsupport\app\libs\framework.jar:unspecified@jar">\r
-    <CLASSES>\r
-      <root url="jar://$PROJECT_DIR$/app/libs/framework.jar!/" />\r
-    </CLASSES>\r
-    <JAVADOC />\r
-    <SOURCES />\r
-  </library>\r
-</component>
\ No newline at end of file

diff --git a/app/src/main/java/com/ic/protocol/adapter/LBSHelper.java b/app/src/main/java/com/ic/protocol/adapter/LBSHelper.java
index bca55dd..4d87d91 100644 (file)
--- a/app/src/main/java/com/ic/protocol/adapter/LBSHelper.java
+++ b/app/src/main/java/com/ic/protocol/adapter/LBSHelper.java
@@ -167,32 +167,33 @@ public class LBSHelper {
 \r
     @Nullable\r
     private StringBuilder handScanResults() {\r
-        List var4 = this.wifiManager.getScanResults();\r
-        if (var4.size() < 2) {\r
+        List aplist = this.wifiManager.getScanResults();\r
+        if (aplist.size() < 2) {\r
             return null;\r
         } else {\r
-            this.sortByLevel(var4);\r
-            StringBuilder var3 = new StringBuilder();\r
-            Iterator var6 = var4.iterator();\r
-            int var1 = 0;\r
+            this.sortByLevel(aplist);\r
+            StringBuilder sb = new StringBuilder("");\r
+            Iterator it = aplist.iterator();\r
+            int count = 0;\r
 \r
-            while (var6.hasNext()) {\r
-                ScanResult var5 = (ScanResult) var6.next();\r
+            while (it.hasNext()) {\r
+                ScanResult var5 = (ScanResult) it.next();\r
                 if (var5.level != 0) {\r
-                    var3.append("+");\r
-                    var3.append(var5.BSSID);\r
-                    var3.append("@");\r
-                    var3.append(var5.level);\r
-                    int var2 = var1 + 1;\r
-                    var1 = var2;\r
-                    if (var2 == 6) {\r
+                    sb.append("&");\r
+                    sb.append("AP");\r
+                    sb.append(count);\r
+                    sb.append("|");\r
+                    sb.append(var5.BSSID);\r
+                    sb.append("|");\r
+                    sb.append(var5.level);\r
+                    count ++;\r
+                    if (count == 6) {\r
                         break;\r
                     }\r
                 }\r
             }\r
-\r
-            var3.deleteCharAt(0);\r
-            return var3;\r
+            if (sb.toString().startsWith("&"))  sb.deleteCharAt(0);\r
+            return sb;\r
         }\r
     }\r
 \r
@@ -204,12 +205,6 @@ public class LBSHelper {
         });\r
     }\r
 \r
-    public void sendBroadcast(){\r
-        Intent intent = new Intent("android.net.wifi.WIFI_STATE_CHANGED");\r
-        intent.putExtra("wifi_state",3);\r
-        this.context.sendBroadcast(intent);\r
-\r
-    }\r
     private void startTimer() {\r
         if (this.mTimer == null) {\r
             this.mTimer = new Timer();\r
@@ -266,18 +261,20 @@ public class LBSHelper {
                 StringBuilder gsmSb = new StringBuilder(var4);\r
                 StringBuilder mccmnc = new StringBuilder(var4);\r
                 StringBuilder cdmaSB = new StringBuilder();\r
-                gsmSb.insert(3, "@");\r
-                mccmnc.insert(3, "@");\r
+                gsmSb.insert(3, ",");\r
+                mccmnc.insert(3, ",");\r
                 this.runtime.setMccAndMnc(mccmnc.toString());\r
-                if (celllocation instanceof GsmCellLocation) {\r
+                 if (celllocation instanceof GsmCellLocation) {\r
                     GsmCellLocation gsmCell = (GsmCellLocation)celllocation;\r
-                    gsmSb.append("@");\r
+                    gsmSb.append(",");\r
                     gsmSb.append(gsmCell.getLac());\r
-                    gsmSb.append("@");\r
+                    gsmSb.append(",");\r
                     gsmSb.append(gsmCell.getCid());\r
-                    gsmSb.append("@");\r
+                    gsmSb.append(",");\r
                     gsmSb.append(this.mLastSignal);\r
-                    this.runtime.setCdmaInfo(gsmSb.toString());\r
+                     this.runtime.getLocationInstance().setCID(gsmCell.getCid());\r
+                     this.runtime.getLocationInstance().setLAC(gsmCell.getLac());\r
+                     this.runtime.setCdmaInfo(gsmSb.toString());\r
                     ICLog.i("GsmCellLocation "+ gsmSb.toString());\r
                 } else if (celllocation instanceof CdmaCellLocation) {\r
                     CdmaCellLocation cdmaCelllocation = (CdmaCellLocation)celllocation;\r
@@ -329,11 +326,11 @@ public class LBSHelper {
 \r
                         gsmSb.append("+");\r
                         gsmSb.append(mccmnc);\r
-                        gsmSb.append("@");\r
+                        gsmSb.append(",");\r
                         gsmSb.append(mNeighboringCellInfo.getLac());\r
-                        gsmSb.append("@");\r
+                        gsmSb.append(",");\r
                         gsmSb.append(mNeighboringCellInfo.getCid());\r
-                        gsmSb.append("@");\r
+                        gsmSb.append(",");\r
                         gsmSb.append(mNeighboringCellInfo.getRssi() + 110);\r
                         var3 = var2 + 1;\r
                         var2 = var3;\r

diff --git a/app/src/main/java/com/ic/protocol/adapter/protocolAPIHelper.java b/app/src/main/java/com/ic/protocol/adapter/protocolAPIHelper.java
index 654d104..326791d 100644 (file)
--- a/app/src/main/java/com/ic/protocol/adapter/protocolAPIHelper.java
+++ b/app/src/main/java/com/ic/protocol/adapter/protocolAPIHelper.java
@@ -223,7 +223,7 @@ public class protocolAPIHelper {
                 .append(ds.getGPSData()).append(ds.getShortTime()).append(ds.getGPSHeading()).append(ds.getGSMSignal())\r
                 .append(ds.getGPSLocationStarNums()).append(ds.getBatteryLevel()).append("0")\r
                 .append(ds.getProtection()).append(ds.getWorkMode()).append(CMDSPLIT)\r
-                .append(ds.getLBSData()).append(CMDSPLIT).append(ds.getWifiData()).append(CMDEND).toString();\r
+                .append(ds.getLBSData()).append(CMDSPLIT).append(ds.getWifiInfo()).append(CMDEND).toString();\r
     }\r
     public String AP28(String name,String msg,int packagecount,int currentpackageindex,int received_success){\r
         //示例数据：IWAP28,D3590D54,xxxx,6,1,1#\r

diff --git a/app/src/main/java/com/ic/protocol/bean/ICLocation.java b/app/src/main/java/com/ic/protocol/bean/ICLocation.java
index 4ddfacc..cf6db28 100644 (file)
--- a/app/src/main/java/com/ic/protocol/bean/ICLocation.java
+++ b/app/src/main/java/com/ic/protocol/bean/ICLocation.java
@@ -19,16 +19,19 @@ public class ICLocation {
         HashMap<String , Integer> gsm_stations=null;\r
     }\r
     public enum LOCATION_STAT{\r
+        LOCATION_OPEN,\r
         LOCATION_FIXED,\r
+        LOCATION_SEARCHING,\r
         LOCATION_GPS_FAILED,\r
         LOCATION_WIFI_FAILED,\r
+        LOCATION_CLOSED,\r
     }\r
 \r
     public ICLocation(){\r
         if (currentLP == null)\r
             currentLP=new GPS_LocationPoint();\r
 \r
-        currentStat = LOCATION_STAT.LOCATION_FIXED;\r
+        currentStat = LOCATION_STAT.LOCATION_CLOSED;\r
         if (currentLBS == null)\r
             currentLBS = new LBS_Data();\r
         if (currentLBS.gsm_stations==null)\r
@@ -87,12 +90,12 @@ public class ICLocation {
 \r
     private String MCC;\r
     private String MNC;\r
-    private long LAC;\r
-    private long CID;\r
+    private int LAC;\r
+    private int CID;\r
     public void setMCC(String mcc){ MCC=mcc;}\r
     public void setMNC(String mnc){MNC = mnc;}\r
-    public void setLAC(long  lac){LAC=lac;}\r
-    public void setCID(long cid) { CID=cid;}\r
+    public void setLAC(int  lac){LAC=lac;}\r
+    public void setCID(int cid) { CID=cid;}\r
     public String getMCC(){\r
         return MCC;\r
     }\r

diff --git a/app/src/main/java/com/ic/protocol/bean/deviceStatus.java b/app/src/main/java/com/ic/protocol/bean/deviceStatus.java
index 7be8753..8291211 100644 (file)
--- a/app/src/main/java/com/ic/protocol/bean/deviceStatus.java
+++ b/app/src/main/java/com/ic/protocol/bean/deviceStatus.java
@@ -15,10 +15,23 @@ public class deviceStatus {
 \r
     private ICLocation gpsp = null;\r
 \r
+    private String wifiInfo="";\r
+\r
+    public void setWifiinfo(String info){\r
+        wifiInfo=info;\r
+    }\r
+\r
+    public String getWifiInfo(){\r
+        return wifiInfo;\r
+    }\r
+\r
     public deviceStatus() {\r
         if (gpsp == null) gpsp = new ICLocation();\r
     }\r
 \r
+    public ICLocation getLocationInstance(){\r
+        return gpsp;\r
+    }\r
     public String getIMEI() {\r
         return imei;\r
     }\r
@@ -165,7 +178,7 @@ public class deviceStatus {
     }\r
 \r
     public void setMccAndMnc(String MccMnc){\r
-        String [] list=MccMnc.split("@");\r
+        String [] list=MccMnc.split(",");\r
         if (list.length>=2){\r
             gpsp.setMCC(list[0]);\r
             gpsp.setMNC(list[1]);\r
@@ -183,6 +196,8 @@ public class deviceStatus {
         cellinfo = _cellinfo;\r
     }\r
 \r
+\r
+\r
     public String getCurrentCellInfo(){\r
         return cellinfo;\r
     }\r

diff --git a/app/src/main/java/com/ic/protocol/service/protocolMainServer.java b/app/src/main/java/com/ic/protocol/service/protocolMainServer.java
index 40d2b0a..7983a3c 100644 (file)
--- a/app/src/main/java/com/ic/protocol/service/protocolMainServer.java
+++ b/app/src/main/java/com/ic/protocol/service/protocolMainServer.java
@@ -10,6 +10,7 @@ import android.widget.Toast;
 import com.ic.protocol.adapter.LBSHelper;\r
 import com.ic.protocol.adapter.protocolAPIHelper;\r
 import com.ic.protocol.bean.Config;\r
+import com.ic.protocol.bean.ICLocation;\r
 import com.ic.protocol.bean.deviceStatus;\r
 import com.ic.protocol.utils.ICLog;\r
 import com.ic.protocol.utils.RxSocket;\r
@@ -252,20 +253,36 @@ public class protocolMainServer extends Service {
     public class WifiInfolistener implements LBSHelper.OnWiFiInfoListener {\r
 \r
         @Override\r
-        public void getWifiInfoCallBack(String var1) {\r
-\r
-            if (var1 !=null)\r
-                log("getWifiInfoCallBack "+var1);\r
-            else\r
+        public void getWifiInfoCallBack(String aplist) {\r
+\r
+            if (aplist !=null && aplist!="null") {\r
+                log("getWifiInfoCallBack " + aplist);\r
+                mDevStat.setWifiinfo(aplist);\r
+//                String[] list = var1.split("\\+");\r
+//                for (String p : list){\r
+//                    String[] lp=p.split("@");\r
+//                    if (lp.length>=2)\r
+//                    {\r
+//                        mDevStat.getLocationInstance().append_wifiap(lp[0].replace(":","-"),Integer.valueOf(lp[1]));\r
+//                     }else{\r
+//                        log("error format");\r
+//                    }\r
+//                }\r
+            }\r
+            else {\r
                 log("getWifiInfoCallBack wifi end");\r
+                mDevStat.setWifiinfo("");\r
+            }\r
         }\r
     }\r
     public void do_timer_task(){\r
 \r
+        boolean needlogin=true;\r
         if(!isServerConnected()) {\r
             connectServer();\r
+            needlogin=true;\r
         }\r
-        if( needLogin()){\r
+        if( needlogin){\r
             log("do_timer_task send cmd "+ mProtocolAPI.AP00(mDevStat));\r
 //        Handler callbackHandler=new Handler();\r
             String serverip = parseHostGetIPAddress(mConfig.getServerHostname());\r