From 3deb614d3199d102427a097f6b4b1308347a0cfa Mon Sep 17 00:00:00 2001
From: Matthew <wakinchau@msn.com>
Date: Sat, 29 Jun 2024 10:54:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=97=B6=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/xypower/secapp/CertActivity.java | 113 ++++++++++--------
 1 file changed, 65 insertions(+), 48 deletions(-)

diff --git a/app/src/main/java/com/xypower/secapp/CertActivity.java b/app/src/main/java/com/xypower/secapp/CertActivity.java
index 033b7ae..ff2257c 100644
--- a/app/src/main/java/com/xypower/secapp/CertActivity.java
+++ b/app/src/main/java/com/xypower/secapp/CertActivity.java
@@ -76,7 +76,7 @@ public class CertActivity extends AppCompatActivity {
 
         bres = dsSdk.mcuPowerOffCPR();
         try {
-            Thread.sleep(1000);
+            Thread.sleep(100);
         } catch (Exception ex) {
             ex.printStackTrace();
         }
@@ -86,18 +86,11 @@ public class CertActivity extends AppCompatActivity {
         // res = dsSdk.nrsecInit();
         // res = dsSdk.nrsecOpen();
 
-        String version = MicroPhotoService.querySecVersion();
-
         mTextView = (TextView)findViewById(R.id.textView);
-        mTextView.setText(R.string.nrsec_version + version);
-
-        ActionBar actionBar = getSupportActionBar();
-        String text = getResources().getString(R.string.nrsec_version);
-        actionBar.setTitle(actionBar.getTitle().toString() + "  " + text + " " + version);
 
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Date dt = new Date();
-        text = format.format(dt);
+        String text = format.format(dt);
 
         mTextView.setText(text);
 
@@ -114,30 +107,21 @@ public class CertActivity extends AppCompatActivity {
         setEditText(R.id.uid_end, sharedPreferences.getString("uidEnd", ""));
         setSpinnerPosition(R.id.company, sharedPreferences.getInt("company", 0));
 
-        {
-            final Intent intent = getIntent();
-            if (intent != null) {
-                if (mCommandThread != null) {
-                    try {
-                        mCommandThread.interrupt();
-                    } catch (Exception ex) {
+        mHandler.postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                String version = MicroPhotoService.querySecVersion();
 
-                    }
-                }
-                mCommandThread = new Thread(new Runnable() {
-                    @Override
-                    public void run() {
-                        try {
-                            handleCommand(intent);
-                        } catch (Exception ex) {
-                            ex.printStackTrace();
-                        }
-                    }
-                });
+                mTextView.setText(R.string.nrsec_version + version);
+
+                ActionBar actionBar = getSupportActionBar();
+                String text = getResources().getString(R.string.nrsec_version);
+                actionBar.setTitle(actionBar.getTitle().toString() + "  " + text + " " + version);
+
+                processActivityIntent();
 
-                mCommandThread.start();
             }
-        }
+        }, 1000);
 
         findViewById(R.id.btnGenKeys).setOnClickListener(new View.OnClickListener() {
             @Override
@@ -262,6 +246,31 @@ public class CertActivity extends AppCompatActivity {
         //
     }
 
+    protected void processActivityIntent() {
+        final Intent intent = getIntent();
+        if (intent != null) {
+            if (mCommandThread != null) {
+                try {
+                    mCommandThread.interrupt();
+                } catch (Exception ex) {
+
+                }
+            }
+            mCommandThread = new Thread(new Runnable() {
+                @Override
+                public void run() {
+                    try {
+                        handleCommand(intent);
+                    } catch (Exception ex) {
+                        ex.printStackTrace();
+                    }
+                }
+            });
+
+            mCommandThread.start();
+        }
+    }
+
     protected int getItemData(int viewId) {
         Spinner spinnerView = (Spinner) findViewById(viewId);
         if (spinnerView != null) {
@@ -524,10 +533,13 @@ public class CertActivity extends AppCompatActivity {
                     @Override
                     public void run() {
                         activity.finish();
+                        System.exit(0);
                     }
                 });
             }
         }
+
+        mCommandThread = null;
     }
 
     protected void ensureDirectoryExisted(String fileName) {
@@ -573,28 +585,33 @@ public class CertActivity extends AppCompatActivity {
         public void onReceive(Context context, final Intent intent) {
             final Intent finalIntent = intent;
 
-            if (intent != null) {
+            CertActivity.this.mHandler.postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    if (intent != null) {
 
-                if (mCommandThread != null) {
-                    try {
-                        mCommandThread.interrupt();
-                    } catch (Exception ex) {
-
-                    }
-                }
+                        if (mCommandThread != null) {
+                            try {
+                                mCommandThread.interrupt();
+                            } catch (Exception ex) {
 
-                mCommandThread = new Thread(new Runnable() {
-                    @Override
-                    public void run() {
-                        try {
-                            handleCommand(finalIntent);
-                        } catch (Exception ex) {
+                            }
                         }
-                    }
-                });
 
-                mCommandThread.start();
-            }
+                        mCommandThread = new Thread(new Runnable() {
+                            @Override
+                            public void run() {
+                                try {
+                                    handleCommand(finalIntent);
+                                } catch (Exception ex) {
+                                }
+                            }
+                        });
+
+                        mCommandThread.start();
+                    }
+                }
+            }, 2000);
         }
     }
 }
\ No newline at end of file