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

cargadores

This commit is contained in:
quique 2019-09-10 06:50:34 +02:00
parent 4c0f9d2a17
commit a51a53903f
14 changed files with 266 additions and 178 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/gradle_models.ser
View File

Binary file not shown.

319
.idea/workspace.xml
View File

@ -26,18 +26,13 @@
<change beforePath="$PROJECT_DIR$/.gradle/5.1.1/javaCompile/classAnalysis.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.1.1/javaCompile/classAnalysis.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.1.1/javaCompile/javaCompile.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.1.1/javaCompile/javaCompile.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/caches/gradle_models.ser" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/caches/gradle_models.ser" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/app.iml" beforeDir="false" afterPath="$PROJECT_DIR$/app/app.iml" 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/ADAPTERS/CheckAdapter.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/ADAPTERS/CheckAdapter.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/MODELS/Check.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/MODELS/Check.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_cargar_bultos.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_cargar_bultos.xml" 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/layout/row_route.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/row_route.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/row_check.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/row_check.xml" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
@ -60,60 +55,68 @@
<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/res/layout/activity_main.xml">
<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="3432">
<caret line="156" column="21" selection-start-line="156" selection-start-column="21" selection-end-line="156" selection-end-column="21" />
</state>
</provider>
<provider editor-type-id="android-designer2" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_cargar_bultos.xml">
<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>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/build.gradle">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="506">
<caret line="23" column="4" selection-start-line="23" selection-start-column="4" selection-end-line="23" selection-end-column="4" />
<state relative-caret-position="132">
<caret line="33" column="16" selection-start-line="33" selection-start-column="16" selection-end-line="33" selection-end-column="16" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/ApiUtils.java">
<entry file="file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/MODELS/Check.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="286">
<caret line="13" column="1" selection-start-line="13" selection-start-column="1" selection-end-line="13" selection-end-column="1" />
<state relative-caret-position="946">
<caret line="43" column="31" selection-start-line="43" selection-start-column="31" selection-end-line="43" selection-end-column="31" />
<folding>
<element signature="e#1000#1001#0" expanded="true" />
<element signature="e#1044#1045#0" expanded="true" />
<element signature="e#1080#1081#0" expanded="true" />
<element signature="e#1116#1117#0" expanded="true" />
<element signature="e#1148#1149#0" expanded="true" />
<element signature="e#1198#1199#0" expanded="true" />
<element signature="e#1240#1241#0" expanded="true" />
<element signature="e#1273#1274#0" expanded="true" />
<element signature="e#1302#1303#0" expanded="true" />
<element signature="e#1346#1347#0" expanded="true" />
<element signature="e#1382#1383#0" expanded="true" />
<element signature="e#1413#1414#0" expanded="true" />
<element signature="e#1440#1441#0" expanded="true" />
<element signature="e#1480#1481#0" expanded="true" />
<element signature="e#1512#1513#0" expanded="true" />
<element signature="e#1549#1550#0" expanded="true" />
<element signature="e#1582#1583#0" expanded="true" />
<element signature="e#1634#1635#0" expanded="true" />
<element signature="e#1678#1679#0" expanded="true" />
<element signature="e#1714#1715#0" expanded="true" />
<element signature="e#1746#1747#0" expanded="true" />
<element signature="e#1796#1797#0" expanded="true" />
<element signature="e#1838#1839#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/ADAPTERS/CheckAdapter.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="528">
<caret line="36" column="47" selection-start-line="36" selection-start-column="47" selection-end-line="36" selection-end-column="47" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/RetrofitClient.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="11" column="45" selection-start-line="11" selection-start-column="45" selection-end-line="11" selection-end-column="45" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/row_route.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="792">
<caret line="36" column="20" selection-start-line="36" selection-start-column="20" selection-end-line="36" selection-end-column="20" />
</state>
</provider>
<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="224">
<caret line="50" selection-start-line="50" selection-end-line="50" />
</state>
</provider>
</entry>
</file>
</leaf>
@ -163,22 +166,23 @@
<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/MainActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/row_check.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/ADAPTERS/CheckAdapter.java" />
<option value="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/INTERFACES/RestClient.java" />
<option value="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/MODELS/Check.java" />
<option value="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/CargarBultosActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" />
<option value="$PROJECT_DIR$/app/build.gradle" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/row_route.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_cargar_bultos.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/MODELS/Check.java" />
<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" />
</list>
</option>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="-64" />
<option name="y" value="23" />
<option name="width" value="1280" />
<option name="width" value="1919" />
<option name="height" value="777" />
</component>
<component name="ProjectLevelVcsManager">
@ -189,6 +193,7 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
@ -211,33 +216,10 @@
<select />
</subPane>
</pane>
<pane id="Scope" />
<pane id="PackagesPane" />
<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="app" type="feadf853:AndroidModuleNode" />
<item name="java" type="edd41e36:AndroidSourceTypeNode" />
</path>
<path>
<item name="vn-delivery" type="1abcf292:AndroidViewProjectNode" />
<item name="app" type="feadf853:AndroidModuleNode" />
<item name="java" type="edd41e36:AndroidSourceTypeNode" />
<item name="repartoverdnatura" type="cbb59c9e:AndroidPsiDirectoryNode" />
</path>
<path>
<item name="vn-delivery" type="1abcf292:AndroidViewProjectNode" />
<item name="app" type="feadf853:AndroidModuleNode" />
<item name="java" type="edd41e36:AndroidSourceTypeNode" />
<item name="repartoverdnatura" type="cbb59c9e:AndroidPsiDirectoryNode" />
<item name="UTILS" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="vn-delivery" type="1abcf292:AndroidViewProjectNode" />
<item name="Gradle Scripts" type="ae0cef3a:AndroidBuildScriptsGroupNode" />
@ -390,15 +372,15 @@
<window_info id="Captures" order="3" side_tool="true" weight="0.25" />
<window_info id="Image Layers" order="4" />
<window_info id="Capture Tool" order="5" />
<window_info active="true" content_ui="combo" id="Project" order="6" visible="true" weight="0.20625" />
<window_info content_ui="combo" id="Project" order="6" visible="true" weight="0.20546874" />
<window_info id="Structure" order="7" side_tool="true" weight="0.25" />
<window_info id="Resources Explorer" order="8" />
<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.18828125" side_tool="true" visible="true" weight="0.18641618" />
<window_info anchor="bottom" id="Build" order="4" sideWeight="0.81171876" visible="true" weight="0.18641618" />
<window_info anchor="bottom" id="Android Profiler" order="5" />
<window_info anchor="bottom" id="Event Log" order="3" sideWeight="0.19140625" side_tool="true" visible="true" weight="0.18641618" />
<window_info anchor="bottom" id="Build" order="4" sideWeight="0.80859375" visible="true" weight="0.18641618" />
<window_info anchor="bottom" id="Android Profiler" order="5" show_stripe_button="false" />
<window_info anchor="bottom" id="Message" order="6" />
<window_info anchor="bottom" id="Find" order="7" />
<window_info anchor="bottom" id="Run" order="8" />
@ -415,16 +397,16 @@
<window_info anchor="right" id="Commander" order="5" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="6" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="7" weight="0.25" />
<window_info anchor="right" id="Preview" order="8" weight="0.1742671" />
<window_info active="true" anchor="right" id="Preview" order="8" visible="true" weight="0.07109375" />
<window_info anchor="right" id="StringPreview" order="9" />
</layout>
</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>
<provider editor-type-id="android-manifest" />
</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">
@ -452,12 +434,12 @@
</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" />
@ -480,12 +462,12 @@
<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">
@ -541,16 +523,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/ADAPTERS/CheckAdapter.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="381">
<caret line="42" column="35" selection-start-line="42" selection-start-column="35" selection-end-line="42" selection-end-column="35" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</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="748">
@ -565,45 +537,9 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/row_check.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="352">
<caret line="16" column="50" selection-start-line="16" selection-start-column="35" selection-end-line="16" selection-end-column="50" />
</state>
</provider>
<provider editor-type-id="android-designer2" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/values/strings.xml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/MODELS/Check.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="606">
<caret line="57" column="35" selection-start-line="57" selection-start-column="35" selection-end-line="57" selection-end-column="35" />
<folding>
<element signature="e#477#478#0" expanded="true" />
<element signature="e#502#503#0" expanded="true" />
<element signature="e#538#539#0" expanded="true" />
<element signature="e#566#567#0" expanded="true" />
<element signature="e#601#602#0" expanded="true" />
<element signature="e#632#633#0" expanded="true" />
<element signature="e#680#681#0" expanded="true" />
<element signature="e#720#721#0" expanded="true" />
<element signature="e#754#755#0" expanded="true" />
<element signature="e#784#785#0" expanded="true" />
<element signature="e#830#831#0" expanded="true" />
<element signature="e#868#869#0" expanded="true" />
<element signature="e#962#963#0" expanded="true" />
<element signature="e#992#993#0" expanded="true" />
<element signature="e#1038#1039#0" expanded="true" />
<element signature="e#1076#1077#0" expanded="true" />
<element signature="e#1212#1213#0" expanded="true" />
<element signature="e#1264#1265#0" expanded="true" />
<element signature="e#1308#1309#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="android-dummy:///Users/enriqueblascoblanquer/Documents/ANDROID/REPARTO/vn-delivery/app/Translations Editor">
<provider selected="true" editor-type-id="string-resource-editor" />
</entry>
@ -621,37 +557,27 @@
</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="1271">
<caret line="219" column="59" selection-start-line="219" selection-start-column="59" selection-end-line="219" selection-end-column="59" />
<folding>
<element signature="e#3035#3326#0" expanded="true" />
<element signature="e#3257#3282#0" expanded="true" />
<element signature="e#3325#3326#0" expanded="true" />
<element signature="e#6962#7016#0" expanded="true" />
<element signature="e#7264#7283#0" expanded="true" />
<element signature="e#7365#7566#0" expanded="true" />
<element signature="e#7565#7566#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3432">
<caret line="156" column="21" selection-start-line="156" selection-start-column="21" selection-end-line="156" selection-end-column="21" />
</state>
</provider>
<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="792">
<caret line="36" column="20" selection-start-line="36" selection-start-column="20" selection-end-line="36" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_cargar_bultos.xml">
<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="4" selection-start-line="7" selection-start-column="4" selection-end-line="7" selection-end-column="4" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/RetrofitClient.java">
<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" />
<caret line="11" column="45" selection-start-line="11" selection-start-column="45" selection-end-line="11" selection-end-column="45" />
</state>
</provider>
<provider editor-type-id="android-designer2" />
</entry>
<entry file="file://$PROJECT_DIR$/app/build.gradle">
<provider selected="true" editor-type-id="text-editor">
@ -660,25 +586,76 @@
</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="286">
<caret line="13" column="1" selection-start-line="13" selection-start-column="1" selection-end-line="13" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/row_route.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="792">
<caret line="36" column="20" selection-start-line="36" selection-start-column="20" selection-end-line="36" selection-end-column="20" />
</state>
</provider>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_cargar_bultos.xml">
<provider editor-type-id="android-designer2" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/RetrofitClient.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="11" column="45" selection-start-line="11" selection-start-column="45" selection-end-line="11" selection-end-column="45" />
<caret line="9" column="4" selection-start-line="9" selection-start-column="4" selection-end-line="9" selection-end-column="4" />
</state>
</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="713">
<caret line="156" column="21" selection-start-line="156" selection-start-column="21" selection-end-line="156" selection-end-column="21" />
</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">
<caret line="33" column="16" selection-start-line="33" selection-start-column="16" selection-end-line="33" selection-end-column="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/MODELS/Check.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="946">
<caret line="43" column="31" selection-start-line="43" selection-start-column="31" selection-end-line="43" selection-end-column="31" />
<folding>
<element signature="e#1000#1001#0" expanded="true" />
<element signature="e#1044#1045#0" expanded="true" />
<element signature="e#1080#1081#0" expanded="true" />
<element signature="e#1116#1117#0" expanded="true" />
<element signature="e#1148#1149#0" expanded="true" />
<element signature="e#1198#1199#0" expanded="true" />
<element signature="e#1240#1241#0" expanded="true" />
<element signature="e#1273#1274#0" expanded="true" />
<element signature="e#1302#1303#0" expanded="true" />
<element signature="e#1346#1347#0" expanded="true" />
<element signature="e#1382#1383#0" expanded="true" />
<element signature="e#1413#1414#0" expanded="true" />
<element signature="e#1440#1441#0" expanded="true" />
<element signature="e#1480#1481#0" expanded="true" />
<element signature="e#1512#1513#0" expanded="true" />
<element signature="e#1549#1550#0" expanded="true" />
<element signature="e#1582#1583#0" expanded="true" />
<element signature="e#1634#1635#0" expanded="true" />
<element signature="e#1678#1679#0" expanded="true" />
<element signature="e#1714#1715#0" expanded="true" />
<element signature="e#1746#1747#0" expanded="true" />
<element signature="e#1796#1797#0" expanded="true" />
<element signature="e#1838#1839#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/ADAPTERS/CheckAdapter.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="528">
<caret line="36" column="47" selection-start-line="36" selection-start-column="47" selection-end-line="36" selection-end-column="47" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</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="224">
<caret line="50" selection-start-line="50" selection-end-line="50" />
</state>
</provider>
</entry>

