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

Merge remote-tracking branch 'origin/4632-guardarFirmas-salix' into test 

# Conflicts:
#	.gradle/buildOutputCleanup/cache.properties
#	.idea/workspace.xml
#	app/src/main/java/verdnatura/es/repartoverdnatura/ExpeditionSummaryActivity.kt
#	app/src/main/java/verdnatura/es/repartoverdnatura/MainActivity.java
#	app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/ApiUtils.java
#	app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/ApiUtilsSalix.java
#	app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/Utils.java
This commit is contained in:
Sergio De la torre 2023-03-28 09:24:35 +02:00
parent 9fcefed2b1 822f7af0b8
commit dad2ff478a
35 changed files with 269 additions and 267 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

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

Binary file not shown.

BIN
.gradle/5.4.1/fileChanges/last-build.bin
View File

Binary file not shown.

BIN
.gradle/5.4.1/fileContent/fileContent.lock
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
.gradle/5.4.1/fileHashes/resourceHashesCache.bin
View File

Binary file not shown.

0
.gradle/5.4.1/gc.properties
View File

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

Binary file not shown.

BIN
.gradle/5.4.1/javaCompile/jarAnalysis.bin
View File

Binary file not shown.

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

Binary file not shown.

BIN
.gradle/5.4.1/javaCompile/taskHistory.bin
View File

Binary file not shown.

BIN
.gradle/buildOutputCleanup/buildOutputCleanup.lock
View File

Binary file not shown.

2
.gradle/buildOutputCleanup/cache.properties
View File

@ -1,2 +0,0 @@
#Thu Feb 23 08:13:25 CET 2023
gradle.version=5.6.4

BIN
.gradle/buildOutputCleanup/outputFiles.bin
View File

Binary file not shown.

6
.idea/compiler.xml
View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<bytecodeTargetLevel target="1.8" />
</component>
</project>

20
.idea/gradle.xml
View File

@ -1,20 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="GradleMigrationSettings" migrationVersion="1" />
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
<option name="delegatedBuild" value="false" />
<option name="testRunner" value="GRADLE" />
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
<option value="$PROJECT_DIR$/app" />
</set>
</option>
</GradleProjectSettings>
</option>
</component>
</project>

105
.idea/misc.xml
View File

@ -1,105 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="DesignSurface">
<option name="filePathToZoomLevelMap">
<map>
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/drawable-v24/ic_eye.xml" value="0.299" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/drawable-v24/ic_launcher_foreground.xml" value="0.1640625" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/drawable/button_background.xml" value="0.2734375" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/drawable/check.xml" value="0.252" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/drawable/expedition_find.xml" value="0.239" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/drawable/ic_history.xml" value="0.2625" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/drawable/ic_launcher_background.xml" value="0.187" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/drawable/ic_launcher_foreground.xml" value="0.1640625" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/drawable/input_background.xml" value="0.2734375" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/drawable/pencil_edit.xml" value="0.2625" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/drawable/revision_icon.xml" value="0.187" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/activity_cargar_bultos.xml" value="0.2078125" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/activity_configure.xml" value="0.12512664640324214" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/activity_expedition_info.xml" value="0.2" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/activity_expedition_summary.xml" value="0.264" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/activity_info.xml" value="0.4839816933638444" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/activity_loaders.xml" value="0.2803442028985507" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/activity_loadvan.xml" value="0.22" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/activity_login.xml" value="0.1585144927536232" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/activity_main.xml" value="0.3333333333333333" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/activity_note.xml" value="0.13020833333333334" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/activity_scan.xml" value="0.22604166666666667" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/activity_sign.xml" value="0.14450867052023122" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/activity_tickets.xml" value="0.26878612716763006" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/component_custom_edit_dialog.xml" value="0.22604166666666667" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/header_route.xml" value="0.17806484295845998" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/phone_dialog.xml" value="0.2803442028985507" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/phone_row.xml" value="0.2803442028985507" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/previous_delete.xml" value="0.17806484295845998" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/progress_bar.xml" value="0.2803442028985507" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/revision_icon.xml" value="0.17806484295845998" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/row_check.xml" value="0.25271739130434784" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/row_expedition_info.xml" value="0.17806484295845998" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/row_expedition_summary.xml" value="0.365625" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/row_expeditionscanned.xml" value="0.20878623188405798" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/row_mensaje.xml" value="0.12512664640324214" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/row_route.xml" value="0.2427536231884058" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/row_routeSelected.xml" value="0.25271739130434784" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/row_route_consignatario.xml" value="0.24947916666666667" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/row_routeselected.xml" value="0.15625" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/row_sub_ticket.xml" value="0.3333333333333333" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/row_ticket.xml" value="0.3333333333333333" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/row_worker.xml" value="0.15217391304347827" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/ticket_pending_row.xml" value="0.3333333333333333" />
</map>
</option>
</component>
<component name="NullableNotNullManager">
<option name="myDefaultNullable" value="android.support.annotation.Nullable" />
<option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
<option name="myNullables">
<value>
<list size="15">
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
<item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
<item index="3" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
<item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
<item index="5" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
<item index="6" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
<item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.Nullable" />
<item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableDecl" />
<item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
<item index="10" class="java.lang.String" itemvalue="android.annotation.Nullable" />
<item index="11" class="java.lang.String" itemvalue="com.android.annotations.Nullable" />
<item index="12" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.Nullable" />
<item index="13" class="java.lang.String" itemvalue="io.reactivex.annotations.Nullable" />
<item index="14" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.Nullable" />
</list>
</value>
</option>
<option name="myNotNulls">
<value>
<list size="15">
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
<item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
<item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
<item index="4" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
<item index="5" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
<item index="6" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.NonNull" />
<item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullDecl" />
<item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullType" />
<item index="9" class="java.lang.String" itemvalue="android.annotation.NonNull" />
<item index="10" class="java.lang.String" itemvalue="com.android.annotations.NonNull" />
<item index="11" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.NonNull" />
<item index="12" class="java.lang.String" itemvalue="io.reactivex.annotations.NonNull" />
<item index="13" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.NonNull" />
<item index="14" class="java.lang.String" itemvalue="lombok.NonNull" />
</list>
</value>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
<option name="id" value="Android" />
</component>
</project>

4
.idea/modules/app/vn-delivery.app.iml
View File

@ -33,10 +33,10 @@
<option name="jvmTarget" value="1.6" /> <option name="jvmTarget" value="1.6" />
<option name="languageVersion" value="1.4" /> <option name="languageVersion" value="1.4" />
<option name="apiVersion" value="1.4" /> <option name="apiVersion" value="1.4" />
<option name="pluginOptions"> <option name="pluginClasspaths">
<array /> <array />
</option> </option>
<option name="pluginClasspaths"> <option name="pluginOptions">
<array /> <array />
</option> </option>
<option name="errors"> <option name="errors">

8
.idea/modules/app/vn-delivery.app.main.iml
View File

File diff suppressed because one or more lines are too long

6
.idea/modules/app/vn-delivery.app.unitTest.iml
View File

File diff suppressed because one or more lines are too long

68
.idea/workspace.xml
View File

