From 50361faffe2039acbc8062d15a36c6b923989e8a Mon Sep 17 00:00:00 2001
From: fuqiuluo <mut@vip.qq.com>
Date: Tue, 15 Oct 2024 12:25:36 +0800
Subject: [PATCH] Support rocker move

---
 .../android/coro/CoroutineController.kt       |  40 ++++
 .../portal/service/MockServiceHelper.kt       |  93 ++++++++++
 .../fuqiuluo/portal/ui/mock/MockFragment.kt   |  21 ++-
 .../moe/fuqiuluo/portal/ui/mock/Rocker.kt     |   5 +
 .../ui/viewmodel/MockServiceViewModel.kt      |  21 +++
 app/src/main/res/layout/layout_rocker.xml     | 146 +++++++++++----
 app/src/main/res/values/strings.xml           |   2 +
 app/src/main/res/values/themes.xml            |   6 +
 .../moe/fuqiuluo/xposed/BaseDivineService.kt  |   3 +-
 .../moe/fuqiuluo/xposed/BaseLocationHook.kt   |   4 -
 .../java/moe/fuqiuluo/xposed/FakeLocation.kt  |   9 +-
 .../fuqiuluo/xposed/RemoteCommandHandler.kt   |  31 +++-
 .../xposed/hooks/LocationServiceHook.kt       |   2 +-
 .../fused/{ => miui}/MiFusedLocationHook.kt   |  11 +-
 .../hooks/sensor/SystemSensorManagerHook.kt   | 172 ++++++++++++++++++
 .../xposed/hooks/telephony/TelephonyHook.kt   |   5 +-
 .../miui/MiuiTelephonyManagerHook.kt          |   2 +-
 .../java/moe/fuqiuluo/xposed/utils/FakeLoc.kt |  91 ++++-----
 18 files changed, 562 insertions(+), 102 deletions(-)
 create mode 100644 app/src/main/java/moe/fuqiuluo/portal/android/coro/CoroutineController.kt
 rename xposed/src/main/java/moe/fuqiuluo/xposed/hooks/fused/{ => miui}/MiFusedLocationHook.kt (93%)
 create mode 100644 xposed/src/main/java/moe/fuqiuluo/xposed/hooks/sensor/SystemSensorManagerHook.kt
 rename xposed/src/main/java/moe/fuqiuluo/xposed/hooks/{ => telephony}/miui/MiuiTelephonyManagerHook.kt (97%)

diff --git a/app/src/main/java/moe/fuqiuluo/portal/android/coro/CoroutineController.kt b/app/src/main/java/moe/fuqiuluo/portal/android/coro/CoroutineController.kt
new file mode 100644
index 0000000..a0b1910
--- /dev/null
+++ b/app/src/main/java/moe/fuqiuluo/portal/android/coro/CoroutineController.kt
@@ -0,0 +1,40 @@
+package moe.fuqiuluo.portal.android.coro
+
+import kotlinx.coroutines.channels.Channel
+
+class CoroutineController {
+    private val controlChannel = Channel<ControlCommand>(Channel.UNLIMITED)
+    var isPaused = false
+
+    suspend fun controlledCoroutine() {
+        checkControl()
+    }
+
+    private suspend fun checkControl() {
+        controlChannel.tryReceive().getOrNull()?.let {
+            when (it) {
+                ControlCommand.Pause -> {
+                    isPaused = true
+                    while (controlChannel.receive() != ControlCommand.Resume) {
+                        // do nothing
+                    }
+                    isPaused = false
+                }
+                ControlCommand.Resume -> {}
+            }
+        }
+    }
+
+    fun pause() {
+        controlChannel.trySend(ControlCommand.Pause)
+    }
+
+    fun resume() {
+        controlChannel.trySend(ControlCommand.Resume)
+    }
+}
+
+enum class ControlCommand {
+    Pause,
+    Resume
+}
\ No newline at end of file
diff --git a/app/src/main/java/moe/fuqiuluo/portal/service/MockServiceHelper.kt b/app/src/main/java/moe/fuqiuluo/portal/service/MockServiceHelper.kt
index adeab19..563f171 100644
--- a/app/src/main/java/moe/fuqiuluo/portal/service/MockServiceHelper.kt
+++ b/app/src/main/java/moe/fuqiuluo/portal/service/MockServiceHelper.kt
@@ -3,6 +3,7 @@ package moe.fuqiuluo.portal.service
 import android.location.LocationManager
 import android.os.Bundle
 import android.util.Log
