diff options
Diffstat (limited to 'Software/Android_Studio')
| -rw-r--r-- | Software/Android_Studio/ColorCapture/app/build.gradle | 4 | ||||
| -rw-r--r-- | Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/capture/CaptureFragmentVM.java | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Software/Android_Studio/ColorCapture/app/build.gradle b/Software/Android_Studio/ColorCapture/app/build.gradle index 0ca125d7f..b74f3a18c 100644 --- a/Software/Android_Studio/ColorCapture/app/build.gradle +++ b/Software/Android_Studio/ColorCapture/app/build.gradle @@ -6,7 +6,7 @@ android { applicationId "com.twine.colorcapture" minSdkVersion 22 targetSdkVersion 27 - versionCode 1 + versionCode 2 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" externalNativeBuild { @@ -23,7 +23,7 @@ android { buildTypes { debug { - buildConfigField "String", "WEB_SERVICE_ADDRESS", "\"http://10.100.102.88:45455/api/\"" + buildConfigField "String", "WEB_SERVICE_ADDRESS", "\"http://192.168.1.229:45455/api/\"" buildConfigField "String", "WEB_SERVICE_APP_ID", "\"Tdf793i4ughsiduf8749509237885ehgfdlkghlT\"" } diff --git a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/capture/CaptureFragmentVM.java b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/capture/CaptureFragmentVM.java index 263aad444..1d92323ea 100644 --- a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/capture/CaptureFragmentVM.java +++ b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/capture/CaptureFragmentVM.java @@ -249,12 +249,12 @@ public class CaptureFragmentVM extends ViewModelBase<ICaptureFragment> implement { notificationProvider.showDialog(new WelcomeDialog(), (vm) -> { + SettingsManager.getInstance().setWelcomeScreenShown(true); + SettingsManager.save(); + isCardDetected.set(false); view.startCamera(); }); - - SettingsManager.getInstance().setWelcomeScreenShown(true); - SettingsManager.save(); } else { |