BaseInputActivity

app/src/main/AndroidManifest.xml

@@ -97,6 +97,11 @@
             android:exported="true"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:launchMode="singleInstance" />
+        <activity
+            android:name=".Activity.BaseInputActivity"
+            android:exported="true"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:launchMode="singleInstance" />
 
     </application>
 

app/src/main/java/com/xplora/xponboarding/Activity/BaseInputActivity.java

@@ -0,0 +1,98 @@
+package com.xplora.xponboarding.Activity;
+
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ImageButton;
+import android.widget.TextView;
+
+import com.xplora.xponboarding.R;
+
+public class BaseInputActivity extends BaseActivity {
+    public String mInput = "";
+    private TextView mTextView1 = null;
+    private TextView mTextView2 = null;
+    private TextView mTextView3 = null;
+    private TextView mTextView4 = null;
+
+    protected void onSureClick() {};
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_input_pin);
+        initView();
+    }
+
+    private void initView() {
+        setContentView(R.layout.activity_input_pin);
+        mTextView1 = findViewById(R.id.text1);
+        mTextView2 = findViewById(R.id.text2);
+        mTextView3 = findViewById(R.id.text3);
+        mTextView4 = findViewById(R.id.text4);
+
+        Button button1 = findViewById(R.id.button1);
+        Button button2 = findViewById(R.id.button2);
+        Button button3 = findViewById(R.id.button3);
+        Button button4 = findViewById(R.id.button4);
+        Button button5 = findViewById(R.id.button5);
+        Button button6 = findViewById(R.id.button6);
+        Button button7 = findViewById(R.id.button7);
+        Button button8 = findViewById(R.id.button8);
+        Button button9 = findViewById(R.id.button9);
+        Button button0 = findViewById(R.id.button0);
+        Button buttonOK = findViewById(R.id.buttonOK);
+        ImageButton buttonBack = findViewById(R.id.buttonBack);
+
+        button1.setOnClickListener(mOnClickListener);
+        button2.setOnClickListener(mOnClickListener);
+        button3.setOnClickListener(mOnClickListener);
+        button4.setOnClickListener(mOnClickListener);
+        button5.setOnClickListener(mOnClickListener);
+        button6.setOnClickListener(mOnClickListener);
+        button7.setOnClickListener(mOnClickListener);
+        button8.setOnClickListener(mOnClickListener);
+        button9.setOnClickListener(mOnClickListener);
+        button0.setOnClickListener(mOnClickListener);
+        buttonOK.setOnClickListener(mOnClickListener);
+        buttonBack.setOnClickListener(mOnClickListener);
+    }
+
+    View.OnClickListener mOnClickListener = new View.OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            int tag = Integer.parseInt((String) v.getTag());
+            if (tag == 100) {
+                actionBack();
+            } else if (tag == 101) {
+                onSureClick();
+            } else {
+                if (mInput.length() >= 4)
+                    return;
+                mInput += tag;
+                showInputCode();
+            }
+        }
+    };
+
+    private void showInputCode() {
+        mTextView1.setText(mInput.length() >= 1 ? "*" : "");
+        mTextView2.setText(mInput.length() >= 2 ? "*" : "");
+        mTextView3.setText(mInput.length() >= 3 ? "*" : "");
+        mTextView4.setText(mInput.length() >= 4 ? "*" : "");
+    }
+
+    private void actionBack() {
+        if (mInput.length() <= 0)
+            return;
+        mInput = mInput.substring(0, mInput.length() - 1);
+        showInputCode();
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        mInput = "";
+        showInputCode();
+    }
+}

app/src/main/java/com/xplora/xponboarding/Activity/SimInputCodeActivity.java

@@ -23,92 +23,20 @@ import com.xplora.xponboarding.R;
 import java.lang.reflect.Method;
 import java.util.List;
 
-public class SimInputCodeActivity extends BaseActivity {
-    public String mInput = "";
-    private TextView mTextView1 = null;
-    private TextView mTextView2 = null;
-    private TextView mTextView3 = null;
-    private TextView mTextView4 = null;
-
+public class SimInputCodeActivity extends BaseInputActivity {
     private int subID = 0;
-
-    private String mSavePin = "";
     private int mPinOrPuk = 1;  //1:pin 2:puk
+    private String mSavePin = "";
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_input_pin);
-        mTextView1 = findViewById(R.id.text1);
-        mTextView2 = findViewById(R.id.text2);
-        mTextView3 = findViewById(R.id.text3);
-        mTextView4 = findViewById(R.id.text4);
-
-        Button button1 = findViewById(R.id.button1);
-        Button button2 = findViewById(R.id.button2);
-        Button button3 = findViewById(R.id.button3);
-        Button button4 = findViewById(R.id.button4);
-        Button button5 = findViewById(R.id.button5);
-        Button button6 = findViewById(R.id.button6);
-        Button button7 = findViewById(R.id.button7);
-        Button button8 = findViewById(R.id.button8);
-        Button button9 = findViewById(R.id.button9);
-        Button button0 = findViewById(R.id.button0);
-        Button buttonOK = findViewById(R.id.buttonOK);
-        ImageButton buttonBack = findViewById(R.id.buttonBack);
-
-        button1.setOnClickListener(mOnClickListener);
-        button2.setOnClickListener(mOnClickListener);
-        button3.setOnClickListener(mOnClickListener);
-        button4.setOnClickListener(mOnClickListener);
-        button5.setOnClickListener(mOnClickListener);
-        button6.setOnClickListener(mOnClickListener);
-        button7.setOnClickListener(mOnClickListener);
-        button8.setOnClickListener(mOnClickListener);
-        button9.setOnClickListener(mOnClickListener);
-        button0.setOnClickListener(mOnClickListener);
-        buttonOK.setOnClickListener(mOnClickListener);
-        buttonBack.setOnClickListener(mOnClickListener);
-    }
-
-    View.OnClickListener mOnClickListener = new View.OnClickListener() {
-        @Override
-        public void onClick(View v) {
-            int tag = Integer.parseInt((String) v.getTag());
-            if (tag == 100) {
-                actionBack();
-            } else if (tag == 101) {
-                actionOK();
-            } else {
-                if (mInput.length() >= 4)
-                    return;
-                mInput += tag;
-                showPinCode();
-            }
-        }
-    };
-
-    private void showPinCode() {
-        mTextView1.setText(mInput.length() >= 1 ? "*" : "");
-        mTextView2.setText(mInput.length() >= 2 ? "*" : "");
-        mTextView3.setText(mInput.length() >= 3 ? "*" : "");
-        mTextView4.setText(mInput.length() >= 4 ? "*" : "");
-    }
-
-    private void actionBack() {
-        if (mInput.length() <= 0)
-            return;
-        mInput = mInput.substring(0, mInput.length() - 1);
-        showPinCode();
-    }
-
-    private void actionOK() {
+    protected void onSureClick() {
+        super.onSureClick();
         initSubscriptionId();
-
-        if (mPinOrPuk == 1)
+        if (mPinOrPuk == 1) {
             unLockPin(mInput);
-        else
+        } else {
             unLockPuk(mSavePin, mInput);
+        }
     }
 
     private void initSubscriptionId() {
@@ -224,9 +152,6 @@ public class SimInputCodeActivity extends BaseActivity {
     }
 
     private void unlockFailed(int leftTime, String type) {
-        mInput = "";
-        showPinCode();
-
         Intent intent = new Intent(this, SimPinLockedActivity.class);
         intent.putExtra("intent_sim_lock", leftTime);
         startActivity(intent);