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 = []
}
}
+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'
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);
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){
}
}
+
public static void sendLogs (){
AsyncTask<Void, Integer, Boolean> mailTask = new AsyncTask<Void, Integer, Boolean>() {
@Override
protected Boolean doInBackground(Void... voids) {
- // zip log.txt to log.zip
String[] s = new String[1];
s[0] = logFile;
gLogger.debug("zipLog - " + zfile);
}
-
-
-
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";
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);
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());
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;
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() {