@@ -65,7 +65,7 @@ class SensorWebSocketServer(private val context: Context, address: InetSocketAdd
65
65
private const val CONNECTION_PATH_MULTIPLE_SENSORS = " /sensors/connect"
66
66
private const val CONNECTION_PATH_GPS = " /gps"
67
67
private const val CONNECTION_PATH_TOUCH_SENSORS = " /touchscreen"
68
- private val response = mutableMapOf<String ,Any >()
68
+ private val message = mutableMapOf<String ,Any >()
69
69
70
70
// websocket close codes ranging 4000 - 4999 are for application's custom messages
71
71
const val CLOSE_CODE_SENSOR_NOT_FOUND = 4001
@@ -299,33 +299,33 @@ class SensorWebSocketServer(private val context: Context, address: InetSocketAdd
299
299
{
300
300
if (websocket.getAttachment<Any >() is GPS )
301
301
{
302
- response .clear()
303
- response [" longitude" ] = location.longitude
304
- response [" latitude" ] = location.latitude
305
- response [" altitude" ] = location.altitude
306
- response [" bearing" ] = location.bearing
307
- response [" accuracy" ] = location.accuracy
308
- response [" speed" ] = location.speed
309
- response [" time" ] = location.time
302
+ message .clear()
303
+ message [" longitude" ] = location.longitude
304
+ message [" latitude" ] = location.latitude
305
+ message [" altitude" ] = location.altitude
306
+ message [" bearing" ] = location.bearing
307
+ message [" accuracy" ] = location.accuracy
308
+ message [" speed" ] = location.speed
309
+ message [" time" ] = location.time
310
310
311
311
312
312
if (Build .VERSION .SDK_INT >= Build .VERSION_CODES .O )
313
313
{
314
- response [" speedAccuracyMetersPerSecond" ] = location.speedAccuracyMetersPerSecond
315
- response [" bearingAccuracyDegrees" ] = location.bearingAccuracyDegrees
316
- response [" elapsedRealtimeNanos" ] = location.elapsedRealtimeNanos
317
- response [" verticalAccuracyMeters" ] = location.verticalAccuracyMeters
314
+ message [" speedAccuracyMetersPerSecond" ] = location.speedAccuracyMetersPerSecond
315
+ message [" bearingAccuracyDegrees" ] = location.bearingAccuracyDegrees
316
+ message [" elapsedRealtimeNanos" ] = location.elapsedRealtimeNanos
317
+ message [" verticalAccuracyMeters" ] = location.verticalAccuracyMeters
318
318
}
319
319
if (Build .VERSION .SDK_INT >= Build .VERSION_CODES .TIRAMISU )
320
320
{
321
- response [" elapsedRealtimeAgeMillis" ] = location.elapsedRealtimeAgeMillis
321
+ message [" elapsedRealtimeAgeMillis" ] = location.elapsedRealtimeAgeMillis
322
322
}
323
323
if (Build .VERSION .SDK_INT >= Build .VERSION_CODES .Q )
324
324
{
325
- response [" elapsedRealtimeUncertaintyNanos" ] = location.elapsedRealtimeUncertaintyNanos
325
+ message [" elapsedRealtimeUncertaintyNanos" ] = location.elapsedRealtimeUncertaintyNanos
326
326
}
327
327
328
- websocket.send( JsonUtil .toJSON(response ) )
328
+ websocket.send( JsonUtil .toJSON(message ) )
329
329
}
330
330
}
331
331
}
@@ -501,7 +501,7 @@ class SensorWebSocketServer(private val context: Context, address: InetSocketAdd
501
501
override fun handleMessage (msg : Message )
502
502
{
503
503
// Log.d(TAG,"Handler" + Thread.currentThread().name)
504
- response .clear()
504
+ message .clear()
505
505
val motionEvent = msg.obj as MotionEvent
506
506
507
507
for (websocket in connections)
@@ -511,27 +511,27 @@ class SensorWebSocketServer(private val context: Context, address: InetSocketAdd
511
511
when (motionEvent.actionMasked)
512
512
{
513
513
MotionEvent .ACTION_UP -> {
514
- response [" action" ] = " ACTION_UP"
515
- response [" x" ] = motionEvent.x
516
- response [" y" ] = motionEvent.y
514
+ message [" action" ] = " ACTION_UP"
515
+ message [" x" ] = motionEvent.x
516
+ message [" y" ] = motionEvent.y
517
517
518
- websocket.send(JsonUtil .toJSON(response ))
518
+ websocket.send(JsonUtil .toJSON(message ))
519
519
}
520
520
521
521
MotionEvent .ACTION_DOWN -> {
522
- response [" action" ] = " ACTION_DOWN"
523
- response [" x" ] = motionEvent.x
524
- response [" y" ] = motionEvent.y
522
+ message [" action" ] = " ACTION_DOWN"
523
+ message [" x" ] = motionEvent.x
524
+ message [" y" ] = motionEvent.y
525
525
526
- websocket.send(JsonUtil .toJSON(response ))
526
+ websocket.send(JsonUtil .toJSON(message ))
527
527
}
528
528
529
529
MotionEvent .ACTION_MOVE -> {
530
- response [" action" ] = " ACTION_MOVE"
531
- response [" x" ] = motionEvent.x
532
- response [" y" ] = motionEvent.y
530
+ message [" action" ] = " ACTION_MOVE"
531
+ message [" x" ] = motionEvent.x
532
+ message [" y" ] = motionEvent.y
533
533
534
- websocket.send(JsonUtil .toJSON(response ))
534
+ websocket.send(JsonUtil .toJSON(message ))
535
535
}
536
536
537
537
@@ -565,7 +565,7 @@ class SensorWebSocketServer(private val context: Context, address: InetSocketAdd
565
565
if (getConnectionCount() == 0 )
566
566
Log .w( TAG ," Sensor event reported when no client in connected" )
567
567
568
- response .clear()
568
+ message .clear()
569
569
570
570
// Loop through each connected client
571
571
for (webSocket in connections)
@@ -577,10 +577,10 @@ class SensorWebSocketServer(private val context: Context, address: InetSocketAdd
577
577
578
578
if (clientAssociatedSensor != null ) if (clientAssociatedSensor.type == sensorEvent.sensor.type && ! webSocket.isClosing)
579
579
{
580
- response [" values" ] = sensorEvent.values
581
- response [" timestamp" ] = sensorEvent.timestamp
582
- response [" accuracy" ] = sensorEvent.accuracy
583
- webSocket.send(JsonUtil .toJSON(response ))
580
+ message [" values" ] = sensorEvent.values
581
+ message [" timestamp" ] = sensorEvent.timestamp
582
+ message [" accuracy" ] = sensorEvent.accuracy
583
+ webSocket.send(JsonUtil .toJSON(message ))
584
584
}
585
585
}
586
586
else if (webSocket.getAttachment<Any >() is ArrayList <* >)
@@ -591,11 +591,11 @@ class SensorWebSocketServer(private val context: Context, address: InetSocketAdd
591
591
{
592
592
if (clientAssociatedSensor.type == sensorEvent.sensor.type && ! webSocket.isClosing)
593
593
{
594
- response [" values" ] = sensorEvent.values
595
- response [" timestamp" ] = sensorEvent.timestamp
596
- response [" accuracy" ] = sensorEvent.accuracy
597
- response [" type" ] = sensorEvent.sensor.stringType
598
- webSocket.send(JsonUtil .toJSON(response ))
594
+ message [" values" ] = sensorEvent.values
595
+ message [" timestamp" ] = sensorEvent.timestamp
596
+ message [" accuracy" ] = sensorEvent.accuracy
597
+ message [" type" ] = sensorEvent.sensor.stringType
598
+ webSocket.send(JsonUtil .toJSON(message ))
599
599
}
600
600
}
601
601
}
0 commit comments