+import moe.fuqiuluo.xposed.utils.FakeLoc
 
 object MockServiceHelper {
     const val PROVIDER_NAME = "portal"
@@ -79,6 +80,98 @@ object MockServiceHelper {
         return locationManager.sendExtraCommand(PROVIDER_NAME, randomKey, rely)
     }
 
+    fun setBearing(locationManager: LocationManager, bearing: Double): Boolean {
+        if (!::randomKey.isInitialized) {
+            return false
+        }
+        val rely = Bundle()
+        rely.putString("command_id", "set_bearing")
+        rely.putDouble("bearing", bearing)
+        return locationManager.sendExtraCommand(PROVIDER_NAME, randomKey, rely)
+    }
+
+    fun setSpeed(locationManager: LocationManager, speed: Float): Boolean {
+        if (!::randomKey.isInitialized) {
+            return false
+        }
+        val rely = Bundle()
+        rely.putString("command_id", "set_speed")
+        rely.putFloat("speed", speed)
+        return locationManager.sendExtraCommand(PROVIDER_NAME, randomKey, rely)
+    }
+
+    fun setAltitude(locationManager: LocationManager, altitude: Double): Boolean {
+        if (!::randomKey.isInitialized) {
+            return false
+        }
+        val rely = Bundle()
+        rely.putString("command_id", "set_altitude")
+        rely.putDouble("altitude", altitude)
+        return locationManager.sendExtraCommand(PROVIDER_NAME, randomKey, rely)
+    }
+
+    fun setSpeedAmplitude(locationManager: LocationManager, speedAmplitude: Double): Boolean {
+        if (!::randomKey.isInitialized) {
+            return false
+        }
+        val rely = Bundle()
+        rely.putString("command_id", "set_speed_amp")
+        rely.putDouble("speed_amplitude", speedAmplitude)
+        return locationManager.sendExtraCommand(PROVIDER_NAME, randomKey, rely)
+    }
+
+    fun getSpeed(locationManager: LocationManager): Float? {
+        if (!::randomKey.isInitialized) {
+            return null
+        }
+        val rely = Bundle()
+        rely.putString("command_id", "get_speed")
+        if(locationManager.sendExtraCommand(PROVIDER_NAME, randomKey, rely)) {
+            return rely.getFloat("speed")
+        }
+        return null
+    }
+
+    fun getBearing(locationManager: LocationManager): Float? {
+        if (!::randomKey.isInitialized) {
+            return null
+        }
+        val rely = Bundle()
+        rely.putString("command_id", "get_bearing")
+        if(locationManager.sendExtraCommand(PROVIDER_NAME, randomKey, rely)) {
+            return rely.getFloat("bearing")
+        }
+        return null
+    }
+
+    fun getAltitude(locationManager: LocationManager): Double? {
+        if (!::randomKey.isInitialized) {
+            return null
+        }
+        val rely = Bundle()
+        rely.putString("command_id", "get_altitude")
+        if(locationManager.sendExtraCommand(PROVIDER_NAME, randomKey, rely)) {
+            return rely.getDouble("altitude")
+        }
+        return null
+    }
+
+    fun move(locationManager: LocationManager, distance: Double, bearing: Double): Boolean {
+        if (!::randomKey.isInitialized) {
+            return false
+        }
+        val rely = Bundle()
+        rely.putString("command_id", "move")
+        rely.putDouble("n", distance)
+        rely.putDouble("bearing", bearing)
+
+        if (FakeLoc.enableDebugLog) {
+            Log.d("MockServiceHelper", "move: distance=$distance, bearing=$bearing")
+        }
+
+        return locationManager.sendExtraCommand(PROVIDER_NAME, randomKey, rely)
+    }
+
     fun setLocation(locationManager: LocationManager, lat: Double, lon: Double): Boolean {
         return updateLocation(locationManager, lat, lon, "=")
     }
diff --git a/app/src/main/java/moe/fuqiuluo/portal/ui/mock/MockFragment.kt b/app/src/main/java/moe/fuqiuluo/portal/ui/mock/MockFragment.kt
index 72f3ec8..d0334e8 100644
--- a/app/src/main/java/moe/fuqiuluo/portal/ui/mock/MockFragment.kt
+++ b/app/src/main/java/moe/fuqiuluo/portal/ui/mock/MockFragment.kt
@@ -2,13 +2,9 @@ package moe.fuqiuluo.portal.ui.mock
 
 import android.annotation.SuppressLint
 import android.os.Bundle
-import android.util.Log
 import android.view.LayoutInflater
-import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
-import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
-import android.view.WindowManager
 import android.widget.CheckedTextView
 import android.widget.Toast
 import androidx.core.content.ContextCompat
@@ -34,6 +30,7 @@ import moe.fuqiuluo.portal.ext.selectLocation
 import moe.fuqiuluo.portal.service.MockServiceHelper
 import moe.fuqiuluo.portal.ui.viewmodel.MockServiceViewModel
 import moe.fuqiuluo.portal.ui.viewmodel.MockViewModel
+import moe.fuqiuluo.xposed.utils.FakeLoc
 
 class MockFragment : Fragment() {
     private var _binding: FragmentMockBinding? = null
@@ -98,17 +95,30 @@ class MockFragment : Fragment() {
                         rocker.show()
                     } else {
                         rocker.hide()
+                        rockerCoroutineController.pause()
                     }
                 }
             }
 
             rocker.setRockerListener(object: RockerView.Companion.OnMoveListener {
                 override fun onAngle(angle: Double) {
-                    Log.d("Rocker", "angle: $angle")
+                    MockServiceHelper.setBearing(locationManager!!, angle)
+                    FakeLoc.bearing = angle
+                    FakeLoc.hasBearings = true
                 }
 
                 override fun onLockChanged(isLocked: Boolean) {
+                    isRockerLocked = isLocked
+                }
+
+                override fun onFinished() {
+                    if (!isRockerLocked) {
+                        rockerCoroutineController.pause()
+                    }
+                }
 
+                override fun onStarted() {
+                    rockerCoroutineController.resume()
                 }
             })
         }
