Bläddra i källkod

WiFi 输入密码界面去掉输入框右侧按钮

losion.liu@sikey.com.cn 1 år sedan
förälder
incheckning
88a66bba5b

+ 21 - 0
app/src/main/java/com/xplora/xpsettings/Activity/WifiLoginActivity.java

@@ -3,6 +3,8 @@ package com.xplora.xpsettings.Activity;
 import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.KeyEvent;
+import android.view.View;
 import android.view.Window;
 import android.widget.EditText;
 import android.widget.FrameLayout;
@@ -22,6 +24,16 @@ public class WifiLoginActivity extends BaseActivity {
         setContentView(R.layout.activity_wifi_login);
         password = findViewById(R.id.password);
         password.requestFocus();
+        password.setOnKeyListener(new View.OnKeyListener() {
+            @Override
+            public boolean onKey(View v, int keyCode, KeyEvent event) {
+                if (event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER) {
+                    showWiFi();
+                }
+                return false;
+            }
+        });
+
         check = findViewById(R.id.check);
         check.setOnClickListener(view -> {
             Intent intent = new Intent();
@@ -32,4 +44,13 @@ public class WifiLoginActivity extends BaseActivity {
             finish();
         });
     }
+
+    private void showWiFi() {
+        Intent intent = new Intent();
+        intent.putExtra("ssid", getIntent().getStringExtra("ssid"));
+        intent.putExtra("bssid", getIntent().getStringExtra("bssid"));
+        intent.putExtra("password", password.getText().toString().trim());
+        setResult(-1, intent);
+        finish();
+    }
 }

+ 3 - 0
app/src/main/java/com/xplora/xpsettings/SKKeyboard/SKKeyboardUtils.java

@@ -6,9 +6,11 @@ import android.content.Context;
 import android.inputmethodservice.Keyboard;
 import android.inputmethodservice.KeyboardView;
 import android.text.Editable;
+import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputConnection;
 import android.widget.EditText;
 import android.widget.Editor;
 import android.widget.RelativeLayout;
@@ -244,6 +246,7 @@ public class SKKeyboardUtils implements View.OnTouchListener {
         Keyboard keyboard1 = null;
         Keyboard keyboard2 = null;
         if (primaryCode == KEY_CODES.KEY_SWITCH_CLOSE.CODES) {
+            mEditText.dispatchKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_ENTER));
             removeSKKeyboard();
             return;
         }

+ 3 - 1
app/src/main/res/layout/activity_wifi_login.xml

@@ -49,7 +49,9 @@
                 android:layout_width="23dp"
                 android:layout_height="23dp"
                 android:layout_gravity="center"
-                android:src="@drawable/connections_connected" />
+                android:src="@drawable/connections_connected"
+                android:visibility="gone"
+                />
         </FrameLayout>
 
     </RelativeLayout>

+ 2 - 2
app/src/main/res/xml/sk_keyboard_symbols.xml

@@ -68,9 +68,9 @@
     </Row>
 
     <Row>
-        <Key android:codes="137" android:keyLabel="‰" android:keyEdgeFlags="left"/>
-        <Key android:codes="210" android:keyLabel="×"/>
+        <Key android:codes="210" android:keyLabel="×" android:keyEdgeFlags="left"/>
         <Key android:codes="211" android:keyLabel="÷"/>
+        <Key android:codes="-200000" android:keyLabel="" />
         <Key android:codes="-200000" android:keyLabel="" android:keyEdgeFlags="right" />
     </Row>