diff options
Diffstat (limited to 'Software/Android_Studio/Tango.SharedUI/src/main/java')
3 files changed, 28 insertions, 41 deletions
diff --git a/Software/Android_Studio/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/TangoApplication.java b/Software/Android_Studio/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/TangoApplication.java index a2a48ae43..aacb35350 100644 --- a/Software/Android_Studio/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/TangoApplication.java +++ b/Software/Android_Studio/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/TangoApplication.java @@ -4,17 +4,12 @@ import android.annotation.SuppressLint; import android.app.Application; import android.content.Context; -import com.elvishew.xlog.LogConfiguration; -import com.elvishew.xlog.LogLevel; -import com.elvishew.xlog.XLog; -import com.elvishew.xlog.printer.AndroidPrinter; -import com.elvishew.xlog.printer.Printer; -import com.elvishew.xlog.printer.file.FilePrinter; -import com.elvishew.xlog.printer.file.backup.FileSizeBackupStrategy; -import com.elvishew.xlog.printer.file.naming.DateFileNameGenerator; import com.google.protobuf.GeneratedMessageV3; import com.twine.tango.core.ContextHelper; import com.twine.tango.dal.TangoDB; +import com.twine.tango.logging.FileLogger; +import com.twine.tango.logging.LogCatLogger; +import com.twine.tango.logging.LogManager; import com.twine.tango.pmr.MessageFactory; import com.twine.tango.web.WebApiFactory; @@ -42,27 +37,16 @@ public class TangoApplication extends Application JodaTimeAndroid.init(context); ContextHelper.init(context); + + LogManager logManager = LogManager.getDefault(); - LogConfiguration config = new LogConfiguration.Builder() - .logLevel(LogLevel.ALL) - .tag("Tango") - .t() - .st(1) -// .b() - .addObjectFormatter(GeneratedMessageV3.class, msg -> msg.toString()).build(); - - File sdcard = context.getFilesDir(); - File dir = new File(sdcard.getAbsolutePath() + "/logs"); - boolean b = dir.mkdirs(); - - Printer androidPrinter = new AndroidPrinter(); - Printer filePrinter = new FilePrinter.Builder(dir.getPath()) - .fileNameGenerator(new DateFileNameGenerator()) - .backupStrategy(new FileSizeBackupStrategy(1024 * 1024)) - .build(); + LogCatLogger logCatLogger = new LogCatLogger(); + FileLogger fileLogger = new FileLogger(context); + + logManager.registerLogger(logCatLogger); + logManager.registerLogger(fileLogger); - XLog.init(config, androidPrinter, filePrinter); - XLog.i("Logger Initialized. logs will be saved to: " + dir.getAbsolutePath()); + logManager.log("Logger Initialized. logs will be saved to: " + fileLogger.getFileName()); TangoDB.init(); @@ -72,7 +56,7 @@ public class TangoApplication extends Application Thread.setDefaultUncaughtExceptionHandler((thread, throwable) -> { throwable.printStackTrace(); - XLog.e(throwable); + logManager.log(throwable); System.exit(1); //TODO: What to do on application crash ? }); diff --git a/Software/Android_Studio/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/mvvm/ViewModelBase.java b/Software/Android_Studio/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/mvvm/ViewModelBase.java index 60886b7e7..1d2e5ad86 100644 --- a/Software/Android_Studio/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/mvvm/ViewModelBase.java +++ b/Software/Android_Studio/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/mvvm/ViewModelBase.java @@ -2,6 +2,8 @@ package com.twine.tango.sharedui.mvvm; import android.util.Log; +import com.twine.tango.core.ExtendedObject; + import java.lang.reflect.Field; @@ -10,7 +12,8 @@ import java.lang.reflect.Field; * * @param <T> the type parameter */ -public abstract class ViewModelBase<T extends IView> { +public abstract class ViewModelBase<T extends IView> extends ExtendedObject +{ /** * The View. diff --git a/Software/Android_Studio/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/navigation/AndroidNavigationProvider.java b/Software/Android_Studio/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/navigation/AndroidNavigationProvider.java index dcdf4160f..545793a5d 100644 --- a/Software/Android_Studio/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/navigation/AndroidNavigationProvider.java +++ b/Software/Android_Studio/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/navigation/AndroidNavigationProvider.java @@ -4,7 +4,7 @@ import android.app.FragmentManager; import android.app.FragmentTransaction; import android.support.v7.app.AppCompatActivity; -import com.elvishew.xlog.XLog; +import com.twine.tango.core.ExtendedObject; import com.twine.tango.core.IAction1; import com.twine.tango.sharedui.R; import com.twine.tango.sharedui.containers.FragmentBase; @@ -12,7 +12,7 @@ import com.twine.tango.sharedui.containers.FragmentBase; /** * Represents an android navigation provider. */ -public class AndroidNavigationProvider implements INavigationProvider +public class AndroidNavigationProvider extends ExtendedObject implements INavigationProvider { private AppCompatActivity activity; private FragmentBase currentFragment; @@ -51,7 +51,7 @@ public class AndroidNavigationProvider implements INavigationProvider { if (activity == null) { - XLog.e(new NullPointerException("No navigation activity registered.")); + logManager.log(new NullPointerException("No navigation activity registered.")); return; } @@ -70,7 +70,7 @@ public class AndroidNavigationProvider implements INavigationProvider fragment = (FragmentBase) Class.forName(fragmentName).newInstance(); } catch (Exception ex) { - XLog.e("Fragment " + fragmentName + " not found.", ex); + logManager.log(ex,"Fragment " + fragmentName + " not found."); return; } } @@ -106,14 +106,14 @@ public class AndroidNavigationProvider implements INavigationProvider fragmentTransaction.replace(fragment_container, fragment).addToBackStack(fragmentName); fragmentTransaction.commit(); - try - { - //noinspection ConstantConditions - //fragment.getView().setFocusableInTouchMode(true); - } catch (Exception ex) - { - XLog.e(ex); - } +// try +// { +// //noinspection ConstantConditions +// //fragment.getView().setFocusableInTouchMode(true); +// } catch (Exception ex) +// { +// logManager.log(ex); +// } currentFragment = fragment; } |