@@ -257,6 +267,7 @@ class MockFragment : Fragment() {
                     binding.rocker.isClickable = false
                     binding.rocker.toggle()
                     mockServiceViewModel.rocker.hide()
+                    mockServiceViewModel.rockerCoroutineController.pause()
                     binding.rocker.isClickable = true
                 }
             } finally {
diff --git a/app/src/main/java/moe/fuqiuluo/portal/ui/mock/Rocker.kt b/app/src/main/java/moe/fuqiuluo/portal/ui/mock/Rocker.kt
index 63a5d43..90af6f6 100644
--- a/app/src/main/java/moe/fuqiuluo/portal/ui/mock/Rocker.kt
+++ b/app/src/main/java/moe/fuqiuluo/portal/ui/mock/Rocker.kt
@@ -11,6 +11,7 @@ import android.view.LayoutInflater
 import android.view.MotionEvent
 import android.view.View
 import android.view.WindowManager
+import android.widget.Toast
 import moe.fuqiuluo.portal.R
 import moe.fuqiuluo.portal.android.widget.RockerView
 import moe.fuqiuluo.portal.ext.rockerCoords
@@ -50,6 +51,10 @@ class Rocker(private val activity: Activity): View.OnTouchListener {
         layoutParams.y = rockerCoords.second
 
         root.setOnTouchListener(this)
+
+        root.findViewById<View>(R.id.expand_menu).setOnClickListener {
+            Toast.makeText(activity, "暂不支持", Toast.LENGTH_SHORT).show()
+        }
     }
 
     fun show() {
diff --git a/app/src/main/java/moe/fuqiuluo/portal/ui/viewmodel/MockServiceViewModel.kt b/app/src/main/java/moe/fuqiuluo/portal/ui/viewmodel/MockServiceViewModel.kt
index ed91835..c6e7115 100644
--- a/app/src/main/java/moe/fuqiuluo/portal/ui/viewmodel/MockServiceViewModel.kt
+++ b/app/src/main/java/moe/fuqiuluo/portal/ui/viewmodel/MockServiceViewModel.kt
@@ -2,10 +2,16 @@ package moe.fuqiuluo.portal.ui.viewmodel
 
 import android.app.Activity
 import android.location.LocationManager
+import android.util.Log
 import androidx.lifecycle.ViewModel
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import moe.fuqiuluo.portal.android.coro.CoroutineController
 import moe.fuqiuluo.portal.service.MockServiceHelper
 import moe.fuqiuluo.portal.ui.mock.HistoricalLocation
 import moe.fuqiuluo.portal.ui.mock.Rocker
+import moe.fuqiuluo.xposed.utils.FakeLoc
 
 class MockServiceViewModel: ViewModel() {
     lateinit var rocker: Rocker
@@ -19,10 +25,25 @@ class MockServiceViewModel: ViewModel() {
 
     var selectedLocation: HistoricalLocation? = null
 
+    var isRockerLocked = false
+    val rockerCoroutineController = CoroutineController()
+
     fun initRocker(activity: Activity): Rocker {
         if (!::rocker.isInitialized) {
             rocker = Rocker(activity)
         }
+
+        rockerCoroutineController.pause()
+        GlobalScope.launch {
+            do {
+                delay(1000)
+                rockerCoroutineController.controlledCoroutine()
+
+                if(!MockServiceHelper.move(locationManager!!, FakeLoc.speed, FakeLoc.bearing)) {
+                    Log.e("MockServiceViewModel", "Failed to move")
+                }
+            } while (true)
+        }
         return rocker
     }
 
diff --git a/app/src/main/res/layout/layout_rocker.xml b/app/src/main/res/layout/layout_rocker.xml
index 43b92ec..7084311 100644
--- a/app/src/main/res/layout/layout_rocker.xml
+++ b/app/src/main/res/layout/layout_rocker.xml
@@ -25,47 +25,131 @@
         app:cardCornerRadius="12dp"
         app:cardBackgroundColor="@color/white"
         app:cardElevation="4dp">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal">
+            android:orientation="vertical">
 
-            <androidx.appcompat.widget.AppCompatImageView
-                android:id="@+id/move"
-                android:layout_width="wrap_content"
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:importantForAccessibility="no"
-                android:contentDescription="@string/app_name"
-                android:src="@drawable/baseline_adjust_24"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <com.google.android.material.textview.MaterialTextView
-                android:layout_width="wrap_content"
+                android:orientation="horizontal">
+
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:id="@+id/move"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:importantForAccessibility="no"
+                    android:contentDescription="@string/app_name"
+                    android:src="@drawable/baseline_adjust_24"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textSize="10sp"
+                    android:text="@string/app_name"
+                    android:layout_gravity="center"
+                    android:gravity="center"
+                    android:visibility="gone"
+                    app:layout_constraintStart_toEndOf="@id/move"
+                    app:layout_constraintTop_toTopOf="parent"
+                    tools:ignore="SmallSp" />
+
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:id="@+id/expand_menu"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:importantForAccessibility="no"
+                    android:contentDescription="@string/app_name"
+                    android:src="@drawable/baseline_control_camera_24"
+                    app:tint="#373737"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+        </LinearLayout>
+    </androidx.cardview.widget.CardView>
+
+    <androidx.cardview.widget.CardView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="1dp"
+        android:layout_marginRight="1dp"
+        android:layout_marginBottom="8dp"
+        app:contentPadding="4dp"
+        app:cardCornerRadius="4dp"
+        app:cardBackgroundColor="@color/white"
+        android:visibility="gone"
+        app:cardElevation="2dp">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/expand_menu_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textSize="10sp"
-                android:text="@string/app_name"
-                android:layout_gravity="center"
-                android:gravity="center"
-                android:visibility="gone"
-                app:layout_constraintStart_toEndOf="@id/move"
                 app:layout_constraintTop_toTopOf="parent"
-                tools:ignore="SmallSp" />
+                app:layout_constraintStart_toStartOf="parent">
 
-            <androidx.appcompat.widget.AppCompatImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:importantForAccessibility="no"
-                android:contentDescription="@string/app_name"
-                android:src="@drawable/baseline_control_camera_24"
-                app:tint="#373737"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                <com.google.android.material.textview.MaterialTextView
+                    style="@style/TextAppearance.Material3.LabelSmall"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/rocker_speed"
+                    android:textSize="8sp"
+                    android:layout_weight="1"
+                    android:maxLines="1"
+                    android:gravity="center|start"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    tools:ignore="SmallSp" />
 
+                <com.google.android.material.textview.MaterialTextView
+                    android:id="@+id/speed"
+                    style="@style/TextAppearance.Material3.LabelSmall"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/default_speed"
+                    android:layout_weight="1"
+                    android:textSize="8sp"
+                    android:gravity="center|end"
+                    android:maxLines="1"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    tools:ignore="SmallSp" />
 
-        </androidx.constraintlayout.widget.ConstraintLayout>
+                <com.google.android.material.slider.Slider
+                    android:id="@+id/speed_slider"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:stepSize="5.0"
+                    android:valueFrom="0.0"
+                    android:valueTo="50.0"
+                    app:tickVisible="false"
+                    app:thumbElevation="2dp"
+                    android:padding="0dp"
+                    app:thumbHeight="8dp"
+                    app:thumbRadius="4dp"
+                    app:trackHeight="4dp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toStartOf="parent" />
+
+                <com.google.android.material.divider.MaterialDivider
+                    android:id="@+id/divider"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="24dp"
+                    app:layout_constraintTop_toBottomOf="@id/speed"
+                    app:layout_constraintStart_toStartOf="parent" />
 
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.cardview.widget.CardView>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f7607d7..c7d8375 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -34,4 +34,6 @@
     <string name="name">名称</string>
 
     <string name="colorful">独属于我的蒙娜丽莎</string>
+    <string name="rocker_speed">摇杆速度</string>
+    <string name="default_speed">1m/s</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 2fd2610..49977b9 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -27,6 +27,12 @@
         <item name="searchViewStyle">@style/Portal.SearchViewStyle</item>
 
         <item name="selectableItemBackgroundBorderless">@drawable/ripple_effect</item>
+
+        <item name="sliderStyle">@style/Portal.SliderTheme</item>
+    </style>
+
+    <style name="Portal.SliderTheme" parent="Widget.MaterialComponents.Slider">
+
     </style>
 
     <style name="Portal.SearchViewStyle" parent="Widget.AppCompat.SearchView">
diff --git a/xposed/src/main/java/moe/fuqiuluo/xposed/BaseDivineService.kt b/xposed/src/main/java/moe/fuqiuluo/xposed/BaseDivineService.kt
index e8e9e1d..3880851 100644
--- a/xposed/src/main/java/moe/fuqiuluo/xposed/BaseDivineService.kt
+++ b/xposed/src/main/java/moe/fuqiuluo/xposed/BaseDivineService.kt
@@ -115,9 +115,8 @@ abstract class BaseDivineService {
             FakeLoc.enableAGPS = rely.getBoolean("enable_agps", FakeLoc.enableAGPS)
             FakeLoc.enableNMEA = rely.getBoolean("enable_nmea", FakeLoc.enableNMEA)
             FakeLoc.hideMock = rely.getBoolean("hide_mock", FakeLoc.hideMock)
-            FakeLoc.autoRemoveUselessLocListener = rely.getBoolean("auto_remove_useless_loc_listener", FakeLoc.autoRemoveUselessLocListener)
             FakeLoc.hookWifi = rely.getBoolean("hook_wifi", FakeLoc.hookWifi)
-            FakeLoc.needDowngradeTo2G = rely.getBoolean("need_downgrade_to_2g", FakeLoc.needDowngradeTo2G)
+            FakeLoc.needDowngradeToCdma = rely.getBoolean("need_downgrade_to_2g", FakeLoc.needDowngradeToCdma)
             FakeLoc.updateInterval = rely.getLong("update_interval", FakeLoc.updateInterval)
             Logger.debug("Synced config for DivineService")
         } else {
diff --git a/xposed/src/main/java/moe/fuqiuluo/xposed/BaseLocationHook.kt b/xposed/src/main/java/moe/fuqiuluo/xposed/BaseLocationHook.kt
index c6a601a..661b128 100644
--- a/xposed/src/main/java/moe/fuqiuluo/xposed/BaseLocationHook.kt
+++ b/xposed/src/main/java/moe/fuqiuluo/xposed/BaseLocationHook.kt
@@ -70,10 +70,6 @@ abstract class BaseLocationHook: BaseDivineService() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && location.hasBearingAccuracy()) {
             location.bearingAccuracyDegrees = modBearing.toFloat()
         }
-
-        if (location.bearing == 0.0f) {
-            location.bearing = 1.0f
-        }
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             if (location.hasBearingAccuracy() && location.bearingAccuracyDegrees == 0.0f) {
                 location.bearingAccuracyDegrees = 1.0f
diff --git a/xposed/src/main/java/moe/fuqiuluo/xposed/FakeLocation.kt b/xposed/src/main/java/moe/fuqiuluo/xposed/FakeLocation.kt
index fe37970..61aa580 100644
--- a/xposed/src/main/java/moe/fuqiuluo/xposed/FakeLocation.kt
+++ b/xposed/src/main/java/moe/fuqiuluo/xposed/FakeLocation.kt
@@ -1,18 +1,16 @@
 @file:Suppress("LocalVariableName", "PrivateApi", "UNCHECKED_CAST")
 package moe.fuqiuluo.xposed
 
-import android.os.IBinder
 import de.robv.android.xposed.IXposedHookLoadPackage
 import de.robv.android.xposed.IXposedHookZygoteInit
-import de.robv.android.xposed.XC_MethodHook
-import de.robv.android.xposed.XposedBridge
 import de.robv.android.xposed.XposedHelpers
 import de.robv.android.xposed.callbacks.XC_LoadPackage
 import moe.fuqiuluo.xposed.hooks.LocationManagerHook
 import moe.fuqiuluo.xposed.hooks.LocationServiceHook
 import moe.fuqiuluo.xposed.hooks.fused.AndroidFusedLocationProviderHook
-import moe.fuqiuluo.xposed.hooks.fused.MiFusedLocationHook
-import moe.fuqiuluo.xposed.hooks.miui.MiuiTelephonyManagerHook
+import moe.fuqiuluo.xposed.hooks.fused.miui.MiFusedLocationHook
+import moe.fuqiuluo.xposed.hooks.telephony.miui.MiuiTelephonyManagerHook
+import moe.fuqiuluo.xposed.hooks.sensor.SystemSensorManagerHook
 import moe.fuqiuluo.xposed.hooks.telephony.TelephonyHook
 import moe.fuqiuluo.xposed.hooks.wlan.WlanHook
 import moe.fuqiuluo.xposed.utils.FakeLoc
@@ -86,6 +84,7 @@ class FakeLocation: IXposedHookLoadPackage, IXposedHookZygoteInit {
                 TelephonyHook.hookSubOnTransact(lpparam.classLoader)
                 WlanHook(systemClassLoader)
                 AndroidFusedLocationProviderHook(lpparam.classLoader)
+                SystemSensorManagerHook(lpparam.classLoader)
             }
             "com.android.location.fused" -> {
                 AndroidFusedLocationProviderHook(lpparam.classLoader)
diff --git a/xposed/src/main/java/moe/fuqiuluo/xposed/RemoteCommandHandler.kt b/xposed/src/main/java/moe/fuqiuluo/xposed/RemoteCommandHandler.kt
index d3a8158..f1caad0 100644
--- a/xposed/src/main/java/moe/fuqiuluo/xposed/RemoteCommandHandler.kt
+++ b/xposed/src/main/java/moe/fuqiuluo/xposed/RemoteCommandHandler.kt
@@ -3,7 +3,6 @@ package moe.fuqiuluo.xposed
 import android.os.Bundle
 import android.os.IBinder
 import android.os.Parcel
-import moe.fuqiuluo.xposed.hooks.LocationServiceHook
 import moe.fuqiuluo.xposed.utils.FakeLoc
 import moe.fuqiuluo.xposed.utils.BinderUtils
 import moe.fuqiuluo.xposed.utils.Logger
@@ -58,6 +57,7 @@ object RemoteCommandHandler {
             }
             "stop" -> {
                 FakeLoc.enable = false
+                FakeLoc.hasBearings = false
                 return true
             }
             "is_start" -> {
@@ -91,6 +91,32 @@ object RemoteCommandHandler {
                 FakeLoc.altitude = altitude
                 return true
             }
+            "set_speed" -> {
+                val speed = rely.getDouble("speed", 0.0)
+                FakeLoc.speed = speed
+                return true
+            }
+            "set_bearing" -> {
+                val bearing = rely.getDouble("bearing", 0.0)
+                FakeLoc.bearing = bearing
+                FakeLoc.hasBearings = true
+                return true
+            }
+            "move" -> {
+                val distance = rely.getDouble("n", 0.0)
+                if (distance == 0.0) return true
+                val bearing = rely.getDouble("bearing", 0.0)
+                val newLoc = FakeLoc.moveLocation(
+                    n = distance,
+                    angle = bearing
+                )
+                if (FakeLoc.enableDebugLog) {
+                    Logger.debug("move: distance=$distance, bearing=$bearing, newLoc=$newLoc")
+                }
+                FakeLoc.bearing = bearing
+                FakeLoc.hasBearings = true
+                return updateCoordinate(newLoc.first, newLoc.second)
+            }
             "update_location" -> {
                 val mode = rely.getString("mode")
                 var newLat = rely.getDouble("lat", 0.0)
@@ -146,9 +172,8 @@ object RemoteCommandHandler {
                 rely.putBoolean("enable_agps", FakeLoc.enableAGPS)
                 rely.putBoolean("enable_nmea", FakeLoc.enableNMEA)
                 rely.putBoolean("hide_mock", FakeLoc.hideMock)
-                rely.putBoolean("auto_remove_useless_loc_listener", FakeLoc.autoRemoveUselessLocListener)
                 rely.putBoolean("hook_wifi", FakeLoc.hookWifi)
-                rely.putBoolean("need_downgrade_to_2g", FakeLoc.needDowngradeTo2G)
+                rely.putBoolean("need_downgrade_to_2g", FakeLoc.needDowngradeToCdma)
                 rely.putLong("update_interval", FakeLoc.updateInterval)
                 return true
             }
diff --git a/xposed/src/main/java/moe/fuqiuluo/xposed/hooks/LocationServiceHook.kt b/xposed/src/main/java/moe/fuqiuluo/xposed/hooks/LocationServiceHook.kt
index 06b4e34..0f1b229 100644
--- a/xposed/src/main/java/moe/fuqiuluo/xposed/hooks/LocationServiceHook.kt
+++ b/xposed/src/main/java/moe/fuqiuluo/xposed/hooks/LocationServiceHook.kt
@@ -15,7 +15,7 @@ import moe.fuqiuluo.xposed.BaseLocationHook
 import moe.fuqiuluo.xposed.RemoteCommandHandler
 import moe.fuqiuluo.xposed.hooks.gnss.GnssManagerServiceHook
 import moe.fuqiuluo.xposed.hooks.miui.MiuiBlurLocationProviderHook
-import moe.fuqiuluo.xposed.hooks.miui.MiuiTelephonyManagerHook
+import moe.fuqiuluo.xposed.hooks.telephony.miui.MiuiTelephonyManagerHook
 import moe.fuqiuluo.xposed.hooks.nmea.LocationNMEAHook
 import moe.fuqiuluo.xposed.hooks.provider.LocationProviderManagerHook
 import moe.fuqiuluo.xposed.utils.FakeLoc
diff --git a/xposed/src/main/java/moe/fuqiuluo/xposed/hooks/fused/MiFusedLocationHook.kt b/xposed/src/main/java/moe/fuqiuluo/xposed/hooks/fused/miui/MiFusedLocationHook.kt
similarity index 93%
rename from xposed/src/main/java/moe/fuqiuluo/xposed/hooks/fused/MiFusedLocationHook.kt
rename to xposed/src/main/java/moe/fuqiuluo/xposed/hooks/fused/miui/MiFusedLocationHook.kt
index 2201722..8495181 100644
--- a/xposed/src/main/java/moe/fuqiuluo/xposed/hooks/fused/MiFusedLocationHook.kt
+++ b/xposed/src/main/java/moe/fuqiuluo/xposed/hooks/fused/miui/MiFusedLocationHook.kt
@@ -1,4 +1,4 @@
-package moe.fuqiuluo.xposed.hooks.fused
+package moe.fuqiuluo.xposed.hooks.fused.miui
 
 import android.os.Bundle
 import de.robv.android.xposed.XposedHelpers
@@ -7,11 +7,9 @@ import moe.fuqiuluo.xposed.hooks.blindhook.BlindHookLocation
 import moe.fuqiuluo.xposed.utils.FakeLoc
 import moe.fuqiuluo.xposed.utils.Logger
 import moe.fuqiuluo.xposed.utils.hookMethodAfter
-import moe.fuqiuluo.xposed.utils.hookMethodBefore
 import moe.fuqiuluo.xposed.utils.onceHookMethodBefore
 import moe.fuqiuluo.xposed.utils.toClass
 import java.lang.reflect.Modifier
-import kotlin.random.Random
 
 object MiFusedLocationHook: BaseLocationHook() {
 
@@ -92,5 +90,12 @@ object MiFusedLocationHook: BaseLocationHook() {
 
             BlindHookLocation(cTencentNLPManager)
         }
+
+//        run {
+//            val cTencentLocationManager = "com.tencent.map.geolocation.TencentLocationManager".toClass(classLoader)
+//                ?: return@run
+//
+//
+//        }
     }
 }
\ No newline at end of file
diff --git a/xposed/src/main/java/moe/fuqiuluo/xposed/hooks/sensor/SystemSensorManagerHook.kt b/xposed/src/main/java/moe/fuqiuluo/xposed/hooks/sensor/SystemSensorManagerHook.kt
new file mode 100644
index 0000000..1cf912e
--- /dev/null
+++ b/xposed/src/main/java/moe/fuqiuluo/xposed/hooks/sensor/SystemSensorManagerHook.kt
@@ -0,0 +1,172 @@
+@file:Suppress("UNCHECKED_CAST")
+package moe.fuqiuluo.xposed.hooks.sensor
+
+import android.content.pm.FeatureInfo
+import android.content.pm.PackageManager
+import android.hardware.Sensor
+import android.hardware.SensorEventListener
+import android.util.ArrayMap
+import de.robv.android.xposed.XposedHelpers
+import moe.fuqiuluo.xposed.utils.FakeLoc
+import moe.fuqiuluo.xposed.utils.Logger
+import moe.fuqiuluo.xposed.utils.afterHook
+import moe.fuqiuluo.xposed.utils.beforeHook
+import moe.fuqiuluo.xposed.utils.hookAllMethods
+import moe.fuqiuluo.xposed.utils.hookMethodAfter
+import moe.fuqiuluo.xposed.utils.onceHook
+import moe.fuqiuluo.xposed.utils.onceHookAllMethod
+import java.util.concurrent.ConcurrentHashMap
+
+// https://github.com/Frazew/VirtualSensor/blob/master/app/src/main/java/fr/frazew/virtualgyroscope/XposedMod.java#L298
+object SystemSensorManagerHook {
+    private val listenerMap = ConcurrentHashMap<SensorEventListener, Int>()
+
+    operator fun invoke(classLoader: ClassLoader) {
+        unlockGeoSensor(classLoader)
+
+        hookSystemSensorManager(classLoader)
+        hookSystemSensorManagerQueue(classLoader)
+    }
+
+    private fun hookSystemSensorManagerQueue(classLoader: ClassLoader) {
+        val cSystemSensorManagerQueue = XposedHelpers.findClassIfExists("android.hardware.SystemSensorManager\$SensorEventQueue", classLoader)
+            ?: return
+
+    }
+
+    private fun hookSystemSensorManager(classLoader: ClassLoader) {
+        val cSystemSensorManager = XposedHelpers.findClassIfExists("android.hardware.SystemSensorManager", classLoader)
+        if (cSystemSensorManager == null) {
+            if (FakeLoc.enableDebugLog) {
+                Logger.debug("Failed to find SystemSensorManager")
+            }
+            return
+        }
+
+        val hookRegisterListenerImpl = beforeHook {
+            val listener = args[0] as SensorEventListener
+            if (FakeLoc.enableDebugLog) {
+                Logger.debug("RegisterListenerImpl: $listener, sensor: ${args[1]}")
+            }
+
+            val sensor = args[1] as Sensor
+            listenerMap[listener] = sensor.type
+
+            listener.javaClass.onceHookAllMethod("onSensorChanged", beforeHook {
+                if (FakeLoc.enable) {
+                    result = null
+                }
+            })
+        }
+        cSystemSensorManager.declaredMethods.filter {
+            it.name == "registerListenerImpl" && it.parameterTypes.isNotEmpty()
+                    && it.parameterTypes[0] == SensorEventListener::class.java
+                    && it.parameterTypes[1] == Sensor::class.java
+        }.forEach {
+            it.onceHook(hookRegisterListenerImpl)
+        }
+
+        val hookUnregisterListenerImpl = beforeHook {
+            val listener = args[0] as SensorEventListener
+            if (FakeLoc.enableDebugLog) {
+                Logger.debug("UnregisterListenerImpl: $listener")
+            }
+            listenerMap.remove(listener)
+        }
+        cSystemSensorManager.declaredMethods.filter {
+            it.name == "unregisterListenerImpl" && it.parameterTypes.isNotEmpty()
+                    && it.parameterTypes[0] == SensorEventListener::class.java
+        }.forEach {
+            it.onceHook(hookUnregisterListenerImpl)
+        }
+
+        cSystemSensorManager.hookAllMethods("getSensorList", afterHook {
+            if (FakeLoc.enableDebugLog) {
+                Logger.debug("getSensorList: type: ${args[0]} -> $result")
+            }
+        })
+        cSystemSensorManager.hookAllMethods("getFullSensorsList", afterHook {
+            if (FakeLoc.enableDebugLog) {
+                Logger.debug("getFullSensorsList-> $result")
+            }
+        })
+    }
+
+    private fun unlockGeoSensor(classLoader: ClassLoader) {
+        val cSystemConfig = XposedHelpers.findClassIfExists("com.android.server.SystemConfig", classLoader)
+            ?: return
+
+        val openGLVersion = run {
+            val cSystemProperties = XposedHelpers.findClassIfExists("android.os.SystemProperties", classLoader)
+                ?: return@run 0
+            XposedHelpers.callStaticMethod(cSystemProperties, "getInt", "ro.opengles.version", FeatureInfo.GL_ES_VERSION_UNDEFINED) as Int
+        }
+
+        cSystemConfig.hookMethodAfter("getAvailableFeatures") {
+            val features = result as ArrayMap<String, FeatureInfo>
+            if (FakeLoc.enableDebugLog) {
+                Logger.debug("getAvailableFeatures: ${features.keys}")
+            }
+            if (!features.contains(PackageManager.FEATURE_SENSOR_GYROSCOPE)) {
+                val gyroFeature = FeatureInfo()
+                gyroFeature.name = PackageManager.FEATURE_SENSOR_GYROSCOPE
+                gyroFeature.reqGlEsVersion = openGLVersion
+                features[PackageManager.FEATURE_SENSOR_GYROSCOPE] = gyroFeature
+
+                if (FakeLoc.enableDebugLog) {
+                    Logger.debug("Added FEATURE_SENSOR_GYROSCOPE")
+                }
+            }
+            if (!features.contains(PackageManager.FEATURE_SENSOR_COMPASS)) {
+                val compassFeature = FeatureInfo()
+                compassFeature.name = PackageManager.FEATURE_SENSOR_COMPASS
+                compassFeature.reqGlEsVersion = openGLVersion
+                features[PackageManager.FEATURE_SENSOR_COMPASS] = compassFeature
+
+                if (FakeLoc.enableDebugLog) {
+                    Logger.debug("Added FEATURE_SENSOR_COMPASS")
+                }
+            }
+
+            if (!features.contains(PackageManager.FEATURE_SENSOR_ACCELEROMETER)) {
+                val accelerometerFeature = FeatureInfo()
+                accelerometerFeature.name = PackageManager.FEATURE_SENSOR_ACCELEROMETER
+                accelerometerFeature.reqGlEsVersion = openGLVersion
+                features[PackageManager.FEATURE_SENSOR_ACCELEROMETER] = accelerometerFeature
+
+                if (FakeLoc.enableDebugLog) {
+                    Logger.debug("Added FEATURE_SENSOR_ACCELEROMETER")
+                }
+            }
+
+            if (!features.contains(PackageManager.FEATURE_SENSOR_STEP_COUNTER)) {
+                val lightFeature = FeatureInfo()
+                lightFeature.name = PackageManager.FEATURE_SENSOR_STEP_COUNTER
+                lightFeature.reqGlEsVersion = openGLVersion
+                features[PackageManager.FEATURE_SENSOR_STEP_COUNTER] = lightFeature
+
+                if (FakeLoc.enableDebugLog) {
+                    Logger.debug("Added FEATURE_SENSOR_STEP_COUNTER")
+                }
+            }
+
+            if (!features.contains(PackageManager.FEATURE_SENSOR_STEP_DETECTOR)) {
+                val lightFeature = FeatureInfo()
+                lightFeature.name = PackageManager.FEATURE_SENSOR_STEP_DETECTOR
+                lightFeature.reqGlEsVersion = openGLVersion
+                features[PackageManager.FEATURE_SENSOR_STEP_DETECTOR] = lightFeature
+
+                if (FakeLoc.enableDebugLog) {
+                    Logger.debug("Added FEATURE_SENSOR_STEP_DETECTOR")
+                }
+            }
+
+            kotlin.runCatching {
+                XposedHelpers.setObjectField(thisObject, "mAvailableFeatures", features)
+            }.onFailure {
+                Logger.warn("Failed to set mAvailableFeatures", it)
+            }
+            result = features
+        }
+    }
+}
\ No newline at end of file
diff --git a/xposed/src/main/java/moe/fuqiuluo/xposed/hooks/telephony/TelephonyHook.kt b/xposed/src/main/java/moe/fuqiuluo/xposed/hooks/telephony/TelephonyHook.kt
index 1916355..b6ca3d6 100644
--- a/xposed/src/main/java/moe/fuqiuluo/xposed/hooks/telephony/TelephonyHook.kt
+++ b/xposed/src/main/java/moe/fuqiuluo/xposed/hooks/telephony/TelephonyHook.kt
@@ -1,8 +1,5 @@
 package moe.fuqiuluo.xposed.hooks.telephony
 
-import android.content.Context
-import android.location.LocationManager
-import android.os.Binder
 import android.os.Build
 import android.os.Bundle
 import android.os.Parcel
@@ -89,7 +86,7 @@ object TelephonyHook: BaseTelephonyHook() {
 //            XposedBridge.log("[Portal] ITelephony.Stub not found: ${it.stackTraceToString()}")
 //        }
 
-        if (!FakeLoc.needDowngradeTo2G) return
+        if (!FakeLoc.needDowngradeToCdma) return
 
         val cPhoneInterfaceManager = XposedHelpers.findClassIfExists("com.android.phone.PhoneInterfaceManager", classLoader)
             ?: return
diff --git a/xposed/src/main/java/moe/fuqiuluo/xposed/hooks/miui/MiuiTelephonyManagerHook.kt b/xposed/src/main/java/moe/fuqiuluo/xposed/hooks/telephony/miui/MiuiTelephonyManagerHook.kt
similarity index 97%
rename from xposed/src/main/java/moe/fuqiuluo/xposed/hooks/miui/MiuiTelephonyManagerHook.kt
rename to xposed/src/main/java/moe/fuqiuluo/xposed/hooks/telephony/miui/MiuiTelephonyManagerHook.kt
index 9de5196..0af8409 100644
--- a/xposed/src/main/java/moe/fuqiuluo/xposed/hooks/miui/MiuiTelephonyManagerHook.kt
+++ b/xposed/src/main/java/moe/fuqiuluo/xposed/hooks/telephony/miui/MiuiTelephonyManagerHook.kt
@@ -1,4 +1,4 @@
-package moe.fuqiuluo.xposed.hooks.miui
+package moe.fuqiuluo.xposed.hooks.telephony.miui
 
 import moe.fuqiuluo.xposed.hooks.telephony.BaseTelephonyHook
 
diff --git a/xposed/src/main/java/moe/fuqiuluo/xposed/utils/FakeLoc.kt b/xposed/src/main/java/moe/fuqiuluo/xposed/utils/FakeLoc.kt
index 1980888..6872b63 100644
--- a/xposed/src/main/java/moe/fuqiuluo/xposed/utils/FakeLoc.kt
+++ b/xposed/src/main/java/moe/fuqiuluo/xposed/utils/FakeLoc.kt
@@ -1,23 +1,39 @@
 package moe.fuqiuluo.xposed.utils
 
+import android.hardware.SensorManager
 import android.location.Location
 import kotlin.math.PI
 import kotlin.math.atan2
 import kotlin.math.cos
-import kotlin.math.max
 import kotlin.math.pow
-import kotlin.math.sign
 import kotlin.math.sin
 import kotlin.math.sqrt
 import kotlin.random.Random
 
 object FakeLoc {
+    /**
+     * 是否允许打印日志
+     */
     var enableLog = true
+
+    /**
+     * 是否允许打印调试日志
+     */
     var enableDebugLog = true
 
+    /**
+     * 模拟定位服务开关
+     */
     var enable = false
 
+    /**
+     * 是否禁用GetCurrentLocation方法（在部分系统不禁用可能导致hook失效）
+     */
     var disableGetCurrentLocation = true
+
+    /**
+     * 是否禁用RegisterLocationListener方法
+     */
     var disableRegisterLocationListener = false
 
     /**
@@ -25,48 +41,44 @@ object FakeLoc {
      */
     var disableFusedLocation = true
 
+    /**
+     * 是否允许AGPS模块（当前没什么鸟用）
+     */
     var enableAGPS = false
+
+    /**
+     * 是否允许NMEA模块
+     */
     var enableNMEA = true
+
+    /**
+     * 是否隐藏模拟位置
+     */
     var hideMock = true
-    var autoRemoveUselessLocListener = false
 
     /**
      * may cause system to crash
      */
     var hookWifi = true
-    var needDowngradeTo2G = true
 
-//
-//    /**
-//     * Whitelists and blacklists mode
-//     */
-//    var accessMode = AccessMode.None
-//    val accessList = arrayListOf<Int>()
+    /**
+     * 将网络定位降级为Cdma
+     */
+    var needDowngradeToCdma = true
 
+    /**
+     * 位置更新间隔（太小可能导致IBinder异常）
+     */
     var updateInterval = 3000L
 
-//    /**
-//     * enable fake location
-//     */
-//    fun isEnableHookApp(uid: Int): Boolean {
-//        return enable && when(accessMode) {
-//            AccessMode.BLACK_LIST -> !accessList.contains(uid)
-//            AccessMode.WHITE_LIST -> accessList.contains(uid)
-//            AccessMode.None -> true
-//        }
-//    }
-
-//    enum class AccessMode {
-//        BLACK_LIST,
-//        WHITE_LIST,
-//        None
-//    }
-
+    /**
+     * 上一次的位置
+     */
     var lastLocation: Location? = null
     var latitude = 0.0
     var longitude = 0.0
     var altitude = 80.0
-    var speed = 0.0
+    var speed = 4.5
     var speedAmplitude = 1.0
     var hasBearings = false
     var bearing = 0.0
@@ -90,21 +102,6 @@ object FakeLoc {
             }
         }
 
-    fun randomOffset(): Pair<Double, Double> {
-        val offset = 0.000045
-        return ((Math.random() - 0.5) * offset) to ((Math.random() - 0.5) * offset)
-    }
-
-//    /**
-//     * Test location
-//     */
-//    const val TEST_LAT = 37.86
-//    const val TEST_LON = 112.58
-//    // 4m/s
-//    const val TEST_SPEED = 4.0f
-//    // azimuth
-//    const val TEST_BEARING = 0.0f
-
     fun haversine(lat1: Double, lon1: Double, lat2: Double, lon2: Double): Double {
         val radius = 6371000.0
         val phi1 = Math.toRadians(lat1)
@@ -123,4 +120,12 @@ object FakeLoc {
         val newLon = lon + radiusInDegrees * sin(Math.toRadians(angle)) / cos(Math.toRadians(lat))
         return Pair(newLat, newLon)
     }
+
+    fun moveLocation(lat: Double = latitude, lon: Double = longitude, n: Double, angle: Double = bearing): Pair<Double, Double> {
+        val earthRadius = 6371000.0
+        val radiusInDegrees = n / earthRadius * (180 / PI)
+        val newLat = lat + radiusInDegrees * cos(Math.toRadians(angle))
+        val newLon = lon + radiusInDegrees * sin(Math.toRadians(angle)) / cos(Math.toRadians(lat))
+        return Pair(newLat, newLon)
+    }
 }
\ No newline at end of file