Merge pull request #20 from Shao-Feng/android_service

Start service by default

Author: Shao-Feng

android/res/layout/activity_fullscreen.xml

@@ -15,7 +15,9 @@
         android:id="@+id/fullscreen_content"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:scrollbars = "vertical"
         android:keepScreenOn="true"
+        android:gravity="bottom"
         android:text="@string/output_content"
         android:textColor="#ffffff" />
 

android/src/com/intel/tinywebtestservice/FullscreenActivity.java

@@ -24,6 +24,7 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
+import android.text.method.ScrollingMovementMethod;
 import android.view.MotionEvent;
 import android.view.View;
 import android.widget.TextView;
@@ -32,8 +33,10 @@
 
 import java.io.BufferedReader;
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.IOException;
+import java.io.PrintWriter;
 
 /**
  * An example full-screen activity that shows and hides the system UI (i.e.
@@ -94,6 +97,8 @@ public boolean onTouch(View view, MotionEvent motionEvent) {
     private String target_path;
     private static String full_log = "";
     private Process p;
+    private Thread logThread = null;
+    private boolean logUpdating = false;
 
     //create a Handler for updating UI
 
@@ -180,29 +185,15 @@ public void onClick(View view) {
         findViewById(R.id.refresh_button).setOnTouchListener(
                 mDelayHideTouchListener);
         tv = (TextView) contentView;
+        tv.setMovementMethod(new ScrollingMovementMethod());
         target_path = getFilesDir().getPath() + "/";
         assetManager = this.getAssets();
 
-        Thread t = new Thread() {
-            public void run() {
-                try {
-                    BufferedReader br = new BufferedReader(new FileReader(new File(Constants.LOG.SERVICE_LOG_FILE)));
-                    String line;
-                    while (true) {
-                        line = br.readLine();
-                        if (line == null) {
-                            Thread.sleep(1000);
-                        } else {
-                            printLog(line);
-                        }
-                    }
-                }catch(IOException e){
-                    e.printStackTrace();
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }
-        };
+        printLog("Start service...");
+        restartLogThread();
+        Intent startIntent = new Intent(FullscreenActivity.this, TinywebService.class);
+        startIntent.setAction(Constants.ACTION.STARTFOREGROUND_ACTION);
+        startService(startIntent);
     }
 
     @Override
@@ -224,6 +215,60 @@ private void delayedHide(int delayMillis) {
         mHideHandler.postDelayed(mHideRunnable, delayMillis);
     }
 
+    private void restartLogThread(){
+        logUpdating = false;
+        try {
+            Thread.sleep(200);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+        if(!logUpdating) {
+            logThread = new Thread() {
+                public void run() {
+                    try {
+                        BufferedReader br = new BufferedReader(new FileReader(new File(Constants.LOG.SERVICE_LOG_FILE)));
+                        String line;
+                        while (logUpdating) {
+                            line = br.readLine();
+                            if (line == null) {
+                                Thread.sleep(1000);
+                            } else {
+                                printLog(line);
+                            }
+                        }
+                    }catch(IOException e){
+                        e.printStackTrace();
+                    } catch (InterruptedException e) {
+                        e.printStackTrace();
+                    }
+                }
+            };
+            logUpdating = true;
+            logThread.start();
+        }
+    }
+
+    private void clearLog(){
+        logUpdating = false;
+        PrintWriter writer = null;
+        try {
+            writer = new PrintWriter(Constants.LOG.SERVICE_LOG_FILE);
+            writer.print("");
+            writer.close();
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+        }
+
+        restartLogThread();
+
+        Message message = new Message();
+        Bundle bundle = new Bundle();
+        full_log = "";
+        bundle.putString("LOG", full_log);
+        message.setData(bundle);
+        handler.sendMessage(message);
+    }
+
     /**
      * Called when the user clicks the runService button
      */
@@ -238,13 +283,16 @@ public void refreshData(View view) {
 
     public void stopTinywebService(View view) {
         printLog("Stop service...");
+        clearLog();
         Intent startIntent = new Intent(FullscreenActivity.this, TinywebService.class);
         startIntent.setAction(Constants.ACTION.STOPFOREGROUND_ACTION);
         startService(startIntent);
+        //printLog("Service is stopped");
     }
 
     public void startTinywebService(View view) {
         printLog("Start service...");
+        restartLogThread();
         Intent startIntent = new Intent(FullscreenActivity.this, TinywebService.class);
         startIntent.setAction(Constants.ACTION.STARTFOREGROUND_ACTION);
         startService(startIntent);

android/src/com/intel/tinywebtestservice/TinywebService.java

@@ -102,7 +102,9 @@ private void copyFile(String filename) {
             out.flush();
         } catch (Exception e) {
             Log.e(LOG_TAG, "Exception in copyFile() of " + newFileName);
+            printLog("Exception in copyFile() of " + newFileName);
             Log.e(LOG_TAG, "Exception in copyFile() " + e.toString());
+            printLog("Exception in copyFile() " + e.toString());
         }finally {
             try {
                 in.close();
@@ -124,6 +126,7 @@ private void copyDir(String path) {
         String assets[] = null;
         try {
             Log.i(LOG_TAG, "copyFileOrDir() " + path);
+            printLog("copyFileOrDir() " + path);
             assets = assetManager.list(path);
             if (assets.length == 0) {
                 copyFile(path);
@@ -137,6 +140,7 @@ private void copyDir(String path) {
                     if (!dir.mkdirs())
                         ;
                 Log.i(LOG_TAG, "could not create dir " + fullPath);
+                printLog("could not create dir " + fullPath);
                 for (int i = 0; i < assets.length; ++i) {
                     String p;
                     if (path.equals(""))
@@ -152,6 +156,7 @@ private void copyDir(String path) {
             }
         } catch (IOException ex) {
             Log.e(LOG_TAG, "I/O Exception", ex);
+            printLog("I/O Exception: " + ex.getMessage());
         }
     }
 
@@ -163,6 +168,7 @@ private void unzipDocroot() {
                     + "system/libs/" + Build.CPU_ABI + "/busybox unzip /sdcard/docroot.zip -o -d "
                     + file_path;
             Log.i(LOG_TAG, "unzip docroot begin(cmd=" + cmd);
+            printLog("unzip docroot begin(cmd=" + cmd);
             Process unzip = Runtime.getRuntime().exec(cmd);
             BufferedReader bufferedReader = new BufferedReader(
                     new InputStreamReader(unzip.getInputStream()));
@@ -172,8 +178,10 @@ private void unzipDocroot() {
             }
             unzip.waitFor();
             Log.i(LOG_TAG, "unzip docroot end");
+            printLog("unzip docroot end");
         } catch (Exception e) {
             Log.e(LOG_TAG, "error: " + e.getCause());
+            printLog("error: " + e.getCause());
             e.printStackTrace();
         }
     }
@@ -241,7 +249,7 @@ public void run() {
                             input.close();
                         }
                         Log.e(THREADLOGTAG, res);
-                        Log.i(THREADLOGTAG, "end");
+                        printLog(res);
                     } catch (IOException e) {
                         e.printStackTrace();
                     }