From d9a966e3a923c19d2f927921fc0cd624b76ca574 Mon Sep 17 00:00:00 2001
From: Matthew <wakinchau@msn.com>
Date: Fri, 21 Jun 2024 13:39:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BD=93=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/xypower/secapp/CertActivity.java | 28 +++++++++++++++----
 app/src/main/res/layout/activity_cert.xml     |  1 +
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/xypower/secapp/CertActivity.java b/app/src/main/java/com/xypower/secapp/CertActivity.java
index 3dbed1c..b7f5dbe 100644
--- a/app/src/main/java/com/xypower/secapp/CertActivity.java
+++ b/app/src/main/java/com/xypower/secapp/CertActivity.java
@@ -38,6 +38,7 @@ public class CertActivity extends AppCompatActivity {
     private static long AUTO_CLOSE_TIMEOUT = 200;
 
     private Handler mHandler = null;
+    TextView mTextView = null;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -60,19 +61,18 @@ public class CertActivity extends AppCompatActivity {
 
         String version = MicroPhotoService.querySecVersion();
 
-        TextView textView = (TextView)findViewById(R.id.textView);
-        textView.setText(R.string.nrsec_version + version);
+        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");
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Date dt = new Date();
         text = format.format(dt);
 
-        ((TextView) findViewById(R.id.textView)).setText(text);
+        mTextView.setText(text);
 
         mHandler = new Handler();
 
@@ -338,12 +338,28 @@ public class CertActivity extends AppCompatActivity {
                     f = new File(path);
                     f = new File(f, "progress.txt");
                     writeTextFile(f.getAbsolutePath(), Integer.toString(idx - startIdx + 1));
+
+                    final String fullSn = sn + idxStr;
+                    mHandler.post(new Runnable() {
+                        @Override
+                        public void run() {
+                            SimpleDateFormat format = new SimpleDateFormat("HH:mm:ss");
+                            Date dt = new Date();
+
+                            mTextView.setText(format.format(dt) + "  " + fullSn);
+                        }
+                    });
                 }
 
                 f = new File(path);
-                f = new File(f, "log.txt");
+                File dest = new File(f, "log.txt");
+                f = new File(f, "log");
                 writeTextFile(f.getAbsolutePath(), logs.toString());
+                try {
+                    Files.move(f.toPath(), dest.toPath());
+                } catch (Exception ex) {
 
+                }
             }
 
             final Activity activity = this;
diff --git a/app/src/main/res/layout/activity_cert.xml b/app/src/main/res/layout/activity_cert.xml
index 19426d8..f0ad08c 100644
--- a/app/src/main/res/layout/activity_cert.xml
+++ b/app/src/main/res/layout/activity_cert.xml
@@ -11,6 +11,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="TextView"
+        android:textSize="32sp"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent"