From: snicker Date: Mon, 30 Dec 2019 23:25:18 +0000 (+0800) Subject: now LBS location work X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=52505a9e15d762a45ad4138bfbec49c2797b201d;p=icsupport.git 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 index 9801cf8f..00000000 --- a/.idea/libraries/Gradle____local_jars___D__workspace_icsupport_app_libs_IAtChannel_classes_jar_unspecified_jar.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ 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 index bd2db024..00000000 --- a/.idea/libraries/Gradle____local_jars___D__workspace_icsupport_app_libs_framework_jar_unspecified_jar.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ 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 bca55dd4..4d87d913 100644 --- 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 { @Nullable private StringBuilder handScanResults() { - List var4 = this.wifiManager.getScanResults(); - if (var4.size() < 2) { + List aplist = this.wifiManager.getScanResults(); + if (aplist.size() < 2) { return null; } else { - this.sortByLevel(var4); - StringBuilder var3 = new StringBuilder(); - Iterator var6 = var4.iterator(); - int var1 = 0; + this.sortByLevel(aplist); + StringBuilder sb = new StringBuilder(""); + Iterator it = aplist.iterator(); + int count = 0; - while (var6.hasNext()) { - ScanResult var5 = (ScanResult) var6.next(); + while (it.hasNext()) { + ScanResult var5 = (ScanResult) it.next(); if (var5.level != 0) { - var3.append("+"); - var3.append(var5.BSSID); - var3.append("@"); - var3.append(var5.level); - int var2 = var1 + 1; - var1 = var2; - if (var2 == 6) { + sb.append("&"); + sb.append("AP"); + sb.append(count); + sb.append("|"); + sb.append(var5.BSSID); + sb.append("|"); + sb.append(var5.level); + count ++; + if (count == 6) { break; } } } - - var3.deleteCharAt(0); - return var3; + if (sb.toString().startsWith("&")) sb.deleteCharAt(0); + return sb; } } @@ -204,12 +205,6 @@ public class LBSHelper { }); } - public void sendBroadcast(){ - Intent intent = new Intent("android.net.wifi.WIFI_STATE_CHANGED"); - intent.putExtra("wifi_state",3); - this.context.sendBroadcast(intent); - - } private void startTimer() { if (this.mTimer == null) { this.mTimer = new Timer(); @@ -266,18 +261,20 @@ public class LBSHelper { StringBuilder gsmSb = new StringBuilder(var4); StringBuilder mccmnc = new StringBuilder(var4); StringBuilder cdmaSB = new StringBuilder(); - gsmSb.insert(3, "@"); - mccmnc.insert(3, "@"); + gsmSb.insert(3, ","); + mccmnc.insert(3, ","); this.runtime.setMccAndMnc(mccmnc.toString()); - if (celllocation instanceof GsmCellLocation) { + if (celllocation instanceof GsmCellLocation) { GsmCellLocation gsmCell = (GsmCellLocation)celllocation; - gsmSb.append("@"); + gsmSb.append(","); gsmSb.append(gsmCell.getLac()); - gsmSb.append("@"); + gsmSb.append(","); gsmSb.append(gsmCell.getCid()); - gsmSb.append("@"); + gsmSb.append(","); gsmSb.append(this.mLastSignal); - this.runtime.setCdmaInfo(gsmSb.toString()); + this.runtime.getLocationInstance().setCID(gsmCell.getCid()); + this.runtime.getLocationInstance().setLAC(gsmCell.getLac()); + this.runtime.setCdmaInfo(gsmSb.toString()); ICLog.i("GsmCellLocation "+ gsmSb.toString()); } else if (celllocation instanceof CdmaCellLocation) { CdmaCellLocation cdmaCelllocation = (CdmaCellLocation)celllocation; @@ -329,11 +326,11 @@ public class LBSHelper { gsmSb.append("+"); gsmSb.append(mccmnc); - gsmSb.append("@"); + gsmSb.append(","); gsmSb.append(mNeighboringCellInfo.getLac()); - gsmSb.append("@"); + gsmSb.append(","); gsmSb.append(mNeighboringCellInfo.getCid()); - gsmSb.append("@"); + gsmSb.append(","); gsmSb.append(mNeighboringCellInfo.getRssi() + 110); var3 = var2 + 1; var2 = var3; 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 654d104e..326791d6 100644 --- 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()) .append(ds.getGPSLocationStarNums()).append(ds.getBatteryLevel()).append("0") .append(ds.getProtection()).append(ds.getWorkMode()).append(CMDSPLIT) - .append(ds.getLBSData()).append(CMDSPLIT).append(ds.getWifiData()).append(CMDEND).toString(); + .append(ds.getLBSData()).append(CMDSPLIT).append(ds.getWifiInfo()).append(CMDEND).toString(); } public String AP28(String name,String msg,int packagecount,int currentpackageindex,int received_success){ //示例数据：IWAP28,D3590D54,xxxx,6,1,1# 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 4ddfacc2..cf6db28a 100644 --- 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 gsm_stations=null; } public enum LOCATION_STAT{ + LOCATION_OPEN, LOCATION_FIXED, + LOCATION_SEARCHING, LOCATION_GPS_FAILED, LOCATION_WIFI_FAILED, + LOCATION_CLOSED, } public ICLocation(){ if (currentLP == null) currentLP=new GPS_LocationPoint(); - currentStat = LOCATION_STAT.LOCATION_FIXED; + currentStat = LOCATION_STAT.LOCATION_CLOSED; if (currentLBS == null) currentLBS = new LBS_Data(); if (currentLBS.gsm_stations==null) @@ -87,12 +90,12 @@ public class ICLocation { private String MCC; private String MNC; - private long LAC; - private long CID; + private int LAC; + private int CID; public void setMCC(String mcc){ MCC=mcc;} public void setMNC(String mnc){MNC = mnc;} - public void setLAC(long lac){LAC=lac;} - public void setCID(long cid) { CID=cid;} + public void setLAC(int lac){LAC=lac;} + public void setCID(int cid) { CID=cid;} public String getMCC(){ return MCC; } 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 7be87536..8291211e 100644 --- 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 { private ICLocation gpsp = null; + private String wifiInfo=""; + + public void setWifiinfo(String info){ + wifiInfo=info; + } + + public String getWifiInfo(){ + return wifiInfo; + } + public deviceStatus() { if (gpsp == null) gpsp = new ICLocation(); } + public ICLocation getLocationInstance(){ + return gpsp; + } public String getIMEI() { return imei; } @@ -165,7 +178,7 @@ public class deviceStatus { } public void setMccAndMnc(String MccMnc){ - String [] list=MccMnc.split("@"); + String [] list=MccMnc.split(","); if (list.length>=2){ gpsp.setMCC(list[0]); gpsp.setMNC(list[1]); @@ -183,6 +196,8 @@ public class deviceStatus { cellinfo = _cellinfo; } + + public String getCurrentCellInfo(){ return cellinfo; } 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 40d2b0a6..7983a3c6 100644 --- 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; import com.ic.protocol.adapter.protocolAPIHelper; import com.ic.protocol.bean.Config; +import com.ic.protocol.bean.ICLocation; import com.ic.protocol.bean.deviceStatus; import com.ic.protocol.utils.ICLog; import com.ic.protocol.utils.RxSocket; @@ -252,20 +253,36 @@ public class protocolMainServer extends Service { public class WifiInfolistener implements LBSHelper.OnWiFiInfoListener { @Override - public void getWifiInfoCallBack(String var1) { - - if (var1 !=null) - log("getWifiInfoCallBack "+var1); - else + public void getWifiInfoCallBack(String aplist) { + + if (aplist !=null && aplist!="null") { + log("getWifiInfoCallBack " + aplist); + mDevStat.setWifiinfo(aplist); +// String[] list = var1.split("\\+"); +// for (String p : list){ +// String[] lp=p.split("@"); +// if (lp.length>=2) +// { +// mDevStat.getLocationInstance().append_wifiap(lp[0].replace(":","-"),Integer.valueOf(lp[1])); +// }else{ +// log("error format"); +// } +// } + } + else { log("getWifiInfoCallBack wifi end"); + mDevStat.setWifiinfo(""); + } } } public void do_timer_task(){ + boolean needlogin=true; if(!isServerConnected()) { connectServer(); + needlogin=true; } - if( needLogin()){ + if( needlogin){ log("do_timer_task send cmd "+ mProtocolAPI.AP00(mDevStat)); // Handler callbackHandler=new Handler(); String serverip = parseHostGetIPAddress(mConfig.getServerHostname());