liuzhenxing 3 жил өмнө
parent
commit
4a1b92c5f5

+ 1 - 0
.idea/misc.xml

@@ -5,6 +5,7 @@
       <map>
         <entry key="app/src/main/res/layout/activity_congratulation.xml" value="0.1" />
         <entry key="app/src/main/res/layout/activity_esim_activation.xml" value="0.1" />
+        <entry key="app/src/main/res/layout/activity_input_pin.xml" value="0.1" />
         <entry key="app/src/main/res/layout/activity_install_sim.xml" value="0.1" />
         <entry key="app/src/main/res/layout/activity_list.xml" value="0.14387031408308004" />
         <entry key="app/src/main/res/layout/activity_main.xml" value="0.1" />

+ 4 - 0
app/src/main/AndroidManifest.xml

@@ -55,6 +55,10 @@
             android:name=".Activity.QRActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:launchMode="standard" />
+        <activity
+            android:name=".Activity.InputPinActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:launchMode="standard" />
 
     </application>
 

+ 34 - 0
app/src/main/java/com/xplora/xponboarding/Activity/InputPinActivity.java

@@ -0,0 +1,34 @@
+package com.xplora.xponboarding.Activity;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.widget.EditText;
+import android.widget.FrameLayout;
+
+import com.xplora.xponboarding.R;
+import com.xplora.xponboarding.Utils.KeyUtils;
+
+public class InputPinActivity extends BaseActivity {
+    EditText password;
+    FrameLayout check;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_input_pin);
+        password = findViewById(R.id.password);
+        check = findViewById(R.id.check);
+        check.setOnClickListener(view -> {
+            Intent intent = new Intent();
+            intent.putExtra("ssid", getIntent().getStringExtra("ssid"));
+            intent.putExtra("bssid", getIntent().getStringExtra("bssid"));
+            intent.putExtra("password", password.getText().toString());
+            setResult(-1, intent);
+            finish();
+        });
+        new KeyUtils(this, password);
+    }
+
+    private void clickButton() {
+    }
+}

+ 4 - 1
app/src/main/java/com/xplora/xponboarding/Activity/OnboardingActivity.java

@@ -86,7 +86,10 @@ public class OnboardingActivity extends BaseActivity {
         button.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                Intent intent = new Intent(OnboardingActivity.this, WelcomeActivity.class);
+//                Intent intent = new Intent(OnboardingActivity.this, WelcomeActivity.class);
+//                startActivity(intent);
+
+                Intent intent = new Intent(OnboardingActivity.this, InputPinActivity.class);
                 startActivity(intent);
             }
         });

+ 2 - 1
app/src/main/java/com/xplora/xponboarding/Activity/SimLockedActivity.java

@@ -32,7 +32,8 @@ public class SimLockedActivity extends BaseActivity {
         okButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-
+                Intent intent = new Intent(SimLockedActivity.this, InputPinActivity.class);
+                startActivity(intent);
             }
         });
     }

+ 0 - 0
app/src/main/res/drawable/ic_keyboard_check.png → app/src/main/res/drawable-xhdpi/ic_keyboard_check.png


+ 0 - 0
app/src/main/res/drawable/ic_keyboard_del.png → app/src/main/res/drawable-xhdpi/ic_keyboard_del.png


+ 0 - 0
app/src/main/res/drawable/ic_keyboard_del_preview.png → app/src/main/res/drawable-xhdpi/ic_keyboard_del_preview.png


+ 0 - 0
app/src/main/res/drawable/ic_keyboard_shift.png → app/src/main/res/drawable-xhdpi/ic_keyboard_shift.png


+ 0 - 0
app/src/main/res/drawable/ic_keyboard_shift_locked.png → app/src/main/res/drawable-xhdpi/ic_keyboard_shift_locked.png


+ 0 - 0
app/src/main/res/drawable/ic_keyboard_shifted.png → app/src/main/res/drawable-xhdpi/ic_keyboard_shifted.png


+ 0 - 0
app/src/main/res/drawable/ic_keyboard_space.png → app/src/main/res/drawable-xhdpi/ic_keyboard_space.png


+ 0 - 0
app/src/main/res/drawable/ic_keyboard_space_b.png → app/src/main/res/drawable-xhdpi/ic_keyboard_space_b.png


+ 0 - 0
app/src/main/res/drawable/ic_keyboard_switch_number.png → app/src/main/res/drawable-xhdpi/ic_keyboard_switch_number.png


+ 0 - 0
app/src/main/res/drawable/ic_keyboard_switch_symbols.png → app/src/main/res/drawable-xhdpi/ic_keyboard_switch_symbols.png


+ 0 - 0
app/src/main/res/drawable/ic_keyboard_symbols_shift.png → app/src/main/res/drawable-xhdpi/ic_keyboard_symbols_shift.png


+ 0 - 0
app/src/main/res/drawable/ic_launcher_background.xml → app/src/main/res/drawable-xhdpi/ic_launcher_background.xml


+ 0 - 0
app/src/main/res/drawable/icon_activation.png → app/src/main/res/drawable-xhdpi/icon_activation.png


+ 0 - 0
app/src/main/res/drawable/icon_sim.png → app/src/main/res/drawable-xhdpi/icon_sim.png


+ 0 - 0
app/src/main/res/drawable/icon_unactivation.png → app/src/main/res/drawable-xhdpi/icon_unactivation.png


+ 2 - 2
app/src/main/res/layout/activity_wifi_login.xml → app/src/main/res/layout/activity_input_pin.xml

@@ -5,13 +5,13 @@
     android:layout_height="match_parent"
     android:background="@color/black"
     android:orientation="vertical"
-    tools:context=".Activity.WifiLoginActivity">
+    tools:context=".Activity.InputPinActivity">
 
     <LinearLayout
         android:layout_gravity="center"
         android:layout_marginTop="20dp"
         android:background="#292929"
-        android:layout_width="140dp"
+        android:layout_width="match_parent"
         android:layout_height="30dp">
 
         <EditText