1
app/app.iml
View File

@ -111,6 +111,7 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shader_assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/signing_config" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/validate_signing_config" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />

10
app/src/main/java/verdnatura/es/repartoverdnatura/ADAPTERS/CheckAdapter.java
View File

@ -26,13 +26,19 @@ public class CheckAdapter extends ArrayAdapter<Check> {
}
TextView txtId = convertView.findViewById(R.id.txtId);
TextView txtTicket = convertView.findViewById(R.id.txtTicket);
TextView txtAddress = convertView.findViewById(R.id.txtAddress);
TextView txtWarehouse = convertView.findViewById(R.id.txtWarehouse);
TextView txtBulto = convertView.findViewById(R.id.txtBulto);
TextView txtCheck = convertView.findViewById(R.id.txtCheck);
LinearLayout fondo = convertView.findViewById(R.id.fondo);
txtId.setText(c.getId());
txtTicket.setText(c.getTicketFk());
txtAddress.setText(c.getAddressFk()+" - "+c.getStreet()+" "+c.getCity()+" "+c.getPostalCode());
txtWarehouse.setText(c.getWarehouse());
txtBulto.setText(c.getBultos());
if (c.getChecked().equals("1")){

66
app/src/main/java/verdnatura/es/repartoverdnatura/MODELS/Check.java
View File

@ -13,6 +13,24 @@ public class Check {
@SerializedName("routeFk")
private String routeFk;
@SerializedName("bultos")
private String bultos;
@SerializedName("warehouse")
private String warehouse;
@SerializedName("street")
private String street;
@SerializedName("city")
private String city;
@SerializedName("postalCode")
private String postalCode;
@SerializedName("addressFk")
private String addressFk;
@SerializedName("alertLevel")
private String alertLevel;
@ -23,6 +41,54 @@ public class Check {
this.checked = checked;
}
public String getBultos() {
return bultos;
}
public void setBultos(String bultos) {
this.bultos = bultos;
}
public String getWarehouse() {
return warehouse;
}
public void setWarehouse(String warehouse) {
this.warehouse = warehouse;
}
public String getStreet() {
return street;
}
public void setStreet(String street) {
this.street = street;
}
public String getCity() {
return city;
}
public void setCity(String city) {
this.city = city;
}
public String getPostalCode() {
return postalCode;
}
public void setPostalCode(String postalCode) {
this.postalCode = postalCode;
}
public String getAddressFk() {
return addressFk;
}
public void setAddressFk(String addressFk) {
this.addressFk = addressFk;
}
public String getId() {
return id;
}

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

@ -5,7 +5,7 @@ import verdnatura.es.repartoverdnatura.INTERFACES.RestClient;
public class ApiUtils {
private ApiUtils() {}
public static final String BASE_URL = "http://172.16.180.44:8080/";
public static final String BASE_URL = "http://172.16.5.68:8080/";
//public static final String BASE_URL = "https://app.verdnatura.es/";
public static RestClient getAPIService() {

46
app/src/main/res/layout/row_check.xml
View File

@ -43,6 +43,22 @@
android:textStyle="bold" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal">
<TextView
android:id="@+id/txtAddress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Calle Alzira 4, ALFAFAR"
android:textColor="@color/colorMainBg"
android:textSize="16sp"
android:textStyle="bold" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -51,16 +67,38 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Ticket: "
android:text="Almacén: "
android:textColor="@color/colorMainBg"
android:textSize="18sp" />
<TextView
android:id="@+id/txtTicket"
android:id="@+id/txtWarehouse"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="98225458"
android:text="SILLA FV"
android:textColor="@color/colorMainBg"
android:textSize="20sp"
android:textStyle="bold" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Butos: "
android:textColor="@color/colorMainBg"
android:textSize="18sp" />
<TextView
android:id="@+id/txtBulto"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="5"
android:textColor="@color/colorMainBg"
android:textSize="20sp"
android:textStyle="bold" />
@ -83,7 +121,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="5"
android:text="OK"
android:textColor="@color/colorMainBg"
android:textSize="20sp"
android:textStyle="bold" />