From 6f89224690e8d04727c9ee48bdeb04e5cb905d54 Mon Sep 17 00:00:00 2001
From: Peng Li <seudut@gmail.com>
Date: Sat, 26 May 2018 15:07:40 +0800
Subject: [PATCH 1/1] Add git hash and version name

---
 app/build.gradle                                         |  8 +++++++-
 app/src/main/java/ai/suanzi/rtmpclient/LogUtil.java      | 14 ++++++--------
 app/src/main/java/ai/suanzi/rtmpclient/MainActivity.java |  8 --------
 3 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 618570c..cbded9d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,8 +7,10 @@ android {
         minSdkVersion 17
         targetSdkVersion 17
         versionCode 1
-        versionName "1.0"
+        versionName "v0.3.2"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        buildConfigField "String", "GIT_REVISION", "\"${getGitVersion()}\""
+
 
         sourceSets.main {
             jni.srcDirs = []
@@ -24,6 +26,10 @@ android {
     }
 }
 
+def getGitVersion() {
+    return 'git rev-parse --short HEAD'.execute().text.trim()
+}
+
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'com.android.support:appcompat-v7:27.1.1'
diff --git a/app/src/main/java/ai/suanzi/rtmpclient/LogUtil.java b/app/src/main/java/ai/suanzi/rtmpclient/LogUtil.java
index 9018d9d..a547c9c 100644
--- a/app/src/main/java/ai/suanzi/rtmpclient/LogUtil.java
+++ b/app/src/main/java/ai/suanzi/rtmpclient/LogUtil.java
@@ -44,7 +44,6 @@ public class LogUtil {
     public static void config(File dir) {
         try {
             final LogConfigurator logConfigurator = new LogConfigurator();
-            //String fname = getExternalFilesDir(null) + File.separator + "log.txt";
             DIR = dir;
             logFile = dir + File.separator + FILE_NAME;
             logConfigurator.setFileName(logFile);
@@ -54,7 +53,9 @@ public class LogUtil {
             logConfigurator.configure();
             gLogger = Logger.getLogger("LogUtil");
             gLogger.error("#######################################");
-            gLogger.error("RtmpClient by suanzi.ai");
+            gLogger.error("RtmpClient for Android by suanzi.ai  ");
+            gLogger.error("Git Revision: " + BuildConfig.GIT_REVISION);
+            gLogger.error("Version : " + BuildConfig.VERSION_NAME);
             gLogger.debug("Log file is located at: " + logFile);
 
         } catch (Exception e){
@@ -63,6 +64,7 @@ public class LogUtil {
         }
     }
 
+
     public static void sendLogs (){
 
         AsyncTask<Void, Integer, Boolean> mailTask = new AsyncTask<Void, Integer, Boolean>() {
@@ -73,7 +75,6 @@ public class LogUtil {
             @Override
             protected Boolean doInBackground(Void... voids) {
 
-                // zip log.txt to log.zip
                 String[] s = new String[1];
                 s[0] = logFile;
                 gLogger.debug("zipLog - " + zfile);
@@ -103,9 +104,6 @@ public class LogUtil {
 
     }
 
-
-
-
     private static final String SMTP_SERVER = "smtp.exmail.qq.com";
     private static final String USER = "support@suanzi.ai";
     private static final String SENT_MAIL = "support@suanzi.ai";
@@ -115,7 +113,7 @@ public class LogUtil {
     private static boolean sendMail(String attachment){
 
         String account = UserInfo.user;
-        String macAddr = UserInfo.macAddr;
+        String subject = UserInfo.macAddr + " - " + BuildConfig.VERSION_NAME + " - " + BuildConfig.GIT_REVISION;
         StrictMode.ThreadPolicy policy = new StrictMode.ThreadPolicy.Builder().permitAll().build();
         StrictMode.setThreadPolicy(policy);
 
@@ -135,7 +133,7 @@ public class LogUtil {
         try {
             message.setFrom(new InternetAddress(SENT_MAIL, account, "UTF-8"));
             message.setRecipient(MimeMessage.RecipientType.TO, new InternetAddress(RECV_MAIL, "support", "UTF-8"));
-            message.setSubject(macAddr, "UTF-8");
+            message.setSubject(subject, "UTF-8");
             //message.setContent("hahaha", "text/html;charset=UTF-8");
             message.setSentDate(new Date());
 
diff --git a/app/src/main/java/ai/suanzi/rtmpclient/MainActivity.java b/app/src/main/java/ai/suanzi/rtmpclient/MainActivity.java
index c1beb4f..4dcbb6d 100644
--- a/app/src/main/java/ai/suanzi/rtmpclient/MainActivity.java
+++ b/app/src/main/java/ai/suanzi/rtmpclient/MainActivity.java
@@ -36,10 +36,7 @@ import android.view.ViewGroup;
 
 public class MainActivity extends AppCompatActivity implements MyService.MyServiceEventListener, CameraView.Callback {
 
-    //private static final String TAG = "MainActivity";
     private Logger gLogger;
-
-    //private String mMacAddr = "";
     private NetworkMonitor networkMonitor;
     private UsbMonitor mUsbMonitor;
     private ServiceHealthMonitor mServiceHealthMonitor;
@@ -52,11 +49,6 @@ public class MainActivity extends AppCompatActivity implements MyService.MyServi
     private CameraView mCameraView;
 
     private void init(){
-        //UserInfo.setConfigPath(getExternalFilesDir(null) + File.separator + "config");
-        //UserInfo.readConfig(getExternalFilesDir(null) + File.separator + "config", getMacAddr());
-
-
-        //this.mMacAddr = getMacAddr();
 
         mIntent = new Intent(this, MyService.class);
         mUsbMonitor = new UsbMonitor(new UsbMonitor.UsbListener() {
-- 
2.11.0