add search function

Author: zeerd

AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0'?>
-<manifest xmlns:a='http://schemas.android.com/apk/res/android' package='com.zeerd.dltviewer' a:versionCode='0' a:versionName='0.0.4'>
+<manifest xmlns:a='http://schemas.android.com/apk/res/android' package='com.zeerd.dltviewer' a:versionCode='5' a:versionName='0.0.5'>
     <uses-permission a:name='android.permission.INTERNET'/>
     <uses-permission a:name='android.permission.WRITE_EXTERNAL_STORAGE'/>
     <uses-permission a:name="android.permission.ACCESS_WIFI_STATE" />
@@ -22,6 +22,12 @@
                 a:name="android.support.PARENT_ACTIVITY"
                 a:value=".MainActivity" />
         </activity>
+        <activity a:name=".SearchActivity"
+                  a:parentActivityName=".MainActivity" >
+            <meta-data
+                a:name="android.support.PARENT_ACTIVITY"
+                a:value=".MainActivity" />
+        </activity>
         <activity a:name=".HelpActivity"
                   a:parentActivityName=".MainActivity" >
             <meta-data

README.md

@@ -44,3 +44,9 @@ So I use some special way to build this project.
 [Android table column width 50 / 50](https://stackoverflow.com/questions/22383932/android-table-column-width-50-50)
 
 [How can I read a text file in Android?](https://stackoverflow.com/questions/12421814/how-can-i-read-a-text-file-in-android)
+
+[Quick and dirty demonstration of a large, two-way scrollable data table/spreadsheet.](https://github.com/klarson2/android-table-test)
+
+[How to run the same asynctask more than once?](https://stackoverflow.com/questions/6879584/how-to-run-the-same-asynctask-more-than-once)
+
+[Show a context menu for long-clicks in an Android ListView](https://www.mikeplate.com/2010/01/21/show-a-context-menu-for-long-clicks-in-an-android-listview/)

build.sh

@@ -19,6 +19,7 @@ mv src/com/zeerd/dltviewer/R.java java/src/com/zeerd/dltviewer/R.java
 
 echo "Compiling..."
 install -d obj
+javac -d obj -classpath java/src -bootclasspath $PLATFORM -source 1.7 -target 1.7 java/src/com/zeerd/dltviewer/SearchActivity.java
 javac -d obj -classpath java/src -bootclasspath $PLATFORM -source 1.7 -target 1.7 java/src/com/zeerd/dltviewer/SettingActivity.java
 javac -d obj -classpath java/src -bootclasspath $PLATFORM -source 1.7 -target 1.7 java/src/com/zeerd/dltviewer/HelpActivity.java
 javac -d obj -classpath java/src -bootclasspath $PLATFORM -source 1.7 -target 1.7 java/src/com/zeerd/dltviewer/ControlActivity.java

java/src/com/zeerd/dltviewer/LogRow.java

@@ -16,9 +16,18 @@
 
 public class LogRow {
 
-    private String[] column = new String[6];
+    private String[] column = new String[7];
+
+    public static final int ROW_INDEX = 0;
+    public static final int ROW_TIMESTAMP = 1;
+    public static final int ROW_ECUID = 2;
+    public static final int ROW_APID = 3;
+    public static final int ROW_CTID = 4;
+    public static final int ROW_SUBTYPE = 5;
+    public static final int ROW_PAYLOAD = 6;
 
     public LogRow(
+                String index,
                 String timestamp,
                 String ecuid,
                 String apid,
@@ -27,12 +36,13 @@ public LogRow(
                 String payload) {
 
         super();
-        this.column[0] = timestamp;
-        this.column[1] = ecuid;
-        this.column[2] = apid;
-        this.column[3] = ctid;
-        this.column[4] = subtype;
-        this.column[5] = payload;
+        this.column[ROW_INDEX] = index;
+        this.column[ROW_TIMESTAMP] = timestamp;
+        this.column[ROW_ECUID] = ecuid;
+        this.column[ROW_APID] = apid;
+        this.column[ROW_CTID] = ctid;
+        this.column[ROW_SUBTYPE] = subtype;
+        this.column[ROW_PAYLOAD] = payload;
     }
 
     public String getColumn(int index) {
@@ -41,4 +51,8 @@ public String getColumn(int index) {
     public void setColumn(int index, String str) {
         this.column[index] = str;
     }
+
+    public int getIndex() {
+        return Integer.parseInt(this.column[ROW_INDEX]);
+    }
 }

java/src/com/zeerd/dltviewer/LogTableAdapter.java

@@ -32,9 +32,27 @@ public LogTableAdapter(Activity activity, List<LogRow> rows) {
         this.rows = rows;
     }
 
+    public LogTableAdapter(Activity activity) {
+        super();
+        this.activity = activity;
+    }
+
+    public void setData(List<LogRow> rows) {
+        this.rows = rows;
+    }
+
+    public List<LogRow> getData() {
+        return this.rows;
+    }
+
     @Override
     public int getCount() {
-        return rows.size();
+        if(rows == null) {
+            return 0;
+        }
+        else {
+            return rows.size();
+        }
     }
 
     @Override
@@ -55,27 +73,30 @@ public View getView(int position, View convertView, ViewGroup parent) {
             LayoutInflater inflater = activity.getLayoutInflater();
             convertView = inflater.inflate(R.layout.log_row, null);
         }
+        TextView col0 = (TextView) convertView.findViewById(R.id.log_index);
         TextView col1 = (TextView) convertView.findViewById(R.id.log_timestamp);
         TextView col2 = (TextView) convertView.findViewById(R.id.log_ecuid);
         TextView col3 = (TextView) convertView.findViewById(R.id.log_apid);
         TextView col4 = (TextView) convertView.findViewById(R.id.log_ctid);
         TextView col5 = (TextView) convertView.findViewById(R.id.log_subtype);
         TextView col6 = (TextView) convertView.findViewById(R.id.log_payload);
 
-        String timestamp = rows.get(position).getColumn(0);
-        String subtype = rows.get(position).getColumn(4);
+        String timestamp = rows.get(position).getColumn(LogRow.ROW_TIMESTAMP);
+        String subtype = rows.get(position).getColumn(LogRow.ROW_SUBTYPE);
 
         int len = timestamp.length();
         String new_timestamp = timestamp.substring(0, len-4) + "." + timestamp.substring(len-4, len);
-        Log.i(TAG, timestamp+" vs "+new_timestamp);
+        // Log.i(TAG, timestamp+" vs "+new_timestamp);
+        col0.setText(rows.get(position).getColumn(LogRow.ROW_INDEX));
         col1.setText(new_timestamp);
-        col2.setText(rows.get(position).getColumn(1));
-        col3.setText(rows.get(position).getColumn(2));
-        col4.setText(rows.get(position).getColumn(3));
+        col2.setText(rows.get(position).getColumn(LogRow.ROW_ECUID));
+        col3.setText(rows.get(position).getColumn(LogRow.ROW_APID));
+        col4.setText(rows.get(position).getColumn(LogRow.ROW_CTID));
         col5.setText(subtype);
-        col6.setText(rows.get(position).getColumn(5));
+        col6.setText(rows.get(position).getColumn(LogRow.ROW_PAYLOAD));
 
         if(subtype.equals("error") || subtype.equals("fatal")) {
+            col0.setBackgroundResource(R.drawable.border_red);
             col1.setBackgroundResource(R.drawable.border_red);
             col2.setBackgroundResource(R.drawable.border_red);
             col3.setBackgroundResource(R.drawable.border_red);
@@ -84,6 +105,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
             col6.setBackgroundResource(R.drawable.border_red);
         }
         else if(subtype.equals("warn")) {
+            col0.setBackgroundResource(R.drawable.border_yellow);
             col1.setBackgroundResource(R.drawable.border_yellow);
             col2.setBackgroundResource(R.drawable.border_yellow);
             col3.setBackgroundResource(R.drawable.border_yellow);
@@ -92,6 +114,7 @@ else if(subtype.equals("warn")) {
             col6.setBackgroundResource(R.drawable.border_yellow);
         }
         else {
+            col0.setBackgroundResource(R.drawable.border);
             col1.setBackgroundResource(R.drawable.border);
             col2.setBackgroundResource(R.drawable.border);
             col3.setBackgroundResource(R.drawable.border);

java/src/com/zeerd/dltviewer/MainActivity.java

@@ -64,9 +64,11 @@ public class MainActivity extends Activity {
     private EditText ip;
     private String dltFile;
     private ListView listviewLogTable;
-    private List<LogRow> logsList;
     private LogTableAdapter adapterLogs;
 
+    public static List<LogRow> logsList;
+    public static int search_index;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -116,6 +118,17 @@ public void handleMessage(Message msg) {
         logsList = new ArrayList<LogRow>();
         adapterLogs = new LogTableAdapter(this, logsList);
         listviewLogTable.setAdapter(adapterLogs);
+
+        search_index = -1;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if(search_index > 0 && search_index < adapterLogs.getCount()) {
+            listviewLogTable.setSelection(search_index - 1);
+            checkBox.setChecked(false);
+        }
     }
 
     private CompoundButton.OnCheckedChangeListener connListener =
@@ -195,7 +208,14 @@ else if(type == 1) {
 
                 if(!splited[7].equals("control")) {
 
-                    logsList.add(new LogRow(splited[2], splited[4], splited[5], splited[6], splited[8], string));
+                    logsList.add(new LogRow(
+                                        ""+(logsList.size()+1),
+                                        splited[2],
+                                        splited[4],
+                                        splited[5],
+                                        splited[6],
+                                        splited[8],
+                                        string));
                     adapterLogs.notifyDataSetChanged();
 
                     if(checkBox.isChecked()) {
@@ -256,6 +276,11 @@ public boolean onMenuItemClick(MenuItem item) {
                         startActivity(intent);
                     }
                     return true;
+                    case R.id.search: {
+                        Intent intent = new Intent(getBaseContext(), SearchActivity.class);
+                        startActivity(intent);
+                    }
+                    return true;
                     case R.id.help: {
                         Intent intent = new Intent(getBaseContext(), HelpActivity.class);
                         startActivity(intent);
@@ -317,12 +342,12 @@ public void writeToFile()
 
             for (int i = 0; i < logsList.size(); i++) {
                 LogRow row = logsList.get(i);
-                myOutWriter.append(row.getColumn(0) + " ");
-                myOutWriter.append(row.getColumn(1) + " ");
-                myOutWriter.append(row.getColumn(2) + " ");
-                myOutWriter.append(row.getColumn(3) + " ");
-                myOutWriter.append(row.getColumn(4) + " ");
-                myOutWriter.append(row.getColumn(5) + "\n");
+                myOutWriter.append(row.getColumn(LogRow.ROW_TIMESTAMP) + " ");
+                myOutWriter.append(row.getColumn(LogRow.ROW_ECUID) + " ");
+                myOutWriter.append(row.getColumn(LogRow.ROW_APID) + " ");
+                myOutWriter.append(row.getColumn(LogRow.ROW_CTID) + " ");
+                myOutWriter.append(row.getColumn(LogRow.ROW_SUBTYPE) + " ");
+                myOutWriter.append(row.getColumn(LogRow.ROW_PAYLOAD) + "\n");
             }
 
             myOutWriter.close();