verdnatura/vn-delivery
verdnatura
/
vn-delivery
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

versión estable

This commit is contained in:
quique 2019-10-23 09:05:51 +02:00
parent 7aa903f36f
commit 35b6db9b12
21 changed files with 141 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.gradle/5.1.1/executionHistory/executionHistory.bin
View File

Binary file not shown.

BIN
.gradle/5.1.1/executionHistory/executionHistory.lock
View File

Binary file not shown.

BIN
.gradle/5.1.1/fileHashes/fileHashes.bin
View File

Binary file not shown.

BIN
.gradle/5.1.1/fileHashes/fileHashes.lock
View File

Binary file not shown.

BIN
.gradle/5.1.1/javaCompile/classAnalysis.bin
View File

Binary file not shown.

BIN
.gradle/5.1.1/javaCompile/javaCompile.lock
View File

Binary file not shown.

BIN
.gradle/buildOutputCleanup/buildOutputCleanup.lock
View File

Binary file not shown.

BIN
.idea/caches/build_file_checksums.ser
View File

Binary file not shown.

BIN
.idea/caches/gradle_models.ser
View File

Binary file not shown.

215
.idea/workspace.xml
View File

@ -31,13 +31,15 @@
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/release/output.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/release/output.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/release/vndelivery.apk" beforeDir="false" afterPath="$PROJECT_DIR$/app/release/vndelivery.apk" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/MainActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/MainActivity.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/release/vndelivery.apk" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/SignActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/SignActivity.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/ApiUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/ApiUtils.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/values/colors.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values/colors.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build/intermediates/lint-cache/maven.google/com/google/firebase/group-index.xml" beforeDir="false" afterPath="$PROJECT_DIR$/build/intermediates/lint-cache/maven.google/com/google/firebase/group-index.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build/intermediates/lint-cache/maven.google/master-index.xml" beforeDir="false" afterPath="$PROJECT_DIR$/build/intermediates/lint-cache/maven.google/master-index.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/LocalStorage.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/LocalStorage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/mipmap-hdpi/ic_launcher_round.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/mipmap-mdpi/ic_launcher_round.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png" beforeDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
@ -60,19 +62,10 @@
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/MainActivity.java">
<entry file="file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/ApiUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="239">
<caret line="388" column="108" selection-start-line="388" selection-start-column="108" selection-end-line="388" selection-end-column="108" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/res/values/colors.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="286">
<caret line="13" selection-start-line="13" selection-end-line="13" />
<state relative-caret-position="176">
<caret line="8" column="3" selection-start-line="8" selection-start-column="3" selection-end-line="8" selection-end-column="3" />
</state>
</provider>
</entry>
@ -80,8 +73,18 @@
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/build.gradle">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264">
<caret line="12" column="5" selection-start-line="12" selection-start-column="5" selection-end-line="12" selection-end-column="5" />
<state relative-caret-position="198">
<caret line="9" column="25" selection-start-line="9" selection-start-column="25" selection-end-line="9" selection-end-column="25" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
<provider editor-type-id="android-manifest" />
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154">
<caret line="7" column="80" selection-start-line="7" selection-start-column="80" selection-end-line="7" selection-end-column="80" />
</state>
</provider>
</entry>
@ -110,6 +113,8 @@
<find>heightCellRoute</find>
<find>vndelivery</find>
<find>app.verdnatura.es/bin/</find>
<find>result</find>
<find>saveLocal</find>
</findStrings>
<dirStrings>
<dir>$PROJECT_DIR$</dir>
@ -132,7 +137,6 @@
<option value="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/Tickets.java" />
<option value="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/ADAPTERS/RutaAdapter.java" />
<option value="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/LoadersActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/SignActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_sign.xml" />
<option value="$PROJECT_DIR$/build.gradle" />
<option value="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/INTERFACES/RestClient.java" />
@ -143,14 +147,17 @@
<option value="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/ADAPTERS/CheckAdapter.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/row_check.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/ApiUtils.java" />
<option value="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/MainActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/res/values/colors.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/SignActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/MODELS/SignDataUpload.java" />
<option value="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/LocalStorage.java" />
<option value="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/ApiUtils.java" />
<option value="$PROJECT_DIR$/app/build.gradle" />
</list>
</option>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<component name="ProjectFrameBounds">
<option name="y" value="23" />
<option name="width" value="1920" />
<option name="height" value="1057" />
@ -163,6 +170,8 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="PackagesPane" />
<pane id="ProjectPane">
<subPane>
<expand>
@ -188,10 +197,6 @@
<pane id="AndroidView">
<subPane>
<expand>
<path>
<item name="vn-delivery" type="1abcf292:AndroidViewProjectNode" />
<item name="app" type="feadf853:AndroidModuleNode" />
</path>
<path>
<item name="vn-delivery" type="1abcf292:AndroidViewProjectNode" />
<item name="Gradle Scripts" type="ae0cef3a:AndroidBuildScriptsGroupNode" />
@ -200,8 +205,6 @@
<select />
</subPane>
</pane>
<pane id="Scope" />
<pane id="PackagesPane" />
</panes>
</component>
<component name="PropertiesComponent">
@ -353,13 +356,13 @@
<window_info anchor="bottom" id="Logcat" order="0" sideWeight="0.49946466" weight="0.58679444" />
<window_info anchor="bottom" id="Version Control" order="1" />
<window_info anchor="bottom" id="Terminal" order="2" sideWeight="0.57916665" weight="0.31921488" />
<window_info anchor="bottom" id="Event Log" order="3" sideWeight="0.19375" side_tool="true" visible="true" weight="0.18621399" />
<window_info anchor="bottom" id="Build" order="4" sideWeight="0.80625" visible="true" weight="0.18621399" />
<window_info anchor="bottom" id="Event Log" order="3" sideWeight="0.19791667" side_tool="true" visible="true" weight="0.18621399" />
<window_info anchor="bottom" id="Build" order="4" sideWeight="0.8020833" visible="true" weight="0.18621399" />
<window_info anchor="bottom" id="Android Profiler" order="5" />
<window_info anchor="bottom" id="Message" order="6" />
<window_info anchor="bottom" id="Find" order="7" />
<window_info anchor="bottom" id="Run" order="8" />
<window_info anchor="bottom" id="Debug" order="9" sideWeight="0.4953125" weight="0.14917696" />
<window_info anchor="bottom" id="Debug" order="9" sideWeight="0.49479166" weight="0.20884773" />
<window_info anchor="bottom" id="Cvs" order="10" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="11" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="12" weight="0.3290735" />
@ -376,13 +379,31 @@
<window_info anchor="right" id="StringPreview" order="9" />
</layout>
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<breakpoints>
<line-breakpoint type="java-line">
<url>file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/SignActivity.java</url>
<line>178</line>
<properties />
<option name="timeStamp" value="1" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/SignActivity.java</url>
<line>186</line>
<properties />
<option name="timeStamp" value="3" />
</line-breakpoint>
<line-breakpoint type="java-line">
<url>file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/Tickets.java</url>
<line>602</line>
<properties />
<option name="timeStamp" value="4" />
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
<provider editor-type-id="android-manifest" />
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1" />
</provider>
</entry>
<entry file="jar://$PROJECT_DIR$/../../../gradle-4.10.3/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.3.0/76f3c69879d3e01c082f49d8661c5590838148e1/retrofit-2.3.0-sources.jar!/retrofit2/Response.java" />
<entry file="file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/ADAPTERS/RutaAdapter.java">
<provider selected="true" editor-type-id="text-editor">
@ -401,41 +422,27 @@
<entry file="file://$PROJECT_DIR$/settings.gradle">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/SignActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2310">
<caret line="140" column="45" selection-start-line="140" selection-start-column="45" selection-end-line="140" selection-end-column="45" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_sign.xml">
<provider editor-type-id="android-designer2" />
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2684">
<caret line="122" column="53" selection-start-line="122" selection-start-column="53" selection-end-line="122" selection-end-column="53" />
</state>
</provider>
<provider editor-type-id="android-designer2" />
</entry>
<entry file="file://$PROJECT_DIR$/app/google-services.json">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/LocalStorage.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="308">
<caret line="28" selection-start-line="28" selection-end-line="28" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/drawable/update.png">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_info.xml">
<provider editor-type-id="android-designer2" />
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="308">
<caret line="14" column="22" lean-forward="true" selection-end-line="143" selection-end-column="46" />
</state>
</provider>
<provider editor-type-id="android-designer2" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/ADAPTERS/PendingTickets.java">
<provider selected="true" editor-type-id="text-editor">
@ -484,13 +491,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/Tickets.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="381">
<caret line="158" column="8" selection-start-line="158" selection-start-column="8" selection-end-line="160" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/values/strings.xml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
@ -512,12 +512,12 @@
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_cargar_bultos.xml">
<provider editor-type-id="android-designer2" />
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="9" column="4" selection-start-line="9" selection-start-column="4" selection-end-line="9" selection-end-column="4" />
</state>
</provider>
<provider editor-type-id="android-designer2" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/ADAPTERS/CheckAdapter.java">
<provider selected="true" editor-type-id="text-editor">
@ -543,13 +543,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/INTERFACES/RestClient.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="257">
<caret line="23" column="6" selection-start-line="23" selection-start-column="6" selection-end-line="23" selection-end-column="6" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/CargarBultosActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="132">
@ -598,12 +591,12 @@
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml">
<provider editor-type-id="android-designer2" />
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1364">
<caret line="62" column="43" selection-start-line="62" selection-start-column="43" selection-end-line="62" selection-end-column="43" />
</state>
</provider>
<provider editor-type-id="android-designer2" />
</entry>
<entry file="file://$PROJECT_DIR$/build.gradle">
<provider selected="true" editor-type-id="text-editor">
@ -613,27 +606,20 @@
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/row_route.xml">
<provider editor-type-id="android-designer2" />
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220">
<caret line="10" column="36" selection-start-line="10" selection-start-column="31" selection-end-line="10" selection-end-column="36" />
</state>
</provider>
<provider editor-type-id="android-designer2" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/row_check.xml">
<provider editor-type-id="android-designer2" />
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1100">
<caret line="50" selection-start-line="50" selection-end-line="50" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/ApiUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154">
<caret line="7" column="6" selection-start-line="7" selection-start-column="6" selection-end-line="7" selection-end-column="6" />
</state>
</provider>
<provider editor-type-id="android-designer2" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/values/colors.xml">
<provider selected="true" editor-type-id="text-editor">
@ -642,17 +628,82 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/INTERFACES/RestClient.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="110">
<caret line="28" column="30" selection-start-line="28" selection-start-column="21" selection-end-line="28" selection-end-column="30" />
</state>
</provider>
</entry>
<entry file="jar://$PROJECT_DIR$/../../../gradle-4.10.3/caches/transforms-2/files-2.1/179da864fcff554d1fbbe815c6f05fcd/jars/classes.jar!/android/support/v7/app/AppCompatActivity.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="242">
<caret line="289" selection-start-line="289" selection-end-line="289" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/MODELS/SignDataUpload.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="11" column="33" selection-start-line="11" selection-start-column="33" selection-end-line="11" selection-end-column="33" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/LocalStorage.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="462">
<caret line="256" column="24" lean-forward="true" selection-start-line="256" selection-start-column="24" selection-end-line="256" selection-end-column="24" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/Tickets.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="800">
<caret line="122" selection-start-line="122" selection-end-line="122" />
<folding>
<element signature="e#3193#3239#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/SignActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="146">
<caret line="214" column="25" selection-start-line="214" selection-start-column="25" selection-end-line="214" selection-end-column="25" />
<folding>
<element signature="e#5743#6278#0" expanded="true" />
<element signature="e#6277#6278#0" expanded="true" />
<element signature="e#8375#8421#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/MainActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="239">
<state relative-caret-position="559">
<caret line="388" column="108" selection-start-line="388" selection-start-column="108" selection-end-line="388" selection-end-column="108" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
<provider editor-type-id="android-manifest" />
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154">
<caret line="7" column="80" selection-start-line="7" selection-start-column="80" selection-end-line="7" selection-end-column="80" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/ApiUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="8" column="3" selection-start-line="8" selection-start-column="3" selection-end-line="8" selection-end-column="3" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/build.gradle">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264">
<caret line="12" column="5" selection-start-line="12" selection-start-column="5" selection-end-line="12" selection-end-column="5" />
<state relative-caret-position="198">
<caret line="9" column="25" selection-start-line="9" selection-start-column="25" selection-end-line="9" selection-end-column="25" />
</state>
</provider>
</entry>