@ -40,27 +40,10 @@
</configurations> </configurations>
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="3b8bed57-fcd9-4c4b-a644-0b0381aae011" name="Default" comment="version23.8Beta accede a warehouse"> <list default="true" id="3b8bed57-fcd9-4c4b-a644-0b0381aae011" name="Default" comment="version23.8Beta">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <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/src/main/java/verdnatura/es/repartoverdnatura/UTILS/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/Utils.java" afterDir="false" />
</list>
<list id="bb82280e-2612-45ba-bd45-0d90b078e5b6" name="ignore" comment="version23.8Beta accede a warehouse">
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/executionHistory/executionHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/executionHistory/executionHistory.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/executionHistory/executionHistory.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/executionHistory/executionHistory.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/fileHashes.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/fileHashes.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/resourceHashesCache.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/resourceHashesCache.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/classAnalysis.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/classAnalysis.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/jarAnalysis.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/jarAnalysis.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/javaCompile.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/javaCompile.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/taskHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/taskHistory.bin" 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/cache.properties" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/cache.properties" 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$/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" />
</list> </list>
<list id="573aca20-ee47-4986-8c3a-4ceacdea9f42" name="No subir" comment="Version sin ficheros ." />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@ -75,6 +58,9 @@
<component name="ExternalProjectsManager"> <component name="ExternalProjectsManager">
<system id="GRADLE"> <system id="GRADLE">
<state> <state>
<task path="$PROJECT_DIR$/app">
<activation />
</task>
<projects_view> <projects_view>
<tree_state> <tree_state>
<expand> <expand>
@ -82,6 +68,24 @@
<item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" /> <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
<item name="vn-delivery" type="f1a62948:ProjectNode" /> <item name="vn-delivery" type="f1a62948:ProjectNode" />
</path> </path>
<path>
<item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
<item name="vn-delivery" type="f1a62948:ProjectNode" />
<item name="app" type="2d1252cf:ModuleNode" />
</path>
<path>
<item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
<item name="vn-delivery" type="f1a62948:ProjectNode" />
<item name="app" type="2d1252cf:ModuleNode" />
<item name="Tasks" type="e4a08cd1:TasksNode" />
</path>
<path>
<item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
<item name="vn-delivery" type="f1a62948:ProjectNode" />
<item name="app" type="2d1252cf:ModuleNode" />
<item name="Tasks" type="e4a08cd1:TasksNode" />
<item name="other" type="c8890929:TasksNode$1" />
</path>
</expand> </expand>
<select /> <select />
</tree_state> </tree_state>
@ -106,6 +110,11 @@
<option name="BUILD_TARGET_KEY" value="apk" /> <option name="BUILD_TARGET_KEY" value="apk" />
</component> </component>
<component name="Git.Settings"> <component name="Git.Settings">
<option name="RECENT_BRANCH_BY_REPOSITORY">
<map>
<entry key="$PROJECT_DIR$" value="4632_guardarFirmas_salix_copia" />
</map>
</option>
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component> </component>
<component name="GitSEFilterConfiguration"> <component name="GitSEFilterConfiguration">
@ -128,6 +137,9 @@
<component name="MarkdownSettingsMigration"> <component name="MarkdownSettingsMigration">
<option name="stateVersion" value="1" /> <option name="stateVersion" value="1" />
</component> </component>
<component name="ProblemsViewState">
<option name="selectedTabId" value="CurrentFile" />
</component>
<component name="ProjectId" id="1bWCL859wVM8jZScmHvfw95Cjm4" /> <component name="ProjectId" id="1bWCL859wVM8jZScmHvfw95Cjm4" />
<component name="ProjectLevelVcsManager"> <component name="ProjectLevelVcsManager">
<ConfirmationsSetting value="1" id="Add" /> <ConfirmationsSetting value="1" id="Add" />
@ -147,7 +159,9 @@
&quot;android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-28/android/widget/AbsListView.java_SELECTED&quot;: &quot;AbsListView&quot;, &quot;android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-28/android/widget/AbsListView.java_SELECTED&quot;: &quot;AbsListView&quot;,
&quot;android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-28/android/widget/ListView.java_SELECTED&quot;: &quot;ListView&quot;, &quot;android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-28/android/widget/ListView.java_SELECTED&quot;: &quot;ListView&quot;,
&quot;cidr.known.project.marker&quot;: &quot;true&quot;, &quot;cidr.known.project.marker&quot;: &quot;true&quot;,
&quot;last_opened_file_path&quot;: &quot;C:/Users/sergiodt/AndroidStudioProjects/vn-picture/platforms/android&quot; &quot;com.google.services.firebase.aqiPopupShown&quot;: &quot;true&quot;,
&quot;last_opened_file_path&quot;: &quot;C:/Users/sergiodt/AndroidStudioProjects/vn-picture/platforms/android&quot;,
&quot;settings.editor.selected.configurable&quot;: &quot;experimental&quot;
}, },
&quot;keyToStringList&quot;: { &quot;keyToStringList&quot;: {
&quot;ExportApk.BuildVariants&quot;: [ &quot;ExportApk.BuildVariants&quot;: [
@ -321,12 +335,12 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1673366849427</updated> <updated>1673366849427</updated>
</task> </task>
<task id="LOCAL-00006" summary="version23.8Beta accede a warehouse"> <task id="LOCAL-00006" summary="Version sin ficheros .">
<created>1678114236321</created> <created>1679661077969</created>
<option name="number" value="00006" /> <option name="number" value="00006" />
<option name="presentableId" value="LOCAL-00006" /> <option name="presentableId" value="LOCAL-00006" />
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1678114236321</updated> <updated>1679661077969</updated>
</task> </task>
<option name="localTasksCounter" value="7" /> <option name="localTasksCounter" value="7" />
<servers /> <servers />
@ -359,15 +373,15 @@
<MESSAGE value="Versión 9.5 App preparada para modificar consultas back, icono cargar cualquier ruta ya direcciona a la pantalla resumen." /> <MESSAGE value="Versión 9.5 App preparada para modificar consultas back, icono cargar cualquier ruta ya direcciona a la pantalla resumen." />
<MESSAGE value="Versión 23.2Beta en Sfusion" /> <MESSAGE value="Versión 23.2Beta en Sfusion" />
<MESSAGE value="Versión 23.4Beta en Sfusion" /> <MESSAGE value="Versión 23.4Beta en Sfusion" />
<MESSAGE value="version23.8Beta accede a warehouse" /> <MESSAGE value="Version sin ficheros ." />
<option name="LAST_COMMIT_MESSAGE" value="version23.8Beta accede a warehouse" /> <option name="LAST_COMMIT_MESSAGE" value="Version sin ficheros ." />
</component> </component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager> <breakpoint-manager>
<breakpoints> <breakpoints>
<line-breakpoint enabled="true" type="kotlin-line"> <line-breakpoint type="kotlin-line">
<url>file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/ExpeditionSummaryActivity.kt</url> <url>file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/ExpeditionSummaryActivity.kt</url>
<line>317</line> <line>318</line>
<option name="timeStamp" value="5" /> <option name="timeStamp" value="5" />
</line-breakpoint> </line-breakpoint>
</breakpoints> </breakpoints>

2
app/src/main/java/verdnatura/es/repartoverdnatura/ExpeditionSummaryActivity.kt
View File

@ -6,7 +6,6 @@ import android.content.Intent
import android.media.MediaPlayer import android.media.MediaPlayer
import android.os.Bundle import android.os.Bundle
import android.support.v7.app.AppCompatActivity import android.support.v7.app.AppCompatActivity
import android.util.Log
import android.view.View import android.view.View
import android.view.inputmethod.InputMethodManager import android.view.inputmethod.InputMethodManager
import android.widget.* import android.widget.*
@ -58,7 +57,6 @@ class ExpeditionSummaryActivity : AppCompatActivity() {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
setContentView(R.layout.activity_expedition_summary) setContentView(R.layout.activity_expedition_summary)
Log.d("VERDNATURA::",""+ localClassName)
mpError = MediaPlayer.create((this), R.raw.error) mpError = MediaPlayer.create((this), R.raw.error)
mpOk = MediaPlayer.create((this), R.raw.ok) mpOk = MediaPlayer.create((this), R.raw.ok)
mpErrorRepeat = MediaPlayer.create((this), R.raw.errorrepeat) mpErrorRepeat = MediaPlayer.create((this), R.raw.errorrepeat)

4
app/src/main/java/verdnatura/es/repartoverdnatura/INTERFACES/RestClient.java
View File

@ -41,8 +41,8 @@ public interface RestClient {
@POST("/delivery/get_tickets") @POST("/delivery/get_tickets")
Call<List<Cliente>> getClients(@HeaderMap Map<String, String> headers, @Body String[] route); Call<List<Cliente>> getClients(@HeaderMap Map<String, String> headers, @Body String[] route);
@POST("/delivery/save_sign") /*@POST("/delivery/save_sign")
Call<Void> saveSign(@HeaderMap Map<String, String> headers, @Body Object[] args); Call<Void> saveSign(@HeaderMap Map<String, String> headers, @Body Object[] args);*/
@POST("/delivery/update_routes") @POST("/delivery/update_routes")
Call<Void> saveConfig(@HeaderMap Map<String, String> headers, @Body Object[] args); Call<Void> saveConfig(@HeaderMap Map<String, String> headers, @Body Object[] args);

12
app/src/main/java/verdnatura/es/repartoverdnatura/INTERFACES/RestClientSalix.java
View File

@ -1,19 +1,27 @@
package verdnatura.es.repartoverdnatura.INTERFACES; package verdnatura.es.repartoverdnatura.INTERFACES;
import java.util.Map; import java.util.Map;
import okhttp3.MultipartBody;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.http.Body; import retrofit2.http.Body;
import retrofit2.http.Header;
import retrofit2.http.HeaderMap; import retrofit2.http.HeaderMap;
import retrofit2.http.Multipart;
import retrofit2.http.POST; import retrofit2.http.POST;
import retrofit2.http.Part;
import retrofit2.http.QueryMap;
import verdnatura.es.repartoverdnatura.MODELS.LoginSalix; import verdnatura.es.repartoverdnatura.MODELS.LoginSalix;
public interface RestClientSalix{ public interface RestClientSalix{
@POST("/api/Accounts/login") @POST("/api/Accounts/login")
Call<LoginSalix> loginSalix(@HeaderMap Map<String,String> headers, @Body LoginSalix userData); Call<LoginSalix> loginSalix(@HeaderMap Map<String,String> headers, @Body LoginSalix userData);
@Multipart
@POST("/api/Tickets/saveSign")
Call<Void> saveSign(@Header("Authorization") String token,
@Part MultipartBody.Part file,
@QueryMap(encoded=true) Map<String, String> queryMap);
} }

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

@ -93,14 +93,14 @@ public class LoginActivity extends AppCompatActivity {
LoginSalix ls = new LoginSalix(user, password, "", false, ""); LoginSalix ls = new LoginSalix(user, password, "", false, "");
restClientSalix.loginSalix(Utils.getMapSalix(user, password), ls).enqueue(new Callback<LoginSalix>() { restClientSalix.loginSalix(Utils.getMapLoginSalix(user, password), ls).enqueue(new Callback<LoginSalix>() {
@Override @Override
public void onResponse(Call<LoginSalix> call, Response<LoginSalix> response) { public void onResponse(Call<LoginSalix> call, Response<LoginSalix> response) {
Utils.progressBar.getDialog().dismiss(); Utils.progressBar.getDialog().dismiss();
if (response.isSuccessful()) { if (response.isSuccessful()) {
Utils.saveUserPass(that, user, password); Utils.saveUserPass(that, user, password);
Utils.saveTokenUser(that, response.body().getToken()); Utils.saveTokenUser(getApplicationContext(), response.body().getToken());
worker_getId(); worker_getId();
txtUser.setText(""); txtUser.setText("");
txtPassword.setText(""); txtPassword.setText("");
@ -115,7 +115,7 @@ public class LoginActivity extends AppCompatActivity {
@Override @Override
public void onFailure(Call<LoginSalix> call, Throwable t) { public void onFailure(Call<LoginSalix> call, Throwable t) {
Utils.progressBar.getDialog().dismiss(); Utils.progressBar.getDialog().dismiss();
Utils.showErrorDialog(that, that.getResources().getString(R.string.error_conexion)); Utils.showErrorDialog(that, that.getResources().getString(R.string.error_conexion) + t.getMessage());
} }
}); });

14
app/src/main/java/verdnatura/es/repartoverdnatura/MODELS/SignDataUpload.java
View File

@ -14,21 +14,18 @@ public class SignDataUpload {
private String clientName = ""; private String clientName = "";
private String idClient = ""; private String idClient = "";
private String signedTime; private String signedTime;
private String addressFk;
public SignDataUpload(String sign, List<Integer> tickets, verdnatura.es.repartoverdnatura.MODELS.Location location, String address) { public SignDataUpload(String sign, List<Integer> tickets, verdnatura.es.repartoverdnatura.MODELS.Location location) {
Sign = sign; Sign = sign;
Tickets = tickets; Tickets = tickets;
Location = location; Location = location;
signedTime = new SimpleDateFormat("yyyy-LL-dd HH:mm", Locale.getDefault()).format(new Date()); signedTime = new SimpleDateFormat("yyyy-LL-dd HH:mm", Locale.getDefault()).format(new Date());
addressFk =address;
} }
public SignDataUpload(String sign, List<Integer> tickets,String address) { public SignDataUpload(String sign, List<Integer> tickets) {
Sign = sign; Sign = sign;
Tickets = tickets; Tickets = tickets;
Location = null; Location = null;
signedTime = new SimpleDateFormat("yyyy-LL-dd HH:mm", Locale.getDefault()).format(new Date()); signedTime = new SimpleDateFormat("yyyy-LL-dd HH:mm", Locale.getDefault()).format(new Date());
addressFk = address;
} }
@ -38,13 +35,6 @@ public class SignDataUpload {
public void setSignedTime(String signedTime) { public void setSignedTime(String signedTime) {
this.signedTime = signedTime; this.signedTime = signedTime;
} }
public String getAddressFk(){
return addressFk;
}
public void setAddressFk(String address){
addressFk=address;
}
public String getSign() { public String getSign() {
return Sign; return Sign;

46
app/src/main/java/verdnatura/es/repartoverdnatura/MainActivity.java
View File

@ -21,24 +21,32 @@ import android.widget.TextView;
import com.google.gson.Gson; import com.google.gson.Gson;
import java.io.File;
import java.text.DateFormat; import java.text.DateFormat;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.Set; import java.util.Set;
import okhttp3.MediaType;
import okhttp3.MultipartBody;
import okhttp3.RequestBody;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.Callback; import retrofit2.Callback;
import retrofit2.Response; import retrofit2.Response;
import verdnatura.es.repartoverdnatura.ADAPTERS.PendingTickets; import verdnatura.es.repartoverdnatura.ADAPTERS.PendingTickets;
import verdnatura.es.repartoverdnatura.ADAPTERS.RutaAdapter; import verdnatura.es.repartoverdnatura.ADAPTERS.RutaAdapter;
import verdnatura.es.repartoverdnatura.INTERFACES.RestClient; import verdnatura.es.repartoverdnatura.INTERFACES.RestClient;
import verdnatura.es.repartoverdnatura.INTERFACES.RestClientSalix;
import verdnatura.es.repartoverdnatura.MODELS.Check; import verdnatura.es.repartoverdnatura.MODELS.Check;
import verdnatura.es.repartoverdnatura.MODELS.Ruta; import verdnatura.es.repartoverdnatura.MODELS.Ruta;
import verdnatura.es.repartoverdnatura.MODELS.SignDataUpload; import verdnatura.es.repartoverdnatura.MODELS.SignDataUpload;
import verdnatura.es.repartoverdnatura.UTILS.ApiUtils; import verdnatura.es.repartoverdnatura.UTILS.ApiUtils;
import verdnatura.es.repartoverdnatura.UTILS.ApiUtilsSalix;
import verdnatura.es.repartoverdnatura.UTILS.LocalStorage; import verdnatura.es.repartoverdnatura.UTILS.LocalStorage;
import verdnatura.es.repartoverdnatura.UTILS.Utils; import verdnatura.es.repartoverdnatura.UTILS.Utils;
@ -52,6 +60,7 @@ public class MainActivity<RouteLoaded> extends AppCompatActivity {
private PendingTickets pendingAdapter; private PendingTickets pendingAdapter;
private int heightCellRoute; private int heightCellRoute;
private int heightCellHeader; private int heightCellHeader;
private RestClientSalix restClientSalix;
private RestClient restClient; private RestClient restClient;
private DateFormat format = new SimpleDateFormat("yyyy-MM-dd"); private DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
private Date date = new Date(); private Date date = new Date();
@ -69,6 +78,7 @@ public class MainActivity<RouteLoaded> extends AppCompatActivity {
setContentView(R.layout.activity_main); setContentView(R.layout.activity_main);
restClient = ApiUtils.getAPIService(); restClient = ApiUtils.getAPIService();
restClientSalix = ApiUtilsSalix.getAPIService();
setViews(); setViews();
getRoutes(null); getRoutes(null);
@ -382,7 +392,6 @@ public class MainActivity<RouteLoaded> extends AppCompatActivity {
// startActivity(new Intent(this,InfoActivity.class)); // startActivity(new Intent(this,InfoActivity.class));
Utils.startPicking(this, "info"); Utils.startPicking(this, "info");
} }
public void goToFound(View v){ public void goToFound(View v){
startActivity(new Intent(this,ExpeditionScanActivity.class)); startActivity(new Intent(this,ExpeditionScanActivity.class));
} }
@ -400,9 +409,16 @@ public class MainActivity<RouteLoaded> extends AppCompatActivity {
public void confirmSave(final SignDataUpload data) { public void confirmSave(final SignDataUpload data) {
Utils.progressBar.show(this, getResources().getString(R.string.please_wait)); Utils.progressBar.show(this, getResources().getString(R.string.please_wait));
final MainActivity that = this; final MainActivity that = this;
Object[] args = new Object[1];
args[0] = data; String token = Utils.getTokenUser(getApplicationContext());
restClient.saveSign(Utils.getMapWhitUser(this), args).enqueue(new Callback<Void>() { File file = new File(data.getSign());
MultipartBody.Part filePart = MultipartBody.Part.createFormData("file", file.getName(), RequestBody.create(MediaType.parse("image/png"), file));
Map<String, String> queryMap = new HashMap<>();
queryMap.put("tickets", data.getTickets().toString());
queryMap.put("location", new Gson().toJson(data.getLocation()));
queryMap.put("signedTime", data.getSignedTime());
restClientSalix.saveSign(token, filePart, queryMap).enqueue(new Callback<Void>() {
@Override @Override
public void onResponse(Call<Void> call, Response<Void> response) { public void onResponse(Call<Void> call, Response<Void> response) {
Utils.progressBar.getDialog().dismiss(); Utils.progressBar.getDialog().dismiss();
@ -422,15 +438,15 @@ public class MainActivity<RouteLoaded> extends AppCompatActivity {
}else{ }else{
//Log.i("ERROR","error al guardar"); //Log.i("ERROR","error al guardar");
Utils.showErrorDialog(that, that.getResources().getString(R.string.error_conexion)); //Utils.showErrorDialog(that,that.getResources().getString(R.string.error_conexion));
//Utils.showErrorDialog(that,response.message()); Utils.showErrorDialog(that,response.message());
} }
} }
@Override @Override
public void onFailure(Call<Void> call, Throwable t) { public void onFailure(Call<Void> call, Throwable t) {
Utils.progressBar.getDialog().dismiss(); Utils.progressBar.getDialog().dismiss();
Utils.showErrorDialog(that, that.getResources().getString(R.string.error_conexion)); Utils.showErrorDialog(that,t.getMessage());
} }
}); });
} }
@ -440,9 +456,15 @@ public class MainActivity<RouteLoaded> extends AppCompatActivity {
Utils.progressBar.show(this, getResources().getString(R.string.please_wait)); Utils.progressBar.show(this, getResources().getString(R.string.please_wait));
final SignDataUpload data = listaPendientes.get(0); final SignDataUpload data = listaPendientes.get(0);
final MainActivity that = this; final MainActivity that = this;
Object[] args = new Object[1]; String token = Utils.getTokenUser(getApplicationContext());
args[0] = data; File file = new File(data.getSign());
restClient.saveSign(Utils.getMapWhitUser(this), args).enqueue(new Callback<Void>() { MultipartBody.Part filePart = MultipartBody.Part.createFormData("file", file.getName(), RequestBody.create(MediaType.parse("image/png"), file));
Map<String, String> queryMap = new HashMap<>();
queryMap.put("tickets", data.getTickets().toString());
queryMap.put("location", new Gson().toJson(data.getLocation()));
queryMap.put("signedTime", data.getSignedTime());
restClientSalix.saveSign(token, filePart, queryMap).enqueue(new Callback<Void>() {
@Override @Override
public void onResponse(Call<Void> call, Response<Void> response) { public void onResponse(Call<Void> call, Response<Void> response) {
@ -453,7 +475,7 @@ public class MainActivity<RouteLoaded> extends AppCompatActivity {
confirmSavePos(null); confirmSavePos(null);
} else { } else {
Utils.showErrorDialog(that, that.getResources().getString(R.string.error_conexion)); Utils.showErrorDialog(that,response.message());
} }
} }
@ -461,7 +483,7 @@ public class MainActivity<RouteLoaded> extends AppCompatActivity {
@Override @Override
public void onFailure(Call<Void> call, Throwable t) { public void onFailure(Call<Void> call, Throwable t) {
Utils.progressBar.getDialog().dismiss(); Utils.progressBar.getDialog().dismiss();
Utils.showErrorDialog(that, that.getResources().getString(R.string.error_conexion)); Utils.showErrorDialog(that,t.getMessage());
} }
}); });
} else { } else {

22
app/src/main/java/verdnatura/es/repartoverdnatura/NetworkStateReveiver.java
View File

@ -9,21 +9,30 @@ import android.util.Log;
import com.google.gson.Gson; import com.google.gson.Gson;
import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import java.util.Set; import java.util.Set;
import okhttp3.MediaType;
import okhttp3.MultipartBody;
import okhttp3.RequestBody;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.Callback; import retrofit2.Callback;
import retrofit2.Response; import retrofit2.Response;
import verdnatura.es.repartoverdnatura.INTERFACES.RestClient; import verdnatura.es.repartoverdnatura.INTERFACES.RestClient;
import verdnatura.es.repartoverdnatura.INTERFACES.RestClientSalix;
import verdnatura.es.repartoverdnatura.MODELS.SignDataUpload; import verdnatura.es.repartoverdnatura.MODELS.SignDataUpload;
import verdnatura.es.repartoverdnatura.UTILS.ApiUtils; import verdnatura.es.repartoverdnatura.UTILS.ApiUtils;
import verdnatura.es.repartoverdnatura.UTILS.ApiUtilsSalix;
import verdnatura.es.repartoverdnatura.UTILS.LocalStorage; import verdnatura.es.repartoverdnatura.UTILS.LocalStorage;
import verdnatura.es.repartoverdnatura.UTILS.Utils; import verdnatura.es.repartoverdnatura.UTILS.Utils;
public class NetworkStateReveiver extends BroadcastReceiver { public class NetworkStateReveiver extends BroadcastReceiver {
public ArrayList<SignDataUpload> listData = new ArrayList<>(); public ArrayList<SignDataUpload> listData = new ArrayList<>();
private RestClient restClient; private RestClient restClient;
private RestClientSalix restClientSalix;
public Context context; public Context context;
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
@ -37,6 +46,7 @@ public class NetworkStateReveiver extends BroadcastReceiver {
Set<String> listPendientes = LocalStorage.getPendingSigns(context); Set<String> listPendientes = LocalStorage.getPendingSigns(context);
if (listPendientes.size() != 0){ if (listPendientes.size() != 0){
restClient = ApiUtils.getAPIService(); restClient = ApiUtils.getAPIService();
restClientSalix = ApiUtilsSalix.getAPIService();
Gson gson = new Gson(); Gson gson = new Gson();
listData = new ArrayList<>(); listData = new ArrayList<>();
for (String s : listPendientes){ for (String s : listPendientes){
@ -56,9 +66,15 @@ public class NetworkStateReveiver extends BroadcastReceiver {
public void confirmSave(final int pos){ public void confirmSave(final int pos){
if (pos < listData.size()) { if (pos < listData.size()) {
//Utils.progressBar.show(this, getResources().getString(R.string.please_wait)); //Utils.progressBar.show(this, getResources().getString(R.string.please_wait));
Object[] args = new Object[1]; String token = Utils.getTokenUser(this.context);
args[0] = listData.get(pos); File file = new File(listData.get(pos).getSign());
restClient.saveSign(Utils.getMapWhitUser(context), args).enqueue(new Callback<Void>() { MultipartBody.Part filePart = MultipartBody.Part.createFormData("file", file.getName(), RequestBody.create(MediaType.parse("image/png"), file));
Map<String, String> queryMap = new HashMap<>();
queryMap.put("tickets", listData.get(pos).getTickets().toString());
queryMap.put("location", new Gson().toJson(listData.get(pos).getLocation()));
queryMap.put("signedTime", listData.get(pos).getSignedTime());
restClientSalix.saveSign(token, filePart, queryMap).enqueue(new Callback<Void>() {
@Override @Override
public void onResponse(Call<Void> call, Response<Void> response) { public void onResponse(Call<Void> call, Response<Void> response) {

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

@ -20,23 +20,33 @@ import android.util.Log;
import android.view.View; import android.view.View;
import android.widget.TextView; import android.widget.TextView;
import com.google.gson.Gson;
import com.simplify.ink.InkView; import com.simplify.ink.InkView;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
import okhttp3.MediaType;
import okhttp3.MultipartBody;
import okhttp3.RequestBody;
import okio.ByteString;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.Callback; import retrofit2.Callback;
import retrofit2.Response; import retrofit2.Response;
import verdnatura.es.repartoverdnatura.INTERFACES.RestClient; import retrofit2.http.QueryMap;
import verdnatura.es.repartoverdnatura.INTERFACES.RestClientSalix;
import verdnatura.es.repartoverdnatura.MODELS.ClientTickets; import verdnatura.es.repartoverdnatura.MODELS.ClientTickets;
import verdnatura.es.repartoverdnatura.MODELS.SignDataUpload; import verdnatura.es.repartoverdnatura.MODELS.SignDataUpload;
import verdnatura.es.repartoverdnatura.UTILS.ApiUtils; import verdnatura.es.repartoverdnatura.UTILS.ApiUtilsSalix;
import verdnatura.es.repartoverdnatura.UTILS.LocalStorage; import verdnatura.es.repartoverdnatura.UTILS.LocalStorage;
import verdnatura.es.repartoverdnatura.UTILS.Utils; import verdnatura.es.repartoverdnatura.UTILS.Utils;
@ -45,7 +55,7 @@ public class SignActivity extends AppCompatActivity implements LocationListener{
private InkView ink; private InkView ink;
public ClientTickets clientTickets; public ClientTickets clientTickets;
private TextView txtTickets, txtPackages, txtCliente; private TextView txtTickets, txtPackages, txtCliente;
private RestClient restClient; private RestClientSalix restClientSalix;
public LocationManager locationManager; public LocationManager locationManager;
public Location location; public Location location;
public List<Integer> tickets = new ArrayList<>(); public List<Integer> tickets = new ArrayList<>();
@ -56,7 +66,7 @@ public class SignActivity extends AppCompatActivity implements LocationListener{
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_sign); setContentView(R.layout.activity_sign);
restClient = ApiUtils.getAPIService(); restClientSalix = ApiUtilsSalix.getAPIService();
locationManager = (LocationManager) getSystemService(Context.LOCATION_SERVICE); locationManager = (LocationManager) getSystemService(Context.LOCATION_SERVICE);
Criteria criteria = new Criteria(); Criteria criteria = new Criteria();
String provider = locationManager.getBestProvider(criteria, true); String provider = locationManager.getBestProvider(criteria, true);
@ -153,7 +163,12 @@ public class SignActivity extends AppCompatActivity implements LocationListener{
new DialogInterface.OnClickListener() { new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
SignDataUpload data = new SignDataUpload(that.BitMapToString(drawing),tickets,new verdnatura.es.repartoverdnatura.MODELS.Location(clientTickets.getLongitude(),clientTickets.getLatitude()),clientTickets.getAddress()); SignDataUpload data = null;
try {
data = new SignDataUpload(that.BitMapToString(drawing, tickets),tickets,new verdnatura.es.repartoverdnatura.MODELS.Location(clientTickets.getLongitude(),clientTickets.getLatitude()));
} catch (IOException e) {
throw new RuntimeException(e);
}
confirmSave(data); confirmSave(data);
} }
@ -162,7 +177,12 @@ public class SignActivity extends AppCompatActivity implements LocationListener{
new DialogInterface.OnClickListener() { new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
SignDataUpload data = new SignDataUpload(that.BitMapToString(drawing),tickets,new verdnatura.es.repartoverdnatura.MODELS.Location(String.valueOf(location.getLongitude()),String.valueOf(location.getLatitude())),clientTickets.getAddress()); SignDataUpload data = null;
try {
data = new SignDataUpload(that.BitMapToString(drawing, tickets),tickets,new verdnatura.es.repartoverdnatura.MODELS.Location(String.valueOf(location.getLongitude()),String.valueOf(location.getLatitude())));
} catch (IOException e) {
throw new RuntimeException(e);
}
confirmSave(data); confirmSave(data);
} }
@ -172,21 +192,41 @@ public class SignActivity extends AppCompatActivity implements LocationListener{
}else{ }else{
//sergio: No subido para comprobar si location == null. //sergio: No subido para comprobar si location == null.
if (location==null) { if (location==null) {
SignDataUpload data = new SignDataUpload(that.BitMapToString(drawing), tickets,clientTickets.getAddress()); SignDataUpload data = null;
try {
data = new SignDataUpload(that.BitMapToString(drawing, tickets), tickets);
} catch (IOException e) {
throw new RuntimeException(e);
}
// SignDataUpload data = new SignDataUpload(that.BitMapToString(drawing), tickets, new verdnatura.es.repartoverdnatura.MODELS.Location("0.0", "0.0")); // SignDataUpload data = new SignDataUpload(that.BitMapToString(drawing), tickets, new verdnatura.es.repartoverdnatura.MODELS.Location("0.0", "0.0"));
confirmSave(data); confirmSave(data);
}else{ }else{
SignDataUpload data = new SignDataUpload(that.BitMapToString(drawing),tickets,new verdnatura.es.repartoverdnatura.MODELS.Location(String.valueOf(location.getLongitude()),String.valueOf(location.getLatitude())),clientTickets.getAddress()); SignDataUpload data = null;
try {
data = new SignDataUpload(that.BitMapToString(drawing, tickets),tickets,new verdnatura.es.repartoverdnatura.MODELS.Location(String.valueOf(location.getLongitude()),String.valueOf(location.getLatitude())));
} catch (IOException e) {
throw new RuntimeException(e);
}
confirmSave(data);} confirmSave(data);}
} }
}else{ }else{
if (location != null){ if (location != null){
SignDataUpload data = new SignDataUpload(that.BitMapToString(drawing),tickets,new verdnatura.es.repartoverdnatura.MODELS.Location(String.valueOf(location.getLongitude()),String.valueOf(location.getLatitude())),clientTickets.getAddress()); SignDataUpload data = null;
try {
data = new SignDataUpload(that.BitMapToString(drawing, tickets),tickets,new verdnatura.es.repartoverdnatura.MODELS.Location(String.valueOf(location.getLongitude()),String.valueOf(location.getLatitude())));
} catch (IOException e) {
throw new RuntimeException(e);
}
confirmSave(data); confirmSave(data);
}else{ }else{
//SignDataUpload data = new SignDataUpload(that.BitMapToString(drawing),tickets,new verdnatura.es.repartoverdnatura.MODELS.Location("0.0","0.0")); //SignDataUpload data = new SignDataUpload(that.BitMapToString(drawing),tickets,new verdnatura.es.repartoverdnatura.MODELS.Location("0.0","0.0"));
SignDataUpload data = new SignDataUpload(that.BitMapToString(drawing), tickets,clientTickets.getAddress()); SignDataUpload data = null;
try {
data = new SignDataUpload(that.BitMapToString(drawing, tickets), tickets);
} catch (IOException e) {
throw new RuntimeException(e);
}
confirmSave(data); confirmSave(data);
} }
@ -202,24 +242,28 @@ public class SignActivity extends AppCompatActivity implements LocationListener{
} }
public void confirmSave(final SignDataUpload data){ public void confirmSave(final SignDataUpload data){
/* Log.d("VERDNATURA::","La firma es "+data.getSignedTime()); Log.d("VERDNATURA::","La firma es "+data.getSignedTime());
Log.d("VERDNATURA::","EL consig es "+data.getAddressFk());*/
Utils.progressBar.show(this,getResources().getString(R.string.please_wait)); Utils.progressBar.show(this,getResources().getString(R.string.please_wait));
final SignActivity that = this; final SignActivity that = this;
Object[] args = new Object[1];
args[0] = data;
String token = Utils.getTokenUser(getApplicationContext());
File file = new File(data.getSign());
MultipartBody.Part filePart = MultipartBody.Part.createFormData("file", file.getName(), RequestBody.create(MediaType.parse("image/png"), file));
Map<String, String> queryMap = new HashMap<>();
queryMap.put("tickets", data.getTickets().toString());
queryMap.put("location", new Gson().toJson(data.getLocation()));
queryMap.put("signedTime", data.getSignedTime());
restClient.saveSign(Utils.getMapWhitUser(this),args).enqueue(new Callback<Void>() { restClientSalix.saveSign(token, filePart, queryMap).enqueue(new Callback<Void>() {
@Override @Override
public void onResponse(Call<Void> call, Response<Void> response) { public void onResponse(Call<Void> call, Response<Void> response) {
Utils.progressBar.getDialog().dismiss(); Utils.progressBar.getDialog().dismiss();
if(response.isSuccessful()){ if(response.isSuccessful()){
// if (response.body().equals("OK")){ // if (response.body().equals("OK")){
//Log.i("INFO","guardado");
Intent returnIntent = new Intent(); Intent returnIntent = new Intent();
returnIntent.putExtra("idCliente",clientTickets.getClient()); returnIntent.putExtra("idCliente",clientTickets.getClient());
setResult(Activity.RESULT_OK,returnIntent); setResult(Activity.RESULT_OK,returnIntent);
@ -230,6 +274,7 @@ public class SignActivity extends AppCompatActivity implements LocationListener{
}else{ }else{
// Log.i("ERROR","error al guardar"); // Log.i("ERROR","error al guardar");
Utils.showErrorDialog(that,response.message());
saveLocal(data); saveLocal(data);
} }
} }
@ -237,6 +282,7 @@ public class SignActivity extends AppCompatActivity implements LocationListener{
@Override @Override
public void onFailure(Call<Void> call, Throwable t) { public void onFailure(Call<Void> call, Throwable t) {
Utils.progressBar.getDialog().dismiss(); Utils.progressBar.getDialog().dismiss();
Utils.showErrorDialog(that,t.getMessage());
saveLocal(data); saveLocal(data);
} }
}); });
@ -251,12 +297,28 @@ public class SignActivity extends AppCompatActivity implements LocationListener{
finish(); finish();
} }
public String BitMapToString(Bitmap bitmap){ public String BitMapToString(Bitmap bitmap, List<Integer> tickets) throws IOException {
String fileNameSign = getBaseContext().getExternalCacheDir() + "/sign";
for (Integer ticket: tickets) {
fileNameSign += "_" + ticket.toString();
}
//Create a file to write bitmap data
File f = new File(fileNameSign + ".png");
f.createNewFile();
//Convert bitmap to byte array
ByteArrayOutputStream baos = new ByteArrayOutputStream(); ByteArrayOutputStream baos = new ByteArrayOutputStream();
bitmap.compress(Bitmap.CompressFormat.PNG,100, baos); bitmap.compress(Bitmap.CompressFormat.PNG,100, baos);
byte [] b = baos.toByteArray(); byte [] b = baos.toByteArray();
String temp=Base64.encodeToString(b, Base64.DEFAULT);
return temp; //write the bytes in file
FileOutputStream fos = new FileOutputStream(f);
fos.write(b);
fos.flush();
fos.close();
return fileNameSign + ".png";
} }
public void clearSign(View v){ public void clearSign(View v){

22
app/src/main/java/verdnatura/es/repartoverdnatura/Tickets.java
View File

@ -24,23 +24,29 @@ import android.widget.Toast;
import com.google.gson.Gson; import com.google.gson.Gson;
import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import okhttp3.MediaType;
import okhttp3.MultipartBody;
import okhttp3.RequestBody;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.Callback; import retrofit2.Callback;
import retrofit2.Response; import retrofit2.Response;
import verdnatura.es.repartoverdnatura.ADAPTERS.ClientAdapter; import verdnatura.es.repartoverdnatura.ADAPTERS.ClientAdapter;
import verdnatura.es.repartoverdnatura.ADAPTERS.PhonesAdapter; import verdnatura.es.repartoverdnatura.ADAPTERS.PhonesAdapter;
import verdnatura.es.repartoverdnatura.INTERFACES.RestClient; import verdnatura.es.repartoverdnatura.INTERFACES.RestClient;
import verdnatura.es.repartoverdnatura.INTERFACES.RestClientSalix;
import verdnatura.es.repartoverdnatura.MODELS.ClientTickets; import verdnatura.es.repartoverdnatura.MODELS.ClientTickets;
import verdnatura.es.repartoverdnatura.MODELS.Cliente; import verdnatura.es.repartoverdnatura.MODELS.Cliente;
import verdnatura.es.repartoverdnatura.MODELS.Ruta; import verdnatura.es.repartoverdnatura.MODELS.Ruta;
import verdnatura.es.repartoverdnatura.MODELS.SignDataUpload; import verdnatura.es.repartoverdnatura.MODELS.SignDataUpload;
import verdnatura.es.repartoverdnatura.UTILS.ApiUtils; import verdnatura.es.repartoverdnatura.UTILS.ApiUtils;
import verdnatura.es.repartoverdnatura.UTILS.ApiUtilsSalix;
import verdnatura.es.repartoverdnatura.UTILS.LocalStorage; import verdnatura.es.repartoverdnatura.UTILS.LocalStorage;
import verdnatura.es.repartoverdnatura.UTILS.Utils; import verdnatura.es.repartoverdnatura.UTILS.Utils;
@ -54,6 +60,7 @@ public class Tickets extends AppCompatActivity {
private ClientAdapter adapter; private ClientAdapter adapter;
public Ruta route; public Ruta route;
private RestClient restClient; private RestClient restClient;
private RestClientSalix restClientSalix;
private TextView txtZona, txtLines, btnVolver, txtClientsToSign, btnShowSigned; private TextView txtZona, txtLines, btnVolver, txtClientsToSign, btnShowSigned;
private boolean isSignedShowed = false; private boolean isSignedShowed = false;
private ListView dialogListView; private ListView dialogListView;
@ -69,6 +76,7 @@ public class Tickets extends AppCompatActivity {
Bundle bundle = intent.getExtras(); Bundle bundle = intent.getExtras();
route = (Ruta) bundle.getSerializable("route"); route = (Ruta) bundle.getSerializable("route");
restClient = ApiUtils.getAPIService(); restClient = ApiUtils.getAPIService();
restClientSalix = ApiUtilsSalix.getAPIService();
setViews(); setViews();
checkPendingSigns(); checkPendingSigns();
//Log.i("VERDNATURA","Se le pasa la ruta "+route.getId()); //Log.i("VERDNATURA","Se le pasa la ruta "+route.getId());
@ -104,9 +112,15 @@ public class Tickets extends AppCompatActivity {
if (pos < listData.size()) { if (pos < listData.size()) {
Utils.progressBar.show(this, getResources().getString(R.string.please_wait)); Utils.progressBar.show(this, getResources().getString(R.string.please_wait));
final Tickets that = this; final Tickets that = this;
Object[] args = new Object[1]; String token = Utils.getTokenUser(that);
args[0] = listData.get(pos); File file = new File(listData.get(pos).getSign());
restClient.saveSign(Utils.getMapWhitUser(this), args).enqueue(new Callback<Void>() { MultipartBody.Part filePart = MultipartBody.Part.createFormData("file", file.getName(), RequestBody.create(MediaType.parse("image/png"), file));
Map<String, String> queryMap = new HashMap<>();
queryMap.put("tickets", listData.get(pos).getTickets().toString());
queryMap.put("location", new Gson().toJson(listData.get(pos).getLocation()));
queryMap.put("signedTime", listData.get(pos).getSignedTime());
restClientSalix.saveSign(token, filePart, queryMap).enqueue(new Callback<Void>() {
@Override @Override
public void onResponse(Call<Void> call, Response<Void> response) { public void onResponse(Call<Void> call, Response<Void> response) {
Utils.progressBar.getDialog().dismiss(); Utils.progressBar.getDialog().dismiss();
@ -120,7 +134,6 @@ public class Tickets extends AppCompatActivity {
} else { } else {
//Log.i("ERROR", "error al guardar"); //Log.i("ERROR", "error al guardar");
Utils.showErrorDialog(that, that.getResources().getString(R.string.error_conexion));
getData(pos); getData(pos);
} }
} }
@ -129,6 +142,7 @@ public class Tickets extends AppCompatActivity {
public void onFailure(Call<Void> call, Throwable t) { public void onFailure(Call<Void> call, Throwable t) {
Utils.progressBar.getDialog().dismiss(); Utils.progressBar.getDialog().dismiss();
getData(pos); getData(pos);
Utils.showErrorDialog(that,t.getMessage());
} }
}); });
} else { } else {

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

@ -7,9 +7,9 @@ public class ApiUtils {
//public static final String BASE_URL = "http://10.1.4.42:9000/"; //public static final String BASE_URL = "http://10.1.4.42:9000/";
//public static final String BASE_URL = "http://192.168.1.128:9000/"; //public static final String BASE_URL = "http://192.168.1.128:9000/";
//public static final String BASE_URL = "https://test-app.verdnatura.es/"; public static final String BASE_URL = "http://10.0.2.2:8080/";
public static final String BASE_URL = "https://app.verdnatura.es/"; //public static final String BASE_URL = "https://test-app.verdnatura.es/";
public static RestClient getAPIService() { public static RestClient getAPIService() {
return RetrofitClient.getClient(BASE_URL).create(RestClient.class); return RetrofitClient.getClient(BASE_URL).create(RestClient.class);

4
app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/ApiUtilsSalix.java
View File

@ -6,9 +6,9 @@ public class ApiUtilsSalix {
private ApiUtilsSalix() {} private ApiUtilsSalix() {}
public static final String BASE_URL_SALIX = "https://salix.verdnatura.es/"; //public static final String BASE_URL_SALIX = "https://salix.verdnatura.es/";
//public static final String BASE_URL_SALIX = "https://test-salix.verdnatura.es/"; //public static final String BASE_URL_SALIX = "https://test-salix.verdnatura.es/";
// public static final String BASE_URL_SALIX = "http://localhost:3000/"; public static final String BASE_URL_SALIX = "http://10.0.2.2:3000/";
public static RestClientSalix getAPIService() { public static RestClientSalix getAPIService() {
return RetrofitClientSalix.getClient(BASE_URL_SALIX).create(RestClientSalix.class); return RetrofitClientSalix.getClient(BASE_URL_SALIX).create(RestClientSalix.class);
} }

37
app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/Utils.java
View File

@ -8,6 +8,7 @@ import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.pm.PackageInfo; import android.content.pm.PackageInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.preference.PreferenceManager;
import android.provider.Settings; import android.provider.Settings;
import android.text.InputType; import android.text.InputType;
import android.util.Log; import android.util.Log;
@ -64,12 +65,20 @@ public class Utils {
return map; return map;
} }
public static Map<String, String> getMapSalix(String user, String password) { public static Map<String, String> getMapLoginSalix(String user, String password) {
map.put("version", "1"); mapSalix.put("version", "1");
map.put("aplicacion", "json"); mapSalix.put("aplicacion", "json");
map.put("user", user); mapSalix.put("user", user);
map.put("pass", password); mapSalix.put("pass", password);
map.put("Content-Type", "application/json"); mapSalix.put("Content-Type", "application/json");
return mapSalix;
}
public static Map<String, String> getMapSalix(String token) {
mapSalix.put("version", "1");
mapSalix.put("aplicacion", "json");
mapSalix.put("Authorization", token);
mapSalix.put("Content-Type", " multipart/form-data");
return mapSalix; return mapSalix;
} }
@ -123,7 +132,6 @@ public class Utils {
AlertDialog alert11 = builder1.create(); AlertDialog alert11 = builder1.create();
alert11.show(); alert11.show();
} }
public static void showInputDialogExpedition(final Context context, String title) { public static void showInputDialogExpedition(final Context context, String title) {
AlertDialog.Builder builder = new AlertDialog.Builder(context); AlertDialog.Builder builder = new AlertDialog.Builder(context);
builder.setTitle(title); builder.setTitle(title);
@ -150,7 +158,6 @@ public class Utils {
builder.show(); builder.show();
} }
public static void saveIdUser(Context context, String idUser) { public static void saveIdUser(Context context, String idUser) {
sp = context.getSharedPreferences("delivery", Activity.MODE_PRIVATE); sp = context.getSharedPreferences("delivery", Activity.MODE_PRIVATE);
SharedPreferences.Editor editor = sp.edit(); SharedPreferences.Editor editor = sp.edit();
@ -158,13 +165,18 @@ public class Utils {
editor.commit(); editor.commit();
} }
public static void saveTokenUser(Context context, String idUser) { public static void saveTokenUser(Context context, String token) {
sp = context.getSharedPreferences("delivery", Activity.MODE_PRIVATE); sp = PreferenceManager.getDefaultSharedPreferences(context);
SharedPreferences.Editor editor = sp.edit(); SharedPreferences.Editor editor = sp.edit();
editor.putString("idToken", idUser); editor.putString("idToken", token);
editor.commit(); editor.commit();
} }
public static String getTokenUser(Context context) {
sp = PreferenceManager.getDefaultSharedPreferences(context);
return sp.getString("idToken", "notoken");
}
public static void saveIdUserLogin(Context context, String idUser) { public static void saveIdUserLogin(Context context, String idUser) {
sp = context.getSharedPreferences("deliveryLogin", Activity.MODE_PRIVATE); sp = context.getSharedPreferences("deliveryLogin", Activity.MODE_PRIVATE);
SharedPreferences.Editor editor = sp.edit(); SharedPreferences.Editor editor = sp.edit();
@ -172,7 +184,6 @@ public class Utils {
editor.commit(); editor.commit();
} }
public static String getIdUserLogin(Context context) { public static String getIdUserLogin(Context context) {
sp = context.getSharedPreferences("deliveryLogin", Activity.MODE_PRIVATE); sp = context.getSharedPreferences("deliveryLogin", Activity.MODE_PRIVATE);
return sp.getString("idUserLogin", "nouser"); return sp.getString("idUserLogin", "nouser");
@ -192,12 +203,10 @@ public class Utils {
sp = context.getSharedPreferences("delivery", Activity.MODE_PRIVATE); sp = context.getSharedPreferences("delivery", Activity.MODE_PRIVATE);
return sp.getString("user", "nouser"); return sp.getString("user", "nouser");
} }
public static String getPass(Context context) { public static String getPass(Context context) {
sp = context.getSharedPreferences("delivery", Activity.MODE_PRIVATE); sp = context.getSharedPreferences("delivery", Activity.MODE_PRIVATE);
return sp.getString("pass", ""); return sp.getString("pass", "");
} }
public static String getIdUser(Context context) { public static String getIdUser(Context context) {
sp = context.getSharedPreferences("delivery", Activity.MODE_PRIVATE); sp = context.getSharedPreferences("delivery", Activity.MODE_PRIVATE);
return sp.getString("idUser", "nouser"); return sp.getString("idUser", "nouser");

4
local.properties
View File

@ -4,5 +4,5 @@
# Location of the SDK. This is only used by Gradle. # Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the # For customization when using a Version Control System, please read the
# header note. # header note.
#Thu May 06 17:26:13 CEST 2021 #Wed Feb 15 07:35:16 CET 2023
sdk.dir=C\:\\Users\\sergiodt\\AppData\\Local\\Android\\Sdk sdk.dir=C\:\\Users\\alexandre\\AppData\\Local\\Android\\Sdk