升级基础库，修复输入法设置以后自动检测没有生效的问题

Author: bihe0832

BaseAdbInput/src/main/java/com/bihe0832/android/base/adb/input/ZixieIME.java

@@ -19,7 +19,7 @@
 public class ZixieIME extends InputMethodService {
 
     public String IME_ADB_INPUT_ACTION = "ZIXIE_ADB_INPUT";
-    public static final String IME_NAME = "com.bihe0832.android.app.test/com.bihe0832.android.base.adb.input.ZixieIME";
+    public static final String IME_NAME = "com.bihe0832.adb.input/com.bihe0832.android.base.adb.input.ZixieIME";
 
     public static final String TAG = "InputService";
     private InputServiceActionListener mInputServiceActionListener = null;

BaseAdbInput/src/main/java/com/bihe0832/android/base/adb/input/settings/InputSettingsActivity.kt

@@ -21,7 +21,7 @@ class InputSettingsActivity : BaseActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_input_settings)
-        initToolbar(R.id.common_toolbar, "输入法设置引导", true)
+        initToolbar(R.id.common_toolbar, "输入法设置引导", needTitleCenter = false, needBack = true, iconRes = R.mipmap.icon_left_arrow_white)
         showInputMethodPicker(intent)
         if (findFragment(InputSettingsFragment::class.java) == null) {
             loadRootFragment(R.id.common_fragment_content, InputSettingsFragment())

BaseAdbInput/src/main/java/com/bihe0832/android/base/adb/input/settings/InputSettingsFragment.kt

@@ -14,6 +14,7 @@ import com.bihe0832.android.base.adb.input.switcher.InputSwitchTools
 import com.bihe0832.android.framework.ZixieContext
 import com.bihe0832.android.framework.ui.BaseFragment
 import com.bihe0832.android.lib.text.TextFactoryUtils
+import com.bihe0832.android.lib.thread.ThreadManager
 import com.bihe0832.android.lib.utils.apk.APKUtils
 import com.bihe0832.android.lib.utils.intent.IntentUtils
 import kotlinx.android.synthetic.main.fragment_input_settings.*
@@ -31,19 +32,18 @@ class InputSettingsFragment : BaseFragment() {
 
     override fun initView(view: View) {
         super.initView(view)
-        if (InputSwitchTools.hasInstall(context)) {
-            input_settings_global_input_add.setOnClickListener {
-                ZixieContext.showToast("输入法已添加")
-            }
-            input_settings_global_input_add.background = ContextCompat.getDrawable(context!!, R.drawable.keyboard_bg)
-        } else {
-            input_settings_global_input_add.setOnClickListener {
-                IntentUtils.startSettings(activity, Settings.ACTION_INPUT_METHOD_SETTINGS)
-            }
+
+        input_settings_global_input_add.setOnClickListener {
+            IntentUtils.startSettings(activity, Settings.ACTION_INPUT_METHOD_SETTINGS)
         }
 
         input_settings_global_input_switch.setOnClickListener {
             (activity?.getSystemService(SupportActivity.INPUT_METHOD_SERVICE) as InputMethodManager).showInputMethodPicker()
+            ThreadManager.getInstance().start({
+                ThreadManager.getInstance().runOnUIThread {
+                    updateView()
+                }
+            }, 1)
         }
 
         input_settings_item_notify_switch.apply {
@@ -65,15 +65,8 @@ class InputSettingsFragment : BaseFragment() {
             })
         }
 
-        if (InputSwitchConfig.canNotify()) {
-            InputSwitchTools.checkPermissionAndShow(activity!!)
-        }
-
         var color = resources.getColor(R.color.colorPrimary)
-        var tips = "1. 手机通过<b><font color='$color'>ADB</font>连接到电脑</b>，并将手机输入法<b>切换为<font color='$color'>${APKUtils.getAppName(context)}</font></b>" +
-                "<BR>2. 激活需要输入内容的输入框" +
-                "<BR>3. 在电脑端用命令行输入 <b><font color='$color'>adb shell am broadcast -a ZIXIE_ADB_INPUT --es msg \"DATA\"</font></b>，DATA 即为要输入的内容" +
-                "<BR>4. <b>ADB 常用命令使用方法可以点击查看： <font color='$color'>https://blog.bihe0832.com/review_adb.html</font></b>"
+        var tips = "1. 手机通过<b><font color='$color'>ADB</font>连接到电脑</b>，并将手机输入法<b>切换为<font color='$color'>${APKUtils.getAppName(context)}</font></b>" + "<BR>2. 激活需要输入内容的输入框" + "<BR>3. 在电脑端用命令行输入 <b><font color='$color'>adb shell am broadcast -a ZIXIE_ADB_INPUT --es msg \"DATA\"</font></b>，DATA 即为要输入的内容" + "<BR>4. <b>ADB 常用命令使用方法可以点击查看： <font color='$color'>https://blog.bihe0832.com/review_adb.html</font></b>"
         val list = HashMap<String, View.OnClickListener>().apply {
             put("https://blog.bihe0832.com/review_adb.html", View.OnClickListener {
                 openWebPage("https://blog.bihe0832.com/review_adb.html")
@@ -83,13 +76,27 @@ class InputSettingsFragment : BaseFragment() {
             setText(TextFactoryUtils.getCharSequenceWithClickAction(tips, list))
             setMovementMethod(LinkMovementMethod.getInstance())
         }
+
+        updateView()
     }
 
     private fun updateView() {
+        if (InputSwitchTools.hasInstall(context)) {
+            input_settings_global_input_add.background = ContextCompat.getDrawable(context!!, R.drawable.keyboard_bg)
+        } else {
+            input_settings_global_input_add.background = ContextCompat.getDrawable(context!!, R.drawable.keyboard_enter_bg)
+        }
+
+        if (InputSwitchTools.isSelected(context)) {
+            input_settings_global_input_switch.background = ContextCompat.getDrawable(context!!, R.drawable.keyboard_bg)
+        } else {
+            input_settings_global_input_switch.background = ContextCompat.getDrawable(context!!, R.drawable.keyboard_enter_bg)
+        }
+
         if (!InputSwitchConfig.canNotify()) {
             InputSwitchTools.closeNotify(context)
         } else {
-            InputSwitchTools.showInputSwitchNotify(activity!!)
+            InputSwitchTools.checkPermissionAndShow(activity!!)
         }
     }
 

BaseAdbInput/src/main/java/com/bihe0832/android/base/adb/input/switcher/InputSwitchTools.kt

@@ -38,6 +38,11 @@ object InputSwitchTools {
         return false
     }
 
+    fun isSelected(context: Context?): Boolean {
+        return Settings.Secure.getString(context?.getContentResolver(), Settings.Secure.DEFAULT_INPUT_METHOD).equals(ZixieIME.IME_NAME)
+
+    }
+
     fun closeNotify(context: Context?) {
         context?.let {
             NotifyManager.cancelNotify(it, NOTIFYL_ID)

BaseAdbInput/src/main/res/layout/activity_input_settings.xml

@@ -17,7 +17,7 @@
             android:id="@+id/about"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
+            android:layout_gravity="center_vertical|end"
             android:layout_marginRight="16dp"
             android:src="@mipmap/ic_menu_white" />
 

config.gradle

@@ -42,6 +42,6 @@ ext {
     //使用kotlin版本
     kotlin_version = '1.7.10'
 
-    aaf_test_version = '5.10.49'
-    aaf_version = '5.10.49'
+    aaf_test_version = '5.10.54'
+    aaf_version = '5.10.54'
 }