4
app/build.gradle
View File

@ -6,8 +6,8 @@ android {
applicationId "verdnatura.es.repartoverdnatura"
minSdkVersion 19
targetSdkVersion 28
versionCode 7
versionName "1.7"
versionCode 8
versionName "1.8"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
multiDexEnabled true
}

2
app/release/output.json
View File

@ -1 +1 @@
[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":7,"versionName":"1.7","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":8,"versionName":"1.8","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]

BIN
app/release/vndelivery.apk → app/release/vn-delivery.apk
View File

Binary file not shown.

6
app/src/main/java/verdnatura/es/repartoverdnatura/SignActivity.java
View File

@ -211,10 +211,10 @@ public class SignActivity extends AppCompatActivity implements LocationListener{
}
public void saveLocal(SignDataUpload data){
data.setIdClient(clientTickets.getClient());
LocalStorage.saveSign(this,data,clientTickets.getClientName(),idRuta);
data.setIdClient(clientTickets.getAddress());
LocalStorage.saveSign(this,data,clientTickets.getAddress(),idRuta);
Intent returnIntent = new Intent();
returnIntent.putExtra("idCliente",clientTickets.getClient());
returnIntent.putExtra("idCliente",clientTickets.getAddress());
setResult(Activity.RESULT_OK,returnIntent);
finish();
}

2
app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/ApiUtils.java
View File

@ -6,7 +6,7 @@ public class ApiUtils {
private ApiUtils() {}
//public static final String BASE_URL = "http://172.20.202.248:8080/";
public static final String BASE_URL = "https://app.verdnatura.es/";
public static final String BASE_URL = "https://app.verdnatura.es/";
public static RestClient getAPIService() {
return RetrofitClient.getClient(BASE_URL).create(RestClient.class);

2
app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/LocalStorage.java
View File

@ -262,7 +262,7 @@ public class LocalStorage {
int cont = 0;
ClientTickets aux = null;
for (ClientTickets c : clientesTickets){
if (c.getClientName().equals(clientName)){
if (c.getAddress().equals(clientName)){
clientesTickets.get(cont).setSigned(true);
clientesTicketsFirmados.add(clientesTickets.get(cont));
aux = c;

BIN
app/src/main/res/mipmap-hdpi/ic_launcher_round.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.8 KiB

BIN
app/src/main/res/mipmap-mdpi/ic_launcher_round.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.7 KiB

BIN
app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 6.7 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 10 KiB

BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 15 KiB