|
|
|
@ -163,7 +163,7 @@ public class MainActivity extends AppCompatActivity { |
|
|
|
switch (frameType) { |
|
|
|
case FrameiBeacon://iBeacon |
|
|
|
IBeaconFrame iBeaconFrame = (IBeaconFrame) minewFrame; |
|
|
|
Log.v("beaconplus1", iBeaconFrame.getUuid() + iBeaconFrame.getMajor() + iBeaconFrame.getMinor()); |
|
|
|
Log.v("beaconplus1", iBeaconFrame.getUuid() + " "+ iBeaconFrame.getMajor() + " "+ iBeaconFrame.getMinor()); |
|
|
|
break; |
|
|
|
case FrameUID://uid |
|
|
|
UidFrame uidFrame = (UidFrame) minewFrame; |
|
|
|
@ -178,11 +178,11 @@ public class MainActivity extends AppCompatActivity { |
|
|
|
break; |
|
|
|
case FrameHTSensor: |
|
|
|
HTFrame htFrame = (HTFrame) minewFrame;//ht |
|
|
|
Log.v("beaconplus4", String.valueOf(htFrame.getTemperature() + htFrame.getHumidity())); |
|
|
|
Log.v("beaconplus4", String.valueOf(htFrame.getTemperature() + " "+ htFrame.getHumidity())); |
|
|
|
break; |
|
|
|
case FrameTLM: |
|
|
|
TlmFrame tlmFrame = (TlmFrame) minewFrame;//tlm |
|
|
|
Log.v("beaconplus5", String.valueOf(tlmFrame.getTemperature() + tlmFrame.getBatteryVol() + tlmFrame.getSecCount() + tlmFrame.getAdvCount())); |
|
|
|
Log.v("beaconplus5", String.valueOf(tlmFrame.getTemperature() + " "+ tlmFrame.getBatteryVol() + " "+ tlmFrame.getSecCount() + " "+ tlmFrame.getAdvCount())); |
|
|
|
break; |
|
|
|
case FrameURL: |
|
|
|
UrlFrame urlFrame = (UrlFrame) minewFrame;//url |
|
|
|
@ -206,14 +206,14 @@ public class MainActivity extends AppCompatActivity { |
|
|
|
break; |
|
|
|
case FrameTVOCSensor://tvoc |
|
|
|
TvocFrame tvocFrame = (TvocFrame) minewFrame; |
|
|
|
Log.v("beaconplus11", "battery:" + tvocFrame.getBattery() + ",TVOC:"+ tvocFrame.getValue() + "ppb," + "battery:" +tvocFrame.getBattery() + "mV"); |
|
|
|
Log.v("beaconplus11", "battery:" + tvocFrame.getBattery() + " "+ ",TVOC:"+ tvocFrame.getValue() + " "+ "ppb," + "battery:" " "+ +tvocFrame.getBattery() + "mV"); |
|
|
|
break; |
|
|
|
case FrameLineBeacon://FrameLineBeacon |
|
|
|
LineBeaconFrame lineBeacon = ((LineBeaconFrame) minewFrame); |
|
|
|
Log.v("beaconplus12", "Hwid:" + lineBeacon.getHwid() |
|
|
|
+ ",Rssi@1m:"+ lineBeacon.getTxPower() |
|
|
|
+ ",authentication:"+lineBeacon.getAuthentication() |
|
|
|
+ ",timesTamp:" + lineBeacon.getTimesTamp()); |
|
|
|
+" "+ ",Rssi@1m:"+ lineBeacon.getTxPower() |
|
|
|
+" "+ ",authentication:"+lineBeacon.getAuthentication() |
|
|
|
+" "+ ",timesTamp:" + lineBeacon.getTimesTamp()); |
|
|
|
break; |
|
|
|
case FrameTamperProof://TamperProofFrame |
|
|
|
TamperProofFrame tamperProofFrame = ((TamperProofFrame) minewFrame);// |
|
|
|
@ -221,7 +221,7 @@ public class MainActivity extends AppCompatActivity { |
|
|
|
break; |
|
|
|
case FrameDeviceInfo://InfoFrame |
|
|
|
InfoFrame infoFrame = ((InfoFrame) minewFrame);// |
|
|
|
Log.v("beaconplus14", infoFrame.getMajor() + infoFrame.getMinor() + infoFrame.getBatteryVoltage()); |
|
|
|
Log.v("beaconplus14", infoFrame.getMajor() +" "+ infoFrame.getMinor() + " "+ infoFrame.getBatteryVoltage()); |
|
|
|
break; |
|
|
|
default: |
|
|
|
Log.v("Device range", "Device not found"); |
|
|
|
|
