Versión 6.1.8.5 no lanzada.Con actualización libreria koin 2.1.6,cambiadas funciones deprecated,borrados resources que no se utilizaban, quitados databinding de layouts.
This commit is contained in:
parent
0a8e6e6330
commit
cf72038ee4
|
|
@ -1,6 +1,7 @@
|
||||||
<component name="ProjectCodeStyleConfiguration">
|
<component name="ProjectCodeStyleConfiguration">
|
||||||
<code_scheme name="Project" version="173">
|
<code_scheme name="Project" version="173">
|
||||||
<JetCodeStyleSettings>
|
<JetCodeStyleSettings>
|
||||||
|
<option name="LBRACE_ON_NEXT_LINE" value="true" />
|
||||||
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
|
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
|
||||||
</JetCodeStyleSettings>
|
</JetCodeStyleSettings>
|
||||||
<codeStyleSettings language="XML">
|
<codeStyleSettings language="XML">
|
||||||
|
|
@ -120,6 +121,7 @@
|
||||||
<option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
|
<option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
|
||||||
<option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
|
<option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
|
||||||
<option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="1" />
|
<option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="1" />
|
||||||
|
<option name="ALIGN_MULTILINE_METHOD_BRACKETS" value="true" />
|
||||||
</codeStyleSettings>
|
</codeStyleSettings>
|
||||||
</code_scheme>
|
</code_scheme>
|
||||||
</component>
|
</component>
|
||||||
|
|
@ -3,11 +3,15 @@
|
||||||
<component name="DesignSurface">
|
<component name="DesignSurface">
|
||||||
<option name="filePathToZoomLevelMap">
|
<option name="filePathToZoomLevelMap">
|
||||||
<map>
|
<map>
|
||||||
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable-v24/background_gradient.xml" value="0.1" />
|
||||||
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable-v24/ic_launcher_foreground.xml" value="0.13541666666666666" />
|
||||||
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable-v24/selector_bottombar_text.xml" value="0.13541666666666666" />
|
||||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/alpha_b_circle_outline.xml" value="0.2359375" />
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/alpha_b_circle_outline.xml" value="0.2359375" />
|
||||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/alpha_f_circle_outline.xml" value="0.1" />
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/alpha_f_circle_outline.xml" value="0.1" />
|
||||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/background_oval_checked.xml" value="0.2359375" />
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/background_oval_checked.xml" value="0.2359375" />
|
||||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/barcode.xml" value="0.2359375" />
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/barcode.xml" value="0.2359375" />
|
||||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/barcode_scan.xml" value="0.1" />
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/barcode_scan.xml" value="0.1" />
|
||||||
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/border_parental.xml" value="0.11979166666666667" />
|
||||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/buffer_accumulate.xml" value="0.18489583333333334" />
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/buffer_accumulate.xml" value="0.18489583333333334" />
|
||||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/buffer_accumulation.xml" value="0.19814814814814816" />
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/buffer_accumulation.xml" value="0.19814814814814816" />
|
||||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/buffer_desactivate.xml" value="0.1" />
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/buffer_desactivate.xml" value="0.1" />
|
||||||
|
|
@ -17,12 +21,38 @@
|
||||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/buffer_off.xml" value="0.1" />
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/buffer_off.xml" value="0.1" />
|
||||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/buffer_outline.xml" value="0.22407407407407406" />
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/buffer_outline.xml" value="0.22407407407407406" />
|
||||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/car_control.xml" value="0.22407407407407406" />
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/car_control.xml" value="0.22407407407407406" />
|
||||||
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/circleshape.xml" value="0.11979166666666667" />
|
||||||
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/component_progress.xml" value="0.11979166666666667" />
|
||||||
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/delete.xml" value="0.19166666666666668" />
|
||||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/face_man_outline.xml" value="0.22708333333333333" />
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/face_man_outline.xml" value="0.22708333333333333" />
|
||||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/filter_outline.xml" value="0.22239583333333332" />
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/filter_outline.xml" value="0.22239583333333332" />
|
||||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_add_black_24dp.xml" value="0.22708333333333333" />
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_add_black_24dp.xml" value="0.22708333333333333" />
|
||||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_arrow_back_black_24dp.xml" value="0.22708333333333333" />
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_arrow_back_black_24dp.xml" value="0.22708333333333333" />
|
||||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_arrow_drop_down_black_24dp.xml" value="0.22708333333333333" />
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_arrow_drop_down_black_24dp.xml" value="0.22708333333333333" />
|
||||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_build_black_24dp.xml" value="0.22708333333333333" />
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_build_black_24dp.xml" value="0.22708333333333333" />
|
||||||
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_delete_black_24dp.xml" value="0.15052083333333333" />
|
||||||
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_delete_forever_black_24dp.xml" value="0.15052083333333333" />
|
||||||
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_device_hub_black_24dp_selected.xml" value="0.15052083333333333" />
|
||||||
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_flash_auto_black_24dp.xml" value="0.15052083333333333" />
|
||||||
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_history_black_24dp.xml" value="0.15052083333333333" />
|
||||||
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_launcher_background.xml" value="0.24010416666666667" />
|
||||||
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_local_florist_black_24dp.xml" value="0.15052083333333333" />
|
||||||
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_local_florist_black_24dp_selected.xml" value="0.21041666666666667" />
|
||||||
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_local_parking_black_24dp.xml" value="0.21041666666666667" />
|
||||||
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_local_parking_orange_24dp.xml" value="0.21041666666666667" />
|
||||||
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_local_shipping_black_24dp.xml" value="0.11979166666666667" />
|
||||||
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_local_shipping_black_24dp_selected.xml" value="0.11979166666666667" />
|
||||||
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_loyalty_black_24dp.xml" value="0.21041666666666667" />
|
||||||
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_mode_edit_black_24dp.xml" value="0.15052083333333333" />
|
||||||
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_move_to_inbox_black_24dp.xml" value="0.15052083333333333" />
|
||||||
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_playlist_add_black_24dp.xml" value="0.15052083333333333" />
|
||||||
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_print_black_24dp.xml" value="0.15052083333333333" />
|
||||||
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_spa_black_24dp.xml" value="0.15052083333333333" />
|
||||||
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_spa_black_launcher.xml" value="0.19479166666666667" />
|
||||||
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_star_ko.xml" value="0.15052083333333333" />
|
||||||
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_start_ok.xml" value="0.15052083333333333" />
|
||||||
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_streetview_black_24dp.xml" value="0.15052083333333333" />
|
||||||
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_swap_horiz_black_24dp.xml" value="0.11979166666666667" />
|
||||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_transaction.xml" value="0.22708333333333333" />
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_transaction.xml" value="0.22708333333333333" />
|
||||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_verified_user_black_24dp.xml" value="0.1" />
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_verified_user_black_24dp.xml" value="0.1" />
|
||||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_verified_user_black_24dp_selected.xml" value="0.1" />
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_verified_user_black_24dp_selected.xml" value="0.1" />
|
||||||
|
|
@ -33,7 +63,13 @@
|
||||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/pallet_shipping_black.xml" value="0.1" />
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/pallet_shipping_black.xml" value="0.1" />
|
||||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/pallet_shipping_selected.xml" value="0.1" />
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/pallet_shipping_selected.xml" value="0.1" />
|
||||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/qrcode_scan.xml" value="0.17395833333333333" />
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/qrcode_scan.xml" value="0.17395833333333333" />
|
||||||
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/round_av_timer_24.xml" value="0.15052083333333333" />
|
||||||
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/round_outline.xml" value="0.11979166666666667" />
|
||||||
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/walk.xml" value="0.10885416666666667" />
|
||||||
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/activity_imageview.xml" value="0.134375" />
|
||||||
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/activity_login.xml" value="0.134375" />
|
||||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/activity_main.xml" value="0.17916666666666667" />
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/activity_main.xml" value="0.17916666666666667" />
|
||||||
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/buyers_fragment.xml" value="0.18333333333333332" />
|
||||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_ajustes.xml" value="0.3333333333333333" />
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_ajustes.xml" value="0.3333333333333333" />
|
||||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_automatic_add_item.xml" value="0.20625" />
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_automatic_add_item.xml" value="0.20625" />
|
||||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_buffer.xml" value="0.1408514492753623" />
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_buffer.xml" value="0.1408514492753623" />
|
||||||
|
|
@ -52,10 +88,11 @@
|
||||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_itemproposal.xml" value="0.22" />
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_itemproposal.xml" value="0.22" />
|
||||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_login.xml" value="0.22" />
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_login.xml" value="0.22" />
|
||||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_paletizador_menu.xml" value="0.13829787234042554" />
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_paletizador_menu.xml" value="0.13829787234042554" />
|
||||||
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_parking.xml" value="0.5" />
|
||||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_pasillero.xml" value="0.13829787234042554" />
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_pasillero.xml" value="0.13829787234042554" />
|
||||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_qr.xml" value="0.19882246376811594" />
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_qr.xml" value="0.19882246376811594" />
|
||||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_sacador_associatesmarttag.xml" value="0.22" />
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_sacador_associatesmarttag.xml" value="0.22" />
|
||||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_smarttag_register.xml" value="0.3333333333333333" />
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_smarttag_register.xml" value="0.3118811881188119" />
|
||||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_transferencia.xml" value="0.1" />
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_transferencia.xml" value="0.1" />
|
||||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_vehiclecontrol.xml" value="0.1546875" />
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_vehiclecontrol.xml" value="0.1546875" />
|
||||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_vehiclecontrol_user.xml" value="0.23052536231884058" />
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_vehiclecontrol_user.xml" value="0.23052536231884058" />
|
||||||
|
|
@ -64,14 +101,17 @@
|
||||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_card_row.xml" value="0.2269021739130435" />
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_card_row.xml" value="0.2269021739130435" />
|
||||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_expeditionstate_row.xml" value="0.23489583333333333" />
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_expeditionstate_row.xml" value="0.23489583333333333" />
|
||||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_inventary_row.xml" value="0.22604166666666667" />
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_inventary_row.xml" value="0.22604166666666667" />
|
||||||
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_location_row.xml" value="0.16875" />
|
||||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_pasilleros_main_menu.xml" value="0.13829787234042554" />
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_pasilleros_main_menu.xml" value="0.13829787234042554" />
|
||||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_proposal_row.xml" value="0.22604166666666667" />
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_proposal_row.xml" value="0.22604166666666667" />
|
||||||
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_reposicion.xml" value="0.1" />
|
||||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_smarttag_row.xml" value="0.20153985507246377" />
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_smarttag_row.xml" value="0.20153985507246377" />
|
||||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_worker_image.xml" value="0.23177083333333334" />
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_worker_image.xml" value="0.23177083333333334" />
|
||||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/toolbar.xml" value="0.15353260869565216" />
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/toolbar.xml" value="0.15353260869565216" />
|
||||||
</map>
|
</map>
|
||||||
</option>
|
</option>
|
||||||
</component>
|
</component>
|
||||||
|
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
||||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
|
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
|
||||||
<output url="file://$PROJECT_DIR$/build/classes" />
|
<output url="file://$PROJECT_DIR$/build/classes" />
|
||||||
</component>
|
</component>
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
apply plugin: 'com.android.application'
|
apply plugin: 'com.android.application'
|
||||||
apply plugin: 'kotlin-android'
|
apply plugin: 'kotlin-android'
|
||||||
apply plugin: 'kotlin-android-extensions'
|
apply plugin: 'kotlin-android-extensions'//deprecated:sergio
|
||||||
apply plugin: 'kotlin-kapt'
|
apply plugin: 'kotlin-kapt'
|
||||||
apply plugin: 'com.google.gms.google-services'
|
apply plugin: 'com.google.gms.google-services'
|
||||||
apply plugin: 'com.google.firebase.crashlytics'
|
apply plugin: 'com.google.firebase.crashlytics'
|
||||||
|
|
@ -33,6 +33,9 @@ android {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
buildFeatures {
|
||||||
|
viewBinding = false
|
||||||
|
}
|
||||||
dataBinding {
|
dataBinding {
|
||||||
enabled = true
|
enabled = true
|
||||||
}
|
}
|
||||||
|
|
@ -44,6 +47,9 @@ android {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation fileTree(dir: 'libs', include: ['*.jar'])
|
implementation fileTree(dir: 'libs', include: ['*.jar'])
|
||||||
debugImplementation fileTree(dir: 'libs/debug', include: ['*.jar'])
|
debugImplementation fileTree(dir: 'libs/debug', include: ['*.jar'])
|
||||||
|
|
@ -68,7 +74,7 @@ dependencies {
|
||||||
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.0.0'
|
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.0.0'
|
||||||
|
|
||||||
//preferences
|
//preferences
|
||||||
implementation 'androidx.preference:preference:1.1.1'
|
implementation 'androidx.preference:preference-ktx:1.1.1'
|
||||||
|
|
||||||
//Fragments
|
//Fragments
|
||||||
implementation("androidx.fragment:fragment-ktx:1.3.6")
|
implementation("androidx.fragment:fragment-ktx:1.3.6")
|
||||||
|
|
@ -80,11 +86,20 @@ dependencies {
|
||||||
implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle"
|
implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle"
|
||||||
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
|
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
|
||||||
|
|
||||||
|
|
||||||
|
//Koin new resolve
|
||||||
|
//kotlin implementation in mavencentral--> jcenter deprecated
|
||||||
|
|
||||||
|
implementation "io.insert-koin:koin-core:$koin"
|
||||||
|
implementation "io.insert-koin:koin-android:$koin"
|
||||||
|
implementation "io.insert-koin:koin-androidx-scope:$koin"
|
||||||
|
implementation "io.insert-koin:koin-androidx-viewmodel:$koin"
|
||||||
|
|
||||||
// Koin for DI
|
// Koin for DI
|
||||||
implementation "org.koin:koin-core:$koin"
|
//implementation "org.koin:koin-core:$koin"
|
||||||
implementation "org.koin:koin-android:$koin"
|
//implementation "org.koin:koin-android:$koin"
|
||||||
implementation "org.koin:koin-androidx-scope:$koin"
|
//implementation "org.koin:koin-androidx-scope:$koin"
|
||||||
implementation "org.koin:koin-androidx-viewmodel:$koin"
|
//implementation "org.koin:koin-androidx-viewmodel:$koin"
|
||||||
|
|
||||||
|
|
||||||
// Image libraries
|
// Image libraries
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,17 @@
|
||||||
|
clean_build_2gb_4workers {
|
||||||
|
tasks = [":app:assembleDebug"]
|
||||||
|
gradle-args = ["--max-workers=4"]
|
||||||
|
jvm-args = ["-Xmx2048m"]
|
||||||
|
cleanup-tasks = ["clean"]
|
||||||
|
}
|
||||||
|
clean_build_parallelGC {grad
|
||||||
|
tasks = [":app:assembleDebug"]
|
||||||
|
jvm-args = ["-XX:+UseParallelGC"]
|
||||||
|
cleanup-tasks = ["clean"]
|
||||||
|
}
|
||||||
|
|
||||||
|
clean_build_G1GC_4gb {
|
||||||
|
tasks = [":app:assembleDebug"]
|
||||||
|
jvm-args = ["-Xmx4096m", "-XX:+UseG1GC"]
|
||||||
|
cleanup-tasks = ["clean"]
|
||||||
|
}
|
||||||
Binary file not shown.
Binary file not shown.
|
|
@ -11,8 +11,8 @@
|
||||||
"type": "SINGLE",
|
"type": "SINGLE",
|
||||||
"filters": [],
|
"filters": [],
|
||||||
"attributes": [],
|
"attributes": [],
|
||||||
"versionCode": 73,
|
"versionCode": 74,
|
||||||
"versionName": "6.1.8.4.1",
|
"versionName": "6.1.8.5",
|
||||||
"outputFile": "app-release.apk"
|
"outputFile": "app-release.apk"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ import retrofit2.Call
|
||||||
|
|
||||||
class GetInventaryUserCase(context: Context) : RestClient(context) {
|
class GetInventaryUserCase(context: Context) : RestClient(context) {
|
||||||
|
|
||||||
fun itemShelvingRadar(
|
/* fun itemShelvingRadar(
|
||||||
usuario: String,
|
usuario: String,
|
||||||
password: String,
|
password: String,
|
||||||
sectorFk: String
|
sectorFk: String
|
||||||
|
|
@ -23,7 +23,7 @@ class GetInventaryUserCase(context: Context) : RestClient(context) {
|
||||||
"application/json",
|
"application/json",
|
||||||
params = params
|
params = params
|
||||||
)
|
)
|
||||||
}
|
}*/
|
||||||
|
|
||||||
fun itemShelvingRadarFilterBuyer(
|
fun itemShelvingRadarFilterBuyer(
|
||||||
usuario: String,
|
usuario: String,
|
||||||
|
|
|
||||||
|
|
@ -1,15 +1,14 @@
|
||||||
package es.verdnatura.domain
|
package es.verdnatura.domain
|
||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import es.verdnatura.presentation.view.feature.login.model.LoginDevice
|
import es.verdnatura.presentation.view.feature.login.model.*
|
||||||
import es.verdnatura.presentation.view.feature.login.model.LoginSalixVO
|
|
||||||
import es.verdnatura.presentation.view.feature.login.model.SalixGrupo
|
|
||||||
import es.verdnatura.presentation.view.feature.login.model.versionApp
|
|
||||||
import retrofit2.Call
|
import retrofit2.Call
|
||||||
|
|
||||||
class GetLoginUserCase(context: Context) : RestClient(context) {
|
class GetLoginUserCase(context: Context) : RestClient(context)
|
||||||
|
{
|
||||||
|
|
||||||
fun login(usuario: String, password: String, androiid: String): Call<String> {
|
fun login(usuario: String, password: String, androiid: String): Call<String>
|
||||||
|
{
|
||||||
val params: ArrayList<String> = ArrayList()
|
val params: ArrayList<String> = ArrayList()
|
||||||
params.add(usuario)
|
params.add(usuario)
|
||||||
params.add(password)
|
params.add(password)
|
||||||
|
|
@ -21,7 +20,8 @@ class GetLoginUserCase(context: Context) : RestClient(context) {
|
||||||
usuario: String,
|
usuario: String,
|
||||||
password: String,
|
password: String,
|
||||||
android_id: String
|
android_id: String
|
||||||
): Call<LoginDevice> {
|
): Call<LoginDevice>
|
||||||
|
{
|
||||||
val params: ArrayList<String> = ArrayList()
|
val params: ArrayList<String> = ArrayList()
|
||||||
params.add(usuario)
|
params.add(usuario)
|
||||||
params.add(android_id)
|
params.add(android_id)
|
||||||
|
|
@ -32,10 +32,11 @@ class GetLoginUserCase(context: Context) : RestClient(context) {
|
||||||
password,
|
password,
|
||||||
"application/json",
|
"application/json",
|
||||||
params
|
params
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun worker_getId(usuario: String, password: String): Call<String> {
|
fun worker_getId(usuario: String, password: String): Call<String>
|
||||||
|
{
|
||||||
val params: ArrayList<String> = ArrayList()
|
val params: ArrayList<String> = ArrayList()
|
||||||
return restClient!!.worker_getId("json", "1", usuario, password, "application/json", params)
|
return restClient!!.worker_getId("json", "1", usuario, password, "application/json", params)
|
||||||
}
|
}
|
||||||
|
|
@ -46,7 +47,8 @@ class GetLoginUserCase(context: Context) : RestClient(context) {
|
||||||
app: String,
|
app: String,
|
||||||
versionApp: String,
|
versionApp: String,
|
||||||
android_id: String
|
android_id: String
|
||||||
): Call<Void> {
|
): Call<Void>
|
||||||
|
{
|
||||||
val params: ArrayList<String> = ArrayList()
|
val params: ArrayList<String> = ArrayList()
|
||||||
params.add(app)
|
params.add(app)
|
||||||
params.add(versionApp)
|
params.add(versionApp)
|
||||||
|
|
@ -58,10 +60,11 @@ class GetLoginUserCase(context: Context) : RestClient(context) {
|
||||||
password,
|
password,
|
||||||
"application/json",
|
"application/json",
|
||||||
params
|
params
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun salixLogin(usuario: String, password: String): Call<LoginSalixVO> {
|
fun salixLogin(usuario: String, password: String): Call<LoginSalixVO>
|
||||||
|
{
|
||||||
return salixClient!!.login("application/json", LoginSalixVO(usuario, password))
|
return salixClient!!.login("application/json", LoginSalixVO(usuario, password))
|
||||||
}
|
}
|
||||||
//NODEJS TEST
|
//NODEJS TEST
|
||||||
|
|
@ -70,13 +73,15 @@ class GetLoginUserCase(context: Context) : RestClient(context) {
|
||||||
smarttag: String,
|
smarttag: String,
|
||||||
wagon: String,
|
wagon: String,
|
||||||
shelving: String
|
shelving: String
|
||||||
): Call<NodeJsService.SmartTagNode> {
|
): Call<NodeJsService.SmartTagNode>
|
||||||
|
{
|
||||||
return nodejsClient!!.bindShelving("application/json", "A0A3B8224DBF", "ABC", "2")
|
return nodejsClient!!.bindShelving("application/json", "A0A3B8224DBF", "ABC", "2")
|
||||||
// return nodejsClient!!.bindShelving("application/json", NodeJsService.SmartTagNode(smarttag, wagon, shelving),"A0A3B8224DBF","ABC","2")
|
// return nodejsClient!!.bindShelving("application/json", NodeJsService.SmartTagNode(smarttag, wagon, shelving),"A0A3B8224DBF","ABC","2")
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fun checkVersion_old(usuario: String, password: String, version: String): Call<Boolean> {
|
fun checkVersion_old(usuario: String, password: String, version: String): Call<Boolean>
|
||||||
|
{
|
||||||
val params: ArrayList<String> = ArrayList()
|
val params: ArrayList<String> = ArrayList()
|
||||||
params.add(version)
|
params.add(version)
|
||||||
return restClient!!.version("json", "1", usuario, password, "application/json", params)
|
return restClient!!.version("json", "1", usuario, password, "application/json", params)
|
||||||
|
|
@ -84,22 +89,24 @@ class GetLoginUserCase(context: Context) : RestClient(context) {
|
||||||
|
|
||||||
//SALIX MENSAJE :SERGIO: PARA NO ENVIAR MENSAJES A COMERCIALES PONGO QUE LAS MODIFICACIONES SE ENVIAN AL CANAL CREADO.
|
//SALIX MENSAJE :SERGIO: PARA NO ENVIAR MENSAJES A COMERCIALES PONGO QUE LAS MODIFICACIONES SE ENVIAN AL CANAL CREADO.
|
||||||
|
|
||||||
/* fun sendChekingPresence(token:String,workerId:Int,message:String) : Call<Boolean>{
|
fun sendChekingPresence(token:String,workerId:Int,message:String) : Call<Boolean>{
|
||||||
return salixClient!!.sendChekingPresence(content_type = "application/json", authorization = token, params = SalixMessageVO(workerId = workerId,message = message))
|
return salixClient!!.sendChekingPresence(content_type = "application/json", authorization = token, params = SalixMessageVO(workerId = workerId,message = message))
|
||||||
}*/
|
}
|
||||||
// SERGIO: PARA DESARROLLO Y PRUEBAS SE DESCOMENTA ESTAS LÍNEAS Y SE COMENTAN LAS DE ARRIBA
|
// SERGIO: PARA DESARROLLO Y PRUEBAS SE DESCOMENTA ESTAS LÍNEAS Y SE COMENTAN LAS DE ARRIBA
|
||||||
fun sendChekingPresence(token: String, workerId: Int, message: String): Call<Boolean> {
|
/* fun sendChekingPresence(token: String, workerId: Int, message: String): Call<Boolean>
|
||||||
return salixClient!!.sendGroup(
|
{
|
||||||
content_type = "application/json",
|
return salixClient!!.sendGroup(
|
||||||
authorization = token,
|
content_type = "application/json",
|
||||||
params = SalixGrupo(to = "#android-test", message = message)
|
authorization = token,
|
||||||
)
|
params = SalixGrupo(to = "#android-test", message = message)
|
||||||
}
|
)
|
||||||
|
}*/
|
||||||
|
|
||||||
fun checkVersion(usuario: String, password: String, nameApp: String): Call<versionApp> {
|
fun checkVersion(usuario: String, password: String, nameApp: String): Call<versionApp>
|
||||||
val params: ArrayList<String> = ArrayList()
|
{
|
||||||
params.add(nameApp)
|
val params: ArrayList<String> = ArrayList()
|
||||||
return restClient!!.getVersion("json", "1", usuario, password, "application/json", params)
|
params.add(nameApp)
|
||||||
}
|
return restClient!!.getVersion("json", "1", usuario, password, "application/json", params)
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
@ -43,14 +43,14 @@ class GetSacadorControladorUserCase(context: Context) : RestClient(context) {
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun ticket_checkFullyControlled(
|
fun ticketOrCollection_checkFullyControlled(
|
||||||
usuario: String,
|
usuario: String,
|
||||||
password: String,
|
password: String,
|
||||||
collectionFk: String
|
collectionFk: String
|
||||||
): Call<String> {
|
): Call<String> {
|
||||||
val params: ArrayList<String> = ArrayList()
|
val params: ArrayList<String> = ArrayList()
|
||||||
params.add(collectionFk)
|
params.add(collectionFk)
|
||||||
return restClient!!.ticket_checkFullyControlled(
|
return restClient!!.ticketOrCollection_checkFullyControlled(
|
||||||
"json",
|
"json",
|
||||||
"1",
|
"1",
|
||||||
usuario,
|
usuario,
|
||||||
|
|
|
||||||
|
|
@ -9,12 +9,10 @@ class GetVehicleControlTimeUserCase(context: Context) : RestClient(context) {
|
||||||
fun machineWorker_add(
|
fun machineWorker_add(
|
||||||
usuario: String,
|
usuario: String,
|
||||||
password: String,
|
password: String,
|
||||||
plateNumber: String,
|
plateNumber: String
|
||||||
workerFk: String
|
|
||||||
): Call<Boolean> {
|
): Call<Boolean> {
|
||||||
val params: ArrayList<String> = ArrayList()
|
val params: ArrayList<String> = ArrayList()
|
||||||
params.add(plateNumber)
|
params.add(plateNumber)
|
||||||
params.add(workerFk)
|
|
||||||
return restClient!!.machineWorker_add(
|
return restClient!!.machineWorker_add(
|
||||||
"json",
|
"json",
|
||||||
"1",
|
"1",
|
||||||
|
|
@ -28,12 +26,10 @@ class GetVehicleControlTimeUserCase(context: Context) : RestClient(context) {
|
||||||
fun machineWorker_update(
|
fun machineWorker_update(
|
||||||
usuario: String,
|
usuario: String,
|
||||||
password: String,
|
password: String,
|
||||||
plateNumber: String,
|
plateNumber: String
|
||||||
workerFk: String
|
|
||||||
): Call<Boolean> {
|
): Call<Boolean> {
|
||||||
val params: ArrayList<String> = ArrayList()
|
val params: ArrayList<String> = ArrayList()
|
||||||
params.add(plateNumber)
|
params.add(plateNumber)
|
||||||
params.add(workerFk)
|
|
||||||
return restClient!!.machineWorker_update(
|
return restClient!!.machineWorker_update(
|
||||||
"json",
|
"json",
|
||||||
"1",
|
"1",
|
||||||
|
|
@ -44,26 +40,13 @@ class GetVehicleControlTimeUserCase(context: Context) : RestClient(context) {
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun machineWorker_Worker(usuario: String, password: String, userFk: String): Call<String> {
|
|
||||||
val params: ArrayList<String> = ArrayList()
|
|
||||||
params.add(userFk)
|
|
||||||
return restClient!!.machineWorker_Worker(
|
|
||||||
"json",
|
|
||||||
"1",
|
|
||||||
usuario,
|
|
||||||
password,
|
|
||||||
"application/json",
|
|
||||||
params
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun workerMachinery_isRegistered(
|
fun workerMachinery_isRegistered(
|
||||||
usuario: String,
|
usuario: String,
|
||||||
password: String,
|
password: String
|
||||||
userFk: String
|
|
||||||
): Call<String> {
|
): Call<String> {
|
||||||
val params: ArrayList<String> = ArrayList()
|
val params: ArrayList<String> = ArrayList()
|
||||||
params.add(userFk)
|
|
||||||
return restClient!!.workerMachinery_isRegistered(
|
return restClient!!.workerMachinery_isRegistered(
|
||||||
"json",
|
"json",
|
||||||
"1",
|
"1",
|
||||||
|
|
@ -74,26 +57,9 @@ class GetVehicleControlTimeUserCase(context: Context) : RestClient(context) {
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun deviceProduction_getdeviceNameFromUser(
|
|
||||||
usuario: String,
|
|
||||||
password: String,
|
|
||||||
userFk: String
|
|
||||||
): Call<String> {
|
|
||||||
val params: ArrayList<String> = ArrayList()
|
|
||||||
params.add(userFk)
|
|
||||||
return restClient!!.deviceProduction_getdeviceNameFromUser(
|
|
||||||
"json",
|
|
||||||
"1",
|
|
||||||
usuario,
|
|
||||||
password,
|
|
||||||
"application/json",
|
|
||||||
params
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun machine_getWorkerPlate(usuario: String, password: String, userFk: String): Call<String> {
|
fun machine_getWorkerPlate(usuario: String, password: String): Call<String> {
|
||||||
val params: ArrayList<String> = ArrayList()
|
val params: ArrayList<String> = ArrayList()
|
||||||
params.add(userFk)
|
|
||||||
return restClient!!.machine_getWorkerPlate(
|
return restClient!!.machine_getWorkerPlate(
|
||||||
"json",
|
"json",
|
||||||
"1",
|
"1",
|
||||||
|
|
@ -124,10 +90,10 @@ class GetVehicleControlTimeUserCase(context: Context) : RestClient(context) {
|
||||||
fun deviceProduction_getnameDevice(
|
fun deviceProduction_getnameDevice(
|
||||||
usuario: String,
|
usuario: String,
|
||||||
password: String,
|
password: String,
|
||||||
userFk: String
|
android_id: String
|
||||||
): Call<String> {
|
): Call<String> {
|
||||||
val params: ArrayList<String> = ArrayList()
|
val params: ArrayList<String> = ArrayList()
|
||||||
params.add(userFk)
|
params.add(android_id)
|
||||||
return restClient!!.deviceProduction_getnameDevice(
|
return restClient!!.deviceProduction_getnameDevice(
|
||||||
"json",
|
"json",
|
||||||
"1",
|
"1",
|
||||||
|
|
@ -141,12 +107,10 @@ class GetVehicleControlTimeUserCase(context: Context) : RestClient(context) {
|
||||||
fun machineWorker_getHistorical(
|
fun machineWorker_getHistorical(
|
||||||
usuario: String,
|
usuario: String,
|
||||||
password: String,
|
password: String,
|
||||||
PlateNumber: String,
|
PlateNumber: String
|
||||||
nameWorker: String
|
|
||||||
): Call<List<ItemHistoricoVehiculo>> {
|
): Call<List<ItemHistoricoVehiculo>> {
|
||||||
val params: ArrayList<String> = ArrayList()
|
val params: ArrayList<String> = ArrayList()
|
||||||
params.add(PlateNumber)
|
params.add(PlateNumber)
|
||||||
params.add(nameWorker)
|
|
||||||
return restClient!!.machineWorker_getHistorical(
|
return restClient!!.machineWorker_getHistorical(
|
||||||
"json",
|
"json",
|
||||||
"1",
|
"1",
|
||||||
|
|
|
||||||
|
|
@ -32,7 +32,7 @@ import retrofit2.http.POST
|
||||||
interface VerdnaturaService {
|
interface VerdnaturaService {
|
||||||
|
|
||||||
//LOGIN ========================================================================>
|
//LOGIN ========================================================================>
|
||||||
@POST("security/login")
|
@POST("security/login")//REVISADA
|
||||||
fun login(
|
fun login(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -43,7 +43,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<String>
|
Call<String>
|
||||||
|
|
||||||
@POST("security/device_checkLogin")
|
@POST("security/device_checkLogin")//REVISADA
|
||||||
fun device_checkLogin(
|
fun device_checkLogin(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -54,7 +54,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<LoginDevice>
|
Call<LoginDevice>
|
||||||
|
|
||||||
@POST("almacennew/worker_getId")
|
@POST("almacennew/worker_getId")//REVISADA
|
||||||
fun worker_getId(
|
fun worker_getId(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -65,7 +65,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<String>
|
Call<String>
|
||||||
|
|
||||||
@POST("almacennew/deviceLog_add")
|
@POST("almacennew/deviceLog_add")//REVISADA
|
||||||
fun deviceLog_add(
|
fun deviceLog_add(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -76,7 +76,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<Void>
|
Call<Void>
|
||||||
|
|
||||||
@POST("almacennew/version")
|
@POST("almacennew/version")//REVISADA
|
||||||
fun version(
|
fun version(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -87,7 +87,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<Boolean>
|
Call<Boolean>
|
||||||
|
|
||||||
@POST("/security/getVersion")
|
@POST("/security/getVersion")//REVISADA
|
||||||
fun getVersion(
|
fun getVersion(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -99,7 +99,7 @@ interface VerdnaturaService {
|
||||||
Call<versionApp>
|
Call<versionApp>
|
||||||
|
|
||||||
//AJUSTES ========================================================================>
|
//AJUSTES ========================================================================>
|
||||||
@POST("almacennew/sector_get")
|
@POST("almacennew/sector_get")//REVISADA
|
||||||
fun getSectors(
|
fun getSectors(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -111,7 +111,7 @@ interface VerdnaturaService {
|
||||||
|
|
||||||
//PRESACADORES ========================================================================>
|
//PRESACADORES ========================================================================>
|
||||||
|
|
||||||
@POST("almacennew/ticketToPrePrepare")
|
@POST("almacennew/ticketToPrePrepare")//REVISADA
|
||||||
fun ticketToPrePrepare(
|
fun ticketToPrePrepare(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -122,7 +122,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<List<PreSacadorItemVO>>
|
Call<List<PreSacadorItemVO>>
|
||||||
|
|
||||||
@POST("almacennew/itemPlacementSupplyGetOrder")
|
@POST("almacennew/itemPlacementSupplyGetOrder")//REVISADA
|
||||||
fun itemPlacementSupplyGetOrder(
|
fun itemPlacementSupplyGetOrder(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -133,7 +133,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<List<PreSacadorItemVO>>
|
Call<List<PreSacadorItemVO>>
|
||||||
|
|
||||||
@POST("almacennew/itemPlacementSupplyCloseOrder")
|
@POST("almacennew/itemPlacementSupplyCloseOrder")//REVISADA
|
||||||
fun itemPlacementSupplyCloseOrder(
|
fun itemPlacementSupplyCloseOrder(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -145,7 +145,7 @@ interface VerdnaturaService {
|
||||||
Call<String>
|
Call<String>
|
||||||
|
|
||||||
//SACADORES / CONTROLADORES ========================================================================>
|
//SACADORES / CONTROLADORES ========================================================================>
|
||||||
@POST("almacennew/collectionGet")
|
@POST("almacennew/collectionGet") //REVISADA
|
||||||
fun collectionGet(
|
fun collectionGet(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -155,7 +155,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<List<CollectionVO>>
|
Call<List<CollectionVO>>
|
||||||
|
|
||||||
@POST("almacennew/collectionNew")
|
@POST("almacennew/collectionNew")//REVISADA
|
||||||
fun collectionNew(
|
fun collectionNew(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -166,7 +166,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<String>
|
Call<String>
|
||||||
|
|
||||||
@POST("almacennew/collectionTicketGet")
|
@POST("almacennew/collectionTicketGet")//REVISADA
|
||||||
fun collectionTicketGet(
|
fun collectionTicketGet(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -177,8 +177,8 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<CollectionVO>
|
Call<CollectionVO>
|
||||||
|
|
||||||
@POST("almacennew/ticketOrCollection_checkFullyControlled")
|
@POST("almacennew/ticketOrCollection_checkFullyControlled")//REVISADA
|
||||||
fun ticket_checkFullyControlled(
|
fun ticketOrCollection_checkFullyControlled(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
@Header("user") user: String,
|
@Header("user") user: String,
|
||||||
|
|
@ -189,7 +189,7 @@ interface VerdnaturaService {
|
||||||
Call<String>
|
Call<String>
|
||||||
|
|
||||||
//sergio: de momento se separa para ir viendo como funciona. El precontrol llamara a collectionTicketGet con otro parametro.
|
//sergio: de momento se separa para ir viendo como funciona. El precontrol llamara a collectionTicketGet con otro parametro.
|
||||||
@POST("almacennew/collection_getTickets")
|
@POST("almacennew/collection_getTickets")//REVISADA
|
||||||
fun collection_getTickets(
|
fun collection_getTickets(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -200,7 +200,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<CollectionVO>
|
Call<CollectionVO>
|
||||||
|
|
||||||
@POST("almacennew/saleTrackingReplace")
|
@POST("almacennew/saleTrackingReplace")//REVISADA
|
||||||
fun saleTrackingReplace(
|
fun saleTrackingReplace(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -211,7 +211,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<String>
|
Call<String>
|
||||||
|
|
||||||
@POST("almacennew/itemPlacementSupplyAiming")
|
@POST("almacennew/itemPlacementSupplyAiming")//REVISADA
|
||||||
fun itemPlacementSupplyAiming(
|
fun itemPlacementSupplyAiming(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -222,7 +222,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<List<PlacementSupplyVO>>
|
Call<List<PlacementSupplyVO>>
|
||||||
|
|
||||||
@POST("almacennew/itemShelvingSaleSupplyAdd")
|
@POST("almacennew/itemShelvingSaleSupplyAdd")//REVISADA
|
||||||
fun itemShelvingSaleSupplyAdd(
|
fun itemShelvingSaleSupplyAdd(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -233,7 +233,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<String>
|
Call<String>
|
||||||
|
|
||||||
@POST("almacennew/itemShelvingPlacementSupplyAdd")
|
@POST("almacennew/itemShelvingPlacementSupplyAdd")//REVISADA
|
||||||
fun itemShelvingPlacementSupplyAdd(
|
fun itemShelvingPlacementSupplyAdd(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -244,7 +244,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<String>
|
Call<String>
|
||||||
|
|
||||||
@POST("almacennew/collectionStickerPrint")
|
@POST("almacennew/collectionStickerPrint")//REVISADA
|
||||||
fun collectionStickerPrint(
|
fun collectionStickerPrint(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -255,7 +255,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<String>
|
Call<String>
|
||||||
|
|
||||||
@POST("almacennew/itemGetAvailable")
|
@POST("almacennew/itemGetAvailable")//REVISADA
|
||||||
fun itemGetAvailable(
|
fun itemGetAvailable(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -266,7 +266,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<ItemVO>
|
Call<ItemVO>
|
||||||
|
|
||||||
@POST("almacennew/collectionAddItem")
|
@POST("almacennew/collectionAddItem")//REVISADA
|
||||||
fun collectionAddItem(
|
fun collectionAddItem(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -277,7 +277,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<String>
|
Call<String>
|
||||||
|
|
||||||
@POST("almacennew/saleMove")
|
@POST("almacennew/saleMove")//REVISADA
|
||||||
fun saleMove(
|
fun saleMove(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -288,7 +288,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<String>
|
Call<String>
|
||||||
|
|
||||||
@POST("almacennew/collectionMissingTrash")
|
@POST("almacennew/collectionMissingTrash")//REVISADA
|
||||||
fun collectionMissingTrash(
|
fun collectionMissingTrash(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -299,7 +299,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<String>
|
Call<String>
|
||||||
|
|
||||||
@POST("almacennew/saleTrackingDel")
|
@POST("almacennew/saleTrackingDel")//REVISADA
|
||||||
fun saleTrackingDel(
|
fun saleTrackingDel(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -310,7 +310,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<String>
|
Call<String>
|
||||||
|
|
||||||
@POST("almacennew/collectionUpdateState")
|
@POST("almacennew/collectionUpdateState")//REVISADA
|
||||||
fun collectionUpdateState(
|
fun collectionUpdateState(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -321,7 +321,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<String>
|
Call<String>
|
||||||
|
|
||||||
@POST("almacennew/barcodeToItem")
|
@POST("almacennew/barcodeToItem")//REVISADA
|
||||||
fun getIdFromCode(
|
fun getIdFromCode(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -332,7 +332,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<String>
|
Call<String>
|
||||||
|
|
||||||
@POST("almacennew/collectionIncreaseQuantity")
|
@POST("almacennew/collectionIncreaseQuantity")//REVISADA
|
||||||
fun collectionIncreaseQuantity(
|
fun collectionIncreaseQuantity(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -343,7 +343,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<String>
|
Call<String>
|
||||||
|
|
||||||
@POST("almacennew/saleMistakeAdd")
|
@POST("almacennew/saleMistakeAdd")//REVISADA
|
||||||
fun saleMistakeAdd(
|
fun saleMistakeAdd(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -354,7 +354,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<String>
|
Call<String>
|
||||||
|
|
||||||
@POST("almacennew/mistakeType")
|
@POST("almacennew/mistakeType")//REVISADA
|
||||||
fun mistakeType(
|
fun mistakeType(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -367,7 +367,7 @@ interface VerdnaturaService {
|
||||||
//PASILLEROS ========================================================================>
|
//PASILLEROS ========================================================================>
|
||||||
|
|
||||||
//CONSULTAR ARTICULO ========================================================================>
|
//CONSULTAR ARTICULO ========================================================================>
|
||||||
@POST("almacennew/itemDiary")
|
@POST("almacennew/itemDiary")//REVISADA
|
||||||
fun itemDiary(
|
fun itemDiary(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -378,7 +378,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<List<ItemHistoricoVO>>
|
Call<List<ItemHistoricoVO>>
|
||||||
|
|
||||||
@POST("almacennew/item_card")
|
@POST("almacennew/item_card")//REVISADA
|
||||||
fun getItemCard(
|
fun getItemCard(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -389,7 +389,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<ItemCardVO>
|
Call<ItemCardVO>
|
||||||
|
|
||||||
@POST("almacennew/item_getSimilar")
|
@POST("almacennew/item_getSimilar")//REVISADA
|
||||||
fun item_getSimilar(
|
fun item_getSimilar(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -400,7 +400,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<List<ItemProposal>>
|
Call<List<ItemProposal>>
|
||||||
|
|
||||||
@POST("almacennew/get_ItemPackingType")
|
@POST("almacennew/get_ItemPackingType")//REVISADA
|
||||||
fun getItemPackingType(
|
fun getItemPackingType(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -411,7 +411,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<List<ItemPackingType>>
|
Call<List<ItemPackingType>>
|
||||||
|
|
||||||
@POST("almacennew/itemStockUpdate")
|
@POST("almacennew/itemStockUpdate")//REVISADA
|
||||||
fun itemStockUpdate(
|
fun itemStockUpdate(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -422,7 +422,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<String>
|
Call<String>
|
||||||
|
|
||||||
@POST("almacennew/itemTrash")
|
@POST("almacennew/itemTrash")//REVISADA
|
||||||
fun itemTrash(
|
fun itemTrash(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -433,7 +433,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<String>
|
Call<String>
|
||||||
|
|
||||||
@POST("almacennew/item_placement_save")
|
@POST("almacennew/item_placement_save")//REVISADA
|
||||||
fun itemPlacementSave(
|
fun itemPlacementSave(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -444,7 +444,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<String>
|
Call<String>
|
||||||
|
|
||||||
@POST("almacennew/buy_updateGrouping")
|
@POST("almacennew/buy_updateGrouping")//REVISADA
|
||||||
fun updateGrouping(
|
fun updateGrouping(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -455,7 +455,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<String>
|
Call<String>
|
||||||
|
|
||||||
@POST("almacennew/buy_updatePacking")
|
@POST("almacennew/buy_updatePacking")//REVISADA
|
||||||
fun updatePacking(
|
fun updatePacking(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -466,7 +466,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<String>
|
Call<String>
|
||||||
|
|
||||||
@POST("almacennew/update_ItemPackingType")
|
@POST("almacennew/update_ItemPackingType")//REVISADA
|
||||||
fun updatePackingType(
|
fun updatePackingType(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -477,7 +477,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<Boolean>
|
Call<Boolean>
|
||||||
|
|
||||||
@POST("almacennew/itemSaveMin")
|
@POST("almacennew/itemSaveMin")//REVISADA
|
||||||
fun itemSaveMin(
|
fun itemSaveMin(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -488,7 +488,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<String>
|
Call<String>
|
||||||
|
|
||||||
@POST("almacennew/barcodes_edit")
|
@POST("almacennew/barcodes_edit")//REVISADA
|
||||||
fun barcodes_edit(
|
fun barcodes_edit(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -500,7 +500,7 @@ interface VerdnaturaService {
|
||||||
Call<String>
|
Call<String>
|
||||||
|
|
||||||
//BUSCAR ITEM ========================================================================>
|
//BUSCAR ITEM ========================================================================>
|
||||||
@POST("almacennew/getItemUbication")
|
@POST("almacennew/getItemUbication")//REVISADA
|
||||||
fun searchItemsUbicador(
|
fun searchItemsUbicador(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -512,7 +512,7 @@ interface VerdnaturaService {
|
||||||
Call<List<ItemLocationVO>>
|
Call<List<ItemLocationVO>>
|
||||||
|
|
||||||
// BUSCAR ITEM ALL
|
// BUSCAR ITEM ALL
|
||||||
@POST("almacennew/getItemUbication")
|
@POST("almacennew/getItemUbication")//REVISADA
|
||||||
fun searchItemsUbicadorAll(
|
fun searchItemsUbicadorAll(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -525,7 +525,7 @@ interface VerdnaturaService {
|
||||||
|
|
||||||
//INVENTARIO ========================================================================>
|
//INVENTARIO ========================================================================>
|
||||||
|
|
||||||
@POST("almacennew/itemShelvingRadar")
|
@POST("almacennew/itemShelvingRadar")//REVISADA
|
||||||
fun itemShelvingRadar(
|
fun itemShelvingRadar(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -536,7 +536,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<List<ItemInventaryVO>>
|
Call<List<ItemInventaryVO>>
|
||||||
|
|
||||||
@POST("almacennew/itemShelving_filterBuyer")
|
@POST("almacennew/itemShelving_filterBuyer")//REVISADA
|
||||||
fun itemShelvingRadarFilterBuyer(
|
fun itemShelvingRadarFilterBuyer(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -547,7 +547,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<List<ItemInventaryVO>>
|
Call<List<ItemInventaryVO>>
|
||||||
|
|
||||||
@POST("almacennew/faultsReview")
|
@POST("almacennew/faultsReview")//REVISADA
|
||||||
fun faultsReview(
|
fun faultsReview(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -558,7 +558,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<List<ItemFaltasVO>>
|
Call<List<ItemFaltasVO>>
|
||||||
|
|
||||||
@POST("almacennew/faultsReview_isChecked")
|
@POST("almacennew/faultsReview_isChecked")//REVISADA
|
||||||
fun faultsReview_isChecked(
|
fun faultsReview_isChecked(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -570,7 +570,7 @@ interface VerdnaturaService {
|
||||||
Call<String>
|
Call<String>
|
||||||
|
|
||||||
//SHELVING PARKING ========================================================================>
|
//SHELVING PARKING ========================================================================>
|
||||||
@POST("almacennew/shelvingParking_get")
|
@POST("almacennew/shelvingParking_get")//REVISADA
|
||||||
fun shelvingParking_get(
|
fun shelvingParking_get(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -582,7 +582,7 @@ interface VerdnaturaService {
|
||||||
Call<List<ItemShelvingParkingVO>>
|
Call<List<ItemShelvingParkingVO>>
|
||||||
|
|
||||||
//CONTROL DE VEHICULOS
|
//CONTROL DE VEHICULOS
|
||||||
@POST("almacennew/machineWorker_add")
|
@POST("almacennew/machineWorker_add")//REVISADA
|
||||||
fun machineWorker_add(
|
fun machineWorker_add(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -593,7 +593,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<Boolean>
|
Call<Boolean>
|
||||||
|
|
||||||
@POST("almacennew/machineWorker_update")
|
@POST("almacennew/machineWorker_update")//REVISADA
|
||||||
fun machineWorker_update(
|
fun machineWorker_update(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -604,18 +604,9 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<Boolean>
|
Call<Boolean>
|
||||||
|
|
||||||
@POST("almacennew/machineWorker_Worker")
|
|
||||||
fun machineWorker_Worker(
|
|
||||||
@Header("aplicacion") aplicacion: String,
|
|
||||||
@Header("version") version: String,
|
|
||||||
@Header("user") user: String,
|
|
||||||
@Header("pass") pass: String,
|
|
||||||
@Header("Content-Type") content_type: String,
|
|
||||||
@Body params: List<String>
|
|
||||||
):
|
|
||||||
Call<String>
|
|
||||||
|
|
||||||
@POST("almacennew/workerMachinery_isRegistered")
|
|
||||||
|
@POST("almacennew/workerMachinery_isRegistered")//REVISADA
|
||||||
fun workerMachinery_isRegistered(
|
fun workerMachinery_isRegistered(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -626,7 +617,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<String>
|
Call<String>
|
||||||
|
|
||||||
@POST("almacennew/deviceProduction_getnameDevice")
|
@POST("almacennew/deviceProduction_getnameDevice")//REVISADA
|
||||||
fun deviceProduction_getnameDevice(
|
fun deviceProduction_getnameDevice(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -637,7 +628,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<String>
|
Call<String>
|
||||||
|
|
||||||
@POST("almacennew/deviceProductionUser_getWorker")
|
@POST("almacennew/deviceProductionUser_getWorker")//REVISADA
|
||||||
fun deviceProductionUser_getWorker(
|
fun deviceProductionUser_getWorker(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -648,18 +639,8 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<String>
|
Call<String>
|
||||||
|
|
||||||
@POST("almacennew/deviceProduction_getdeviceNameFromUser")
|
|
||||||
fun deviceProduction_getdeviceNameFromUser(
|
|
||||||
@Header("aplicacion") aplicacion: String,
|
|
||||||
@Header("version") version: String,
|
|
||||||
@Header("user") user: String,
|
|
||||||
@Header("pass") pass: String,
|
|
||||||
@Header("Content-Type") content_type: String,
|
|
||||||
@Body params: List<String>
|
|
||||||
):
|
|
||||||
Call<String>
|
|
||||||
|
|
||||||
@POST("almacennew/machine_getWorkerPlate")
|
@POST("almacennew/machine_getWorkerPlate")//REVISADA
|
||||||
fun machine_getWorkerPlate(
|
fun machine_getWorkerPlate(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -670,7 +651,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<String>
|
Call<String>
|
||||||
|
|
||||||
@POST("almacennew/machineWorker_getHistorical")
|
@POST("almacennew/machineWorker_getHistorical")//REVISADA
|
||||||
fun machineWorker_getHistorical(
|
fun machineWorker_getHistorical(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -682,7 +663,7 @@ interface VerdnaturaService {
|
||||||
Call<List<ItemHistoricoVehiculo>>
|
Call<List<ItemHistoricoVehiculo>>
|
||||||
|
|
||||||
//UBICADOR ========================================================================>
|
//UBICADOR ========================================================================>
|
||||||
@POST("almacennew/itemShelvingList")
|
@POST("almacennew/itemShelvingList")//REVISADA
|
||||||
fun itemShelvingList(
|
fun itemShelvingList(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -693,7 +674,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<List<ItemUbicadorVO>>
|
Call<List<ItemUbicadorVO>>
|
||||||
|
|
||||||
@POST("almacennew/shelvingPriorityUpdate")
|
@POST("almacennew/shelvingPriorityUpdate")//REVISADA
|
||||||
fun shelvingPriorityUpdate(
|
fun shelvingPriorityUpdate(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -704,7 +685,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<String>
|
Call<String>
|
||||||
|
|
||||||
@POST("almacennew/itemShelvingMake")
|
@POST("almacennew/itemShelvingMake")//REVISADA
|
||||||
fun itemShelvingMake(
|
fun itemShelvingMake(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -715,7 +696,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<String>
|
Call<String>
|
||||||
|
|
||||||
@POST("almacennew/itemShelvingMakeEdit")
|
@POST("almacennew/itemShelvingMakeEdit")//REVISADA
|
||||||
fun itemShelvingMakeEdit(
|
fun itemShelvingMakeEdit(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -726,7 +707,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<String>
|
Call<String>
|
||||||
|
|
||||||
@POST("almacennew/itemShelvingMake_multi")
|
@POST("almacennew/itemShelvingMake_multi")//REVISADA
|
||||||
fun itemShelvingMake_multi(
|
fun itemShelvingMake_multi(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -737,7 +718,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<String>
|
Call<String>
|
||||||
|
|
||||||
@POST("almacennew/shelvingPark")
|
@POST("almacennew/shelvingPark")//REVISADA
|
||||||
fun shelvingPark(
|
fun shelvingPark(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -748,7 +729,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<String>
|
Call<String>
|
||||||
|
|
||||||
@POST("almacennew/shelvingChange")
|
@POST("almacennew/shelvingChange")//REVISADA
|
||||||
fun shelvingChange(
|
fun shelvingChange(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -759,7 +740,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<String>
|
Call<String>
|
||||||
|
|
||||||
@POST("almacennew/clearShelvingList")
|
@POST("almacennew/clearShelvingList")//REVISADA
|
||||||
fun clearShelvingList(
|
fun clearShelvingList(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -770,7 +751,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<String>
|
Call<String>
|
||||||
|
|
||||||
@POST("almacennew/itemShelvingTransfer")
|
@POST("almacennew/itemShelvingTransfer")//REVISADA
|
||||||
fun itemShelvingTransfer(
|
fun itemShelvingTransfer(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -781,7 +762,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<String>
|
Call<String>
|
||||||
|
|
||||||
@POST("almacennew/itemShelvingDelete")
|
@POST("almacennew/itemShelvingDelete")//REVISADA
|
||||||
fun itemShelvingDelete(
|
fun itemShelvingDelete(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -794,16 +775,7 @@ interface VerdnaturaService {
|
||||||
|
|
||||||
//BUFFER ==============================================================================>
|
//BUFFER ==============================================================================>
|
||||||
|
|
||||||
/* @POST("almacennew/buffer_setType")
|
@POST("almacennew/buffer_setTypeByName")//REVISADA
|
||||||
fun buffer_setType(@Header("aplicacion") aplicacion: String,
|
|
||||||
@Header("version") version: String,
|
|
||||||
@Header("user") user: String,
|
|
||||||
@Header("pass") pass: String,
|
|
||||||
@Header("Content-Type") content_type: String,
|
|
||||||
@Body params: List<String>):
|
|
||||||
Call<Boolean>*/
|
|
||||||
|
|
||||||
@POST("almacennew/buffer_setTypeByName")
|
|
||||||
fun buffer_setTypeByName(
|
fun buffer_setTypeByName(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -816,7 +788,7 @@ interface VerdnaturaService {
|
||||||
|
|
||||||
// Qr reader ==========================================================================
|
// Qr reader ==========================================================================
|
||||||
|
|
||||||
@POST("almacennew/qr_getCall")
|
@POST("almacennew/qr_getCall")//REVISADA
|
||||||
fun qr_getCall(
|
fun qr_getCall(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -829,7 +801,7 @@ interface VerdnaturaService {
|
||||||
|
|
||||||
//PALETIZADORES ========================================================================>
|
//PALETIZADORES ========================================================================>
|
||||||
|
|
||||||
@POST("almacennew/expedition_scan")
|
@POST("almacennew/expedition_scan")//REVISADA
|
||||||
fun expedition_scan(
|
fun expedition_scan(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -840,7 +812,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<Void>
|
Call<Void>
|
||||||
|
|
||||||
@POST("almacennew/expedition_getState")
|
@POST("almacennew/expedition_getState")//REVISADA
|
||||||
fun expedition_getState(
|
fun expedition_getState(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -851,7 +823,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<itemExpedetionState>
|
Call<itemExpedetionState>
|
||||||
|
|
||||||
@POST("almacennew/expedition_getState")
|
@POST("almacennew/expedition_getState")//REVISADA
|
||||||
fun expedition_getStateJSON(
|
fun expedition_getStateJSON(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -862,7 +834,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<JsonObject>
|
Call<JsonObject>
|
||||||
|
|
||||||
@POST("almacennew/expeditionTruckList")
|
@POST("almacennew/expeditionTruckList")//REVISADA
|
||||||
fun expeditionTruckList(
|
fun expeditionTruckList(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -872,7 +844,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<List<ItemExpeditionTruckVO>>
|
Call<List<ItemExpeditionTruckVO>>
|
||||||
|
|
||||||
@POST("almacennew/expeditionTruckAdd")
|
@POST("almacennew/expeditionTruckAdd")//REVISADA
|
||||||
fun expeditionTruckAdd(
|
fun expeditionTruckAdd(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -883,7 +855,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<String>
|
Call<String>
|
||||||
|
|
||||||
@POST("almacennew/expeditionPalletList")
|
@POST("almacennew/expeditionPalletList")//REVISADA
|
||||||
fun expeditionPallet_List(
|
fun expeditionPallet_List(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -894,7 +866,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<List<ItemPalletVO>>
|
Call<List<ItemPalletVO>>
|
||||||
|
|
||||||
@POST("almacennew/expeditionScanAdd")
|
@POST("almacennew/expeditionScanAdd")//REVISADA
|
||||||
fun expeditionScanAdd(
|
fun expeditionScanAdd(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -905,7 +877,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<List<ItemScanVO>>
|
Call<List<ItemScanVO>>
|
||||||
|
|
||||||
@POST("almacennew/expeditionScanPut")
|
@POST("almacennew/expeditionScanPut")//REVISADA
|
||||||
fun expeditionScanPut(
|
fun expeditionScanPut(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -916,7 +888,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<String>
|
Call<String>
|
||||||
|
|
||||||
@POST("almacennew/checkRouteExpeditionScanPut")
|
@POST("almacennew/checkRouteExpeditionScanPut")//REVISADA
|
||||||
fun checkRouteExpeditionScanPut(
|
fun checkRouteExpeditionScanPut(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -927,7 +899,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<String>
|
Call<String>
|
||||||
|
|
||||||
@POST("almacennew/expeditionPalletView")
|
@POST("almacennew/expeditionPalletView")//REVISADA
|
||||||
fun expeditionPalletView(
|
fun expeditionPalletView(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -938,7 +910,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<List<ItemPalletViewVO>>
|
Call<List<ItemPalletViewVO>>
|
||||||
|
|
||||||
@POST("almacennew/expeditionPalletDel")
|
@POST("almacennew/expeditionPalletDel")//REVISADA
|
||||||
fun expeditionPalletDel(
|
fun expeditionPalletDel(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -949,7 +921,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<String>
|
Call<String>
|
||||||
|
|
||||||
@POST("almacennew/expeditionScanList")
|
@POST("almacennew/expeditionScanList")//REVISADA
|
||||||
fun expeditionScanList(
|
fun expeditionScanList(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -960,7 +932,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<List<ItemExpeditionScanVO>>
|
Call<List<ItemExpeditionScanVO>>
|
||||||
|
|
||||||
@POST("almacennew/expeditionScanDel")
|
@POST("almacennew/expeditionScanDel")//REVISADA
|
||||||
fun expeditionScanDel(
|
fun expeditionScanDel(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -971,7 +943,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<String>
|
Call<String>
|
||||||
|
|
||||||
@POST("almacennew/expeditionPalletPrintSet")
|
@POST("almacennew/expeditionPalletPrintSet")//REVISADA
|
||||||
fun expeditionPalletPrintSet(
|
fun expeditionPalletPrintSet(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -983,7 +955,7 @@ interface VerdnaturaService {
|
||||||
Call<String>
|
Call<String>
|
||||||
|
|
||||||
//CALIDAD
|
//CALIDAD
|
||||||
@POST("almacennew/itemShelvingBuyerGet")
|
@POST("almacennew/itemShelvingBuyerGet")//REVISADA
|
||||||
fun itemShelvingBuyerGet(
|
fun itemShelvingBuyerGet(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -993,7 +965,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<List<BuyerVO>>
|
Call<List<BuyerVO>>
|
||||||
|
|
||||||
@POST("almacennew/itemShelvingBuyerTask")
|
@POST("almacennew/itemShelvingBuyerTask")//REVISADA
|
||||||
fun itemShelvingBuyerTask(
|
fun itemShelvingBuyerTask(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -1004,7 +976,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<List<ItemBuyerVO>>
|
Call<List<ItemBuyerVO>>
|
||||||
|
|
||||||
@POST("almacennew/itemShelvingStarsUpdate")
|
@POST("almacennew/itemShelvingStarsUpdate")//REVISADA
|
||||||
fun itemShelvingStarsUpdate(
|
fun itemShelvingStarsUpdate(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -1016,7 +988,7 @@ interface VerdnaturaService {
|
||||||
Call<String>
|
Call<String>
|
||||||
|
|
||||||
//SMARTTAGS ========================================================================>
|
//SMARTTAGS ========================================================================>
|
||||||
@POST("almacennew/workerShelving_add")
|
@POST("almacennew/workerShelving_add")//REVISADA
|
||||||
fun workerShelving_add(
|
fun workerShelving_add(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -1027,7 +999,7 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<Void>
|
Call<Void>
|
||||||
|
|
||||||
@POST("almacennew/workerShelving_delete")
|
@POST("almacennew/workerShelving_delete")//REVISADA
|
||||||
fun workerShelving_delete(
|
fun workerShelving_delete(
|
||||||
@Header("aplicacion") aplicacion: String,
|
@Header("aplicacion") aplicacion: String,
|
||||||
@Header("version") version: String,
|
@Header("version") version: String,
|
||||||
|
|
@ -1038,13 +1010,5 @@ interface VerdnaturaService {
|
||||||
):
|
):
|
||||||
Call<Void>
|
Call<Void>
|
||||||
|
|
||||||
/* @POST("almacennew/smartTag_nextLevel")
|
|
||||||
fun smartTag_nextLevel(@Header("aplicacion") aplicacion: String,
|
|
||||||
@Header("version") version: String,
|
|
||||||
@Header("user") user: String,
|
|
||||||
@Header("pass") pass: String,
|
|
||||||
@Header("Content-Type") content_type: String,
|
|
||||||
@Body params: List<String>):
|
|
||||||
Call<String>*/
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,9 @@ import android.util.Log
|
||||||
import android.view.LayoutInflater
|
import android.view.LayoutInflater
|
||||||
import android.view.View
|
import android.view.View
|
||||||
import android.view.ViewGroup
|
import android.view.ViewGroup
|
||||||
|
import androidx.activity.result.contract.ActivityResultContracts
|
||||||
import androidx.annotation.LayoutRes
|
import androidx.annotation.LayoutRes
|
||||||
|
import androidx.core.app.ActivityCompat
|
||||||
import androidx.databinding.DataBindingUtil
|
import androidx.databinding.DataBindingUtil
|
||||||
import androidx.databinding.ViewDataBinding
|
import androidx.databinding.ViewDataBinding
|
||||||
import androidx.fragment.app.Fragment
|
import androidx.fragment.app.Fragment
|
||||||
|
|
@ -31,6 +33,7 @@ import es.verdnatura.presentation.common.mediaCurrentVolume
|
||||||
import es.verdnatura.presentation.common.mediaMaxVolume
|
import es.verdnatura.presentation.common.mediaMaxVolume
|
||||||
import org.json.JSONObject
|
import org.json.JSONObject
|
||||||
import org.koin.androidx.viewmodel.ext.android.viewModel
|
import org.koin.androidx.viewmodel.ext.android.viewModel
|
||||||
|
import timber.log.Timber
|
||||||
import java.text.SimpleDateFormat
|
import java.text.SimpleDateFormat
|
||||||
import java.util.*
|
import java.util.*
|
||||||
import kotlin.reflect.KClass
|
import kotlin.reflect.KClass
|
||||||
|
|
@ -96,16 +99,28 @@ abstract class BaseFragment<T : ViewDataBinding, V : BaseViewModel>(viewModelCla
|
||||||
savedInstanceState: Bundle?
|
savedInstanceState: Bundle?
|
||||||
): View? = inflater.inflate(getLayoutId(), container, false)
|
): View? = inflater.inflate(getLayoutId(), container, false)
|
||||||
|
|
||||||
|
/*sergio:deprecated. Se inicializa con onViewCreated
|
||||||
override fun onActivityCreated(savedInstanceState: Bundle?) {
|
override fun onActivityCreated(savedInstanceState: Bundle?) {
|
||||||
super.onActivityCreated(savedInstanceState)
|
super.onActivityCreated(savedInstanceState)
|
||||||
initDataBinding()
|
initDataBinding()
|
||||||
getBundleArguments()
|
getBundleArguments()
|
||||||
observeViewModel()
|
observeViewModel()
|
||||||
runSound()
|
runSound()
|
||||||
requestRecordAudioPermission()
|
// requestRecordAudioPermission()
|
||||||
init()
|
requestRecordAudioPermissionNew()
|
||||||
}
|
init()
|
||||||
|
}*/
|
||||||
|
override fun onViewCreated(view: View, savedInstanceState: Bundle?)
|
||||||
|
{
|
||||||
|
super.onViewCreated(view,savedInstanceState)
|
||||||
|
|
||||||
|
getBundleArguments()
|
||||||
|
observeViewModel()
|
||||||
|
runSound()
|
||||||
|
//requestRecordAudioPermission()
|
||||||
|
requestRecordAudioPermissionNew()
|
||||||
|
init()
|
||||||
|
}
|
||||||
|
|
||||||
@LayoutRes
|
@LayoutRes
|
||||||
abstract fun getLayoutId(): Int
|
abstract fun getLayoutId(): Int
|
||||||
|
|
@ -201,7 +216,8 @@ abstract class BaseFragment<T : ViewDataBinding, V : BaseViewModel>(viewModelCla
|
||||||
|
|
||||||
private fun runSound() {
|
private fun runSound() {
|
||||||
// Get the maximum media/music volume
|
// Get the maximum media/music volume
|
||||||
val maxVolume = mAudioManager?.mediaMaxVolume
|
//sergio: se quita por no utilizar
|
||||||
|
// val maxVolume = mAudioManager?.mediaMaxVolume
|
||||||
// mAudioManager?.setMediaVolume(maxVolume!!)
|
// mAudioManager?.setMediaVolume(maxVolume!!)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -344,7 +360,8 @@ abstract class BaseFragment<T : ViewDataBinding, V : BaseViewModel>(viewModelCla
|
||||||
}*/
|
}*/
|
||||||
|
|
||||||
|
|
||||||
private fun requestRecordAudioPermission() {
|
/*sergio:deprecated
|
||||||
|
private fun requestRecordAudioPermission() {
|
||||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
|
||||||
val requiredPermission: String = Manifest.permission.RECORD_AUDIO
|
val requiredPermission: String = Manifest.permission.RECORD_AUDIO
|
||||||
val res = requireContext().checkCallingOrSelfPermission(requiredPermission)
|
val res = requireContext().checkCallingOrSelfPermission(requiredPermission)
|
||||||
|
|
@ -352,8 +369,26 @@ abstract class BaseFragment<T : ViewDataBinding, V : BaseViewModel>(viewModelCla
|
||||||
// this permission is needed
|
// this permission is needed
|
||||||
if (res == PackageManager.PERMISSION_DENIED) {
|
if (res == PackageManager.PERMISSION_DENIED) {
|
||||||
requestPermissions(arrayOf(requiredPermission), 101)
|
requestPermissions(arrayOf(requiredPermission), 101)
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}*/
|
||||||
|
private fun requestRecordAudioPermissionNew() {
|
||||||
|
|
||||||
|
val permissionLauncher = registerForActivityResult(
|
||||||
|
ActivityResultContracts.RequestPermission()
|
||||||
|
)
|
||||||
|
{ isGranted ->
|
||||||
|
if (isGranted) {
|
||||||
|
Timber.i("permisos ok")
|
||||||
|
}
|
||||||
|
|
||||||
|
else {
|
||||||
|
Timber.i("Denegados permisos")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
permissionLauncher.launch(Manifest.permission.RECORD_AUDIO)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun cancelSpeech() {
|
fun cancelSpeech() {
|
||||||
|
|
|
||||||
|
|
@ -5,23 +5,37 @@ import android.content.Context
|
||||||
import android.view.View
|
import android.view.View
|
||||||
import es.verdnatura.R
|
import es.verdnatura.R
|
||||||
import kotlinx.android.synthetic.main.component_custom_dialog.*
|
import kotlinx.android.synthetic.main.component_custom_dialog.*
|
||||||
|
//import es.verdnatura.databinding.ComponentCustomDialogBinding
|
||||||
|
|
||||||
|
//private lateinit var binding: ComponentCustomDialogBinding
|
||||||
|
|
||||||
class CustomDialog(context: Context) : Dialog(context, R.style.DialogTheme) {
|
class CustomDialog(context: Context) : Dialog(context, R.style.DialogTheme) {
|
||||||
|
|
||||||
init {
|
init {
|
||||||
setContentView(R.layout.component_custom_dialog)
|
|
||||||
|
setContentView(R.layout.component_custom_dialog)
|
||||||
|
//sergio: lo nuevo para quitar synthetic de kotlin
|
||||||
|
/* binding = ComponentCustomDialogBinding.inflate(layoutInflater)
|
||||||
|
val view = binding.root
|
||||||
|
setContentView(view)*/
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
fun setTitle(title: String): CustomDialog {
|
fun setTitle(title: String): CustomDialog {
|
||||||
custom_dialog_title.visibility = View.VISIBLE
|
custom_dialog_title.visibility = View.VISIBLE
|
||||||
custom_dialog_title.text = title
|
custom_dialog_title.text = title
|
||||||
|
/* binding.customDialogTitle.visibility = View.VISIBLE
|
||||||
|
binding.customDialogTitle.text = title*/
|
||||||
|
|
||||||
return this
|
return this
|
||||||
}
|
}
|
||||||
|
|
||||||
fun setDescription(description: String): CustomDialog {
|
fun setDescription(description: String): CustomDialog {
|
||||||
custom_dialog_description.visibility = View.VISIBLE
|
custom_dialog_description.visibility = View.VISIBLE
|
||||||
custom_dialog_description.text = description
|
custom_dialog_description.text = description
|
||||||
|
/*binding.customDialogDescription.visibility = View.VISIBLE
|
||||||
|
binding.customDialogDescription.text = description*/
|
||||||
return this
|
return this
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -29,6 +43,9 @@ class CustomDialog(context: Context) : Dialog(context, R.style.DialogTheme) {
|
||||||
custom_dialog_button_ok.visibility = View.VISIBLE
|
custom_dialog_button_ok.visibility = View.VISIBLE
|
||||||
custom_dialog_button_ok.text = text
|
custom_dialog_button_ok.text = text
|
||||||
custom_dialog_button_ok.setOnClickListener { onButtonClicked() }
|
custom_dialog_button_ok.setOnClickListener { onButtonClicked() }
|
||||||
|
/*binding.customDialogButtonOk.visibility = View.VISIBLE
|
||||||
|
binding.customDialogButtonOk.text = text
|
||||||
|
binding.customDialogButtonOk.setOnClickListener { onButtonClicked() }*/
|
||||||
return this
|
return this
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -36,6 +53,9 @@ class CustomDialog(context: Context) : Dialog(context, R.style.DialogTheme) {
|
||||||
custom_dialog_button_ko.visibility = View.VISIBLE
|
custom_dialog_button_ko.visibility = View.VISIBLE
|
||||||
custom_dialog_button_ko.text = text
|
custom_dialog_button_ko.text = text
|
||||||
custom_dialog_button_ko.setOnClickListener { onButtonClicked() }
|
custom_dialog_button_ko.setOnClickListener { onButtonClicked() }
|
||||||
|
/* binding.customDialogButtonKo.visibility = View.VISIBLE
|
||||||
|
binding.customDialogButtonKo.text = text
|
||||||
|
binding.customDialogButtonKo.setOnClickListener { onButtonClicked() }*/
|
||||||
return this
|
return this
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -30,6 +30,7 @@ import kotlinx.android.synthetic.main.activity_main.*
|
||||||
import kotlinx.android.synthetic.main.fragment_ajustes.*
|
import kotlinx.android.synthetic.main.fragment_ajustes.*
|
||||||
import kotlinx.android.synthetic.main.fragment_ajustes.splash_progress
|
import kotlinx.android.synthetic.main.fragment_ajustes.splash_progress
|
||||||
import kotlinx.android.synthetic.main.fragment_login.*
|
import kotlinx.android.synthetic.main.fragment_login.*
|
||||||
|
import timber.log.Timber
|
||||||
|
|
||||||
class AjustesFragment : BaseFragment<FragmentAjustesBinding,AjustesViewModel>(AjustesViewModel::class) {
|
class AjustesFragment : BaseFragment<FragmentAjustesBinding,AjustesViewModel>(AjustesViewModel::class) {
|
||||||
|
|
||||||
|
|
@ -55,8 +56,10 @@ class AjustesFragment : BaseFragment<FragmentAjustesBinding,AjustesViewModel>(Aj
|
||||||
customDialog = CustomDialog(requireContext())
|
customDialog = CustomDialog(requireContext())
|
||||||
|
|
||||||
//modificat el InitilializeAjusts
|
//modificat el InitilializeAjusts
|
||||||
viewModel.inititializeDefaultAjusts(prefs!!.getString(SECTORDESCRIP,getString(R.string.Sinsector)).toString(),prefs!!.getInt(SECTORFK,0),prefs!!.getInt(WAREHOUSEFK,0),prefs!!.getString(VOZ,"NO").toString(),prefs!!.getInt(WAGON,2).toString(),prefs!!.getString(TAGSTYPE,"Amarillas").toString())
|
viewModel.inititializeDefaultAjusts(prefs!!.getString(SECTORDESCRIP,getString(R.string.Sinsector)).toString(),prefs!!.getInt(SECTORFK,0),prefs!!.getInt(WAREHOUSEFK,0),prefs!!.getString(VOZ,"NO").toString(),prefs!!.getInt(WAGON,2).toString(),prefs!!.getString(TAGSTYPE,"Stickers").toString())
|
||||||
super.onCreate(savedInstanceState)
|
super.onCreate(savedInstanceState)
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -125,8 +128,7 @@ class AjustesFragment : BaseFragment<FragmentAjustesBinding,AjustesViewModel>(Aj
|
||||||
|
|
||||||
showDialogCarros(array=listCarros.toArray(array))
|
showDialogCarros(array=listCarros.toArray(array))
|
||||||
|
|
||||||
// getString(R.string.Nodisponibleenestaversión).toast(requireContext())
|
|
||||||
// getString(R.string.enbreveDisponible).toast(requireContext())
|
|
||||||
}else if (item.id == 2){
|
}else if (item.id == 2){
|
||||||
val listVoz : ArrayList<String> = ArrayList()
|
val listVoz : ArrayList<String> = ArrayList()
|
||||||
listVoz.add("NO")
|
listVoz.add("NO")
|
||||||
|
|
@ -151,10 +153,10 @@ class AjustesFragment : BaseFragment<FragmentAjustesBinding,AjustesViewModel>(Aj
|
||||||
ajustess_items.adapter = ajustesAdapter
|
ajustess_items.adapter = ajustesAdapter
|
||||||
ajustess_items.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false)
|
ajustess_items.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false)
|
||||||
|
|
||||||
loadSectorList.observe(viewLifecycleOwner, Observer { event ->
|
loadSectorList.observe(viewLifecycleOwner, { event ->
|
||||||
event.getContentIfNotHandled().notNull {
|
event.getContentIfNotHandled().notNull {
|
||||||
splash_progress.visibility = View.INVISIBLE
|
splash_progress.visibility = View.INVISIBLE
|
||||||
if (it.list != null && it.list.size > 0 && it.list.get(0).isError){
|
if (it.list.isNotEmpty() && it.list.get(0).isError){
|
||||||
customDialog.setTitle("Error").setDescription(it.list.get(0).errorMessage).setOkButton(getString(R.string.Close)){
|
customDialog.setTitle("Error").setDescription(it.list.get(0).errorMessage).setOkButton(getString(R.string.Close)){
|
||||||
customDialog.dismiss()
|
customDialog.dismiss()
|
||||||
}.show()
|
}.show()
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@ package es.verdnatura.presentation.view.feature.articulo.adapter
|
||||||
import android.view.LayoutInflater
|
import android.view.LayoutInflater
|
||||||
import android.view.View
|
import android.view.View
|
||||||
import android.view.ViewGroup
|
import android.view.ViewGroup
|
||||||
|
import androidx.core.content.ContextCompat
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import es.verdnatura.R
|
import es.verdnatura.R
|
||||||
import es.verdnatura.databinding.ItemCardRowBinding
|
import es.verdnatura.databinding.ItemCardRowBinding
|
||||||
|
|
@ -48,10 +49,10 @@ class ItemCardAdapter (
|
||||||
this.item = item
|
this.item = item
|
||||||
if (item.isEditable){
|
if (item.isEditable){
|
||||||
itemImage.visibility = View.VISIBLE
|
itemImage.visibility = View.VISIBLE
|
||||||
itemRowLayout.setBackgroundColor(res.getColor(R.color.verdnatura_black_5))
|
itemRowLayout.setBackgroundColor(ContextCompat.getColor(itemImage.context,R.color.verdnatura_black_5))
|
||||||
}else{
|
}else{
|
||||||
itemImage.visibility = View.INVISIBLE
|
itemImage.visibility = View.INVISIBLE
|
||||||
itemRowLayout.setBackgroundColor(res.getColor(R.color.verdnatura_black_9))
|
itemRowLayout.setBackgroundColor(ContextCompat.getColor(itemImage.context,R.color.verdnatura_black_9))
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -69,9 +69,9 @@ class ItemCardFragment(
|
||||||
private lateinit var customDialogList: CustomDialogList
|
private lateinit var customDialogList: CustomDialogList
|
||||||
private lateinit var customDialogTwo: CustomDialogTwoButtons
|
private lateinit var customDialogTwo: CustomDialogTwoButtons
|
||||||
|
|
||||||
private val _buyersList by lazy { MutableLiveData<BuyerListVO>() }
|
/*private val _buyersList by lazy { MutableLiveData<BuyerListVO>() }
|
||||||
val buyersList: LiveData<BuyerListVO>
|
val buyersList: LiveData<BuyerListVO>
|
||||||
get() = _buyersList
|
get() = _buyersList*/
|
||||||
|
|
||||||
|
|
||||||
override fun getLayoutId(): Int = R.layout.fragment_item_card
|
override fun getLayoutId(): Int = R.layout.fragment_item_card
|
||||||
|
|
@ -85,13 +85,14 @@ class ItemCardFragment(
|
||||||
customDialogInput = CustomDialogInput(requireContext())
|
customDialogInput = CustomDialogInput(requireContext())
|
||||||
customDialogList = CustomDialogList(requireContext())
|
customDialogList = CustomDialogList(requireContext())
|
||||||
customDialogTwo = CustomDialogTwoButtons(requireContext())
|
customDialogTwo = CustomDialogTwoButtons(requireContext())
|
||||||
|
|
||||||
|
|
||||||
if (!itemFk.isNullOrEmpty()){
|
if (!itemFk.isNullOrEmpty()){
|
||||||
getItemCard(itemFk)
|
getItemCard(itemFk)
|
||||||
}
|
}
|
||||||
setToolBar()
|
setToolBar()
|
||||||
super.init()
|
super.init()
|
||||||
|
|
||||||
Timber.i("test")
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -116,7 +117,7 @@ class ItemCardFragment(
|
||||||
// //Log.i("VERDNATURA:","el item es ${itemInfoG!!.id}")
|
// //Log.i("VERDNATURA:","el item es ${itemInfoG!!.id}")
|
||||||
//(activity as MainActivity).onPasillerosItemClickListener( PasillerosItemVO(title = "Historico"),itemFk)
|
//(activity as MainActivity).onPasillerosItemClickListener( PasillerosItemVO(title = "Historico"),itemFk)
|
||||||
(activity as MainActivity).onPasillerosItemClickListener( PasillerosItemVO(title = "Historico"),itemInfoG!!.id)
|
(activity as MainActivity).onPasillerosItemClickListener( PasillerosItemVO(title = "Historico"),itemInfoG!!.id)
|
||||||
////Log.i("VERDNATURA:","El item es ${itemInfoG!!.id}")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
@ -159,8 +160,8 @@ class ItemCardFragment(
|
||||||
warehouseFk = prefs.getInt(WAREHOUSEFK,1).toString()
|
warehouseFk = prefs.getInt(WAREHOUSEFK,1).toString()
|
||||||
this.itemFk = itemFk
|
this.itemFk = itemFk
|
||||||
splash_progress.visibility = View.VISIBLE
|
splash_progress.visibility = View.VISIBLE
|
||||||
viewModel.getItemCard(itemFk,warehouseFk,user!!,password!!)
|
viewModel.getItemCard(itemFk,warehouseFk,user,password)
|
||||||
viewModel.getItemPackingType(user!!,password!!)
|
viewModel.getItemPackingType(user,password)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun observeViewModel() {
|
override fun observeViewModel() {
|
||||||
|
|
@ -244,7 +245,7 @@ class ItemCardFragment(
|
||||||
listItemsRow.add(ItemCardRowVO(title = "Artículos similares",isEditable = true, action = "itemProposal"))
|
listItemsRow.add(ItemCardRowVO(title = "Artículos similares",isEditable = true, action = "itemProposal"))
|
||||||
listItemsRow.add(ItemCardRowVO(title = getString(R.string.DARALTA),value = "",isEditable = true, action = "itemStockUpdateAdd"))
|
listItemsRow.add(ItemCardRowVO(title = getString(R.string.DARALTA),value = "",isEditable = true, action = "itemStockUpdateAdd"))
|
||||||
listItemsRow.add(ItemCardRowVO(title = getString(R.string.DARBAJA),value = "",isEditable = true, action = "itemStockUpdateRemove"))
|
listItemsRow.add(ItemCardRowVO(title = getString(R.string.DARBAJA),value = "",isEditable = true, action = "itemStockUpdateRemove"))
|
||||||
listItemsRow.add(ItemCardRowVO(title = getString(R.string.BUSCARITEM),value = "",isEditable = true, action = "buscarItem"))
|
listItemsRow.add(ItemCardRowVO(title = getString(R.string.BuscarItem),value = "",isEditable = true, action = "buscarItem"))
|
||||||
//listItemsRow.add(ItemCardRowVO(title = "NICHO",value = itemInfo.nicho,isEditable = true, action = "itemPlacementSave"))
|
//listItemsRow.add(ItemCardRowVO(title = "NICHO",value = itemInfo.nicho,isEditable = true, action = "itemPlacementSave"))
|
||||||
// listItemsRow.add(ItemCardRowVO(title = "RESERVA",value = itemInfo.reserva,isEditable = true, action = "itemPlacementSave"))
|
// listItemsRow.add(ItemCardRowVO(title = "RESERVA",value = itemInfo.reserva,isEditable = true, action = "itemPlacementSave"))
|
||||||
listItemsRow.add(ItemCardRowVO(title = getString(R.string.Grouping),value = itemInfo.grouping,isEditable = true, action = "updateGrouping"))
|
listItemsRow.add(ItemCardRowVO(title = getString(R.string.Grouping),value = itemInfo.grouping,isEditable = true, action = "updateGrouping"))
|
||||||
|
|
@ -268,9 +269,6 @@ class ItemCardFragment(
|
||||||
), itemFk
|
), itemFk
|
||||||
)
|
)
|
||||||
|
|
||||||
//viewModel.getItemProposal("30244","3280137","TRUE",user=user,password=password)
|
|
||||||
|
|
||||||
// Log.i("VERDNATURA::", "ME HAS PULSADO")
|
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
if (item.action == "updateSector") {
|
if (item.action == "updateSector") {
|
||||||
|
|
@ -368,7 +366,7 @@ class ItemCardFragment(
|
||||||
itemcard_recyclerview.adapter = adapter
|
itemcard_recyclerview.adapter = adapter
|
||||||
itemcard_recyclerview.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false)
|
itemcard_recyclerview.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false)
|
||||||
|
|
||||||
scroll_view.post(Runnable {
|
scroll_view.post({
|
||||||
val position = IntArray(2)
|
val position = IntArray(2)
|
||||||
if (itemcard_image != null){
|
if (itemcard_image != null){
|
||||||
itemcard_image.getLocationInWindow(position)
|
itemcard_image.getLocationInWindow(position)
|
||||||
|
|
@ -392,13 +390,22 @@ class ItemCardFragment(
|
||||||
|
|
||||||
}
|
}
|
||||||
if(item.action != "itemStockUpdate")
|
if(item.action != "itemStockUpdate")
|
||||||
changeOfflineValue(item,value, listBarcodes)
|
// changeOfflineValue(item,value, listBarcodes)
|
||||||
|
showProgress()
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun changeOfflineValue(item:ItemCardRowVO,newValue:String, barcodes:List<BarcodeVO>){
|
//sergio: changeOffLineValue solo hace visible el progress
|
||||||
|
|
||||||
|
private fun showProgress(){
|
||||||
|
splash_progress.visibility = View.VISIBLE
|
||||||
|
}
|
||||||
|
|
||||||
|
/* private fun changeOfflineValue(item:ItemCardRowVO,newValue:String, barcodes:List<BarcodeVO>){
|
||||||
|
|
||||||
splash_progress.visibility = View.VISIBLE
|
splash_progress.visibility = View.VISIBLE
|
||||||
/*var i = 0
|
|
||||||
|
//sergio: esta parte ya estaba comentada
|
||||||
|
/*var i = 0
|
||||||
var position = 0
|
var position = 0
|
||||||
listItemsRow.forEach {
|
listItemsRow.forEach {
|
||||||
if (it.title == item.title) {
|
if (it.title == item.title) {
|
||||||
|
|
@ -409,7 +416,7 @@ class ItemCardFragment(
|
||||||
if (listItemsRow.get(position).title != "BARCODE") listItemsRow.get(position).value = newValue
|
if (listItemsRow.get(position).title != "BARCODE") listItemsRow.get(position).value = newValue
|
||||||
else listItemsRow.get(position).barcodes = barcodes
|
else listItemsRow.get(position).barcodes = barcodes
|
||||||
adapter?.notifyDataSetChanged()*/
|
adapter?.notifyDataSetChanged()*/
|
||||||
}
|
}*/
|
||||||
|
|
||||||
/* private fun prepareItemStockUpdate(itemB:ItemCardRowVO,value:String){
|
/* private fun prepareItemStockUpdate(itemB:ItemCardRowVO,value:String){
|
||||||
|
|
||||||
|
|
@ -450,12 +457,14 @@ class ItemCardFragment(
|
||||||
if (itemB.action == "itemStockUpdateRemove") {
|
if (itemB.action == "itemStockUpdateRemove") {
|
||||||
customDialogTwo.setTitle(itemB.title!!).setDescription("Indica la causa de eliminar stock:").setOkButton("Falta"){
|
customDialogTwo.setTitle(itemB.title!!).setDescription("Indica la causa de eliminar stock:").setOkButton("Falta"){
|
||||||
viewModel.itemTrash(itemFk = itemFk,warehouseFk = warehouseFk,user = user,password = password,newValue = value,isTrash = "0")
|
viewModel.itemTrash(itemFk = itemFk,warehouseFk = warehouseFk,user = user,password = password,newValue = value,isTrash = "0")
|
||||||
changeOfflineValue(itemB,value, listBarcodes)
|
//changeOfflineValue(itemB,value, listBarcodes)
|
||||||
|
showProgress()
|
||||||
customDialogTwo.dismiss()
|
customDialogTwo.dismiss()
|
||||||
|
|
||||||
}.setOkButtonTwo("Basura"){
|
}.setOkButtonTwo("Basura"){
|
||||||
viewModel.itemTrash(itemFk = itemFk,warehouseFk = warehouseFk,user = user,password = password,newValue = value,isTrash = "1")
|
viewModel.itemTrash(itemFk = itemFk,warehouseFk = warehouseFk,user = user,password = password,newValue = value,isTrash = "1")
|
||||||
changeOfflineValue(itemB,value, listBarcodes)
|
//changeOfflineValue(itemB,value, listBarcodes)
|
||||||
|
showProgress()
|
||||||
customDialogTwo.dismiss()
|
customDialogTwo.dismiss()
|
||||||
|
|
||||||
}.setKoButton("Cancelar"){
|
}.setKoButton("Cancelar"){
|
||||||
|
|
@ -463,7 +472,8 @@ class ItemCardFragment(
|
||||||
customDialogTwo.dismiss()
|
customDialogTwo.dismiss()
|
||||||
}.show()
|
}.show()
|
||||||
}else{
|
}else{
|
||||||
changeOfflineValue(itemB,value, listBarcodes)
|
//changeOfflineValue(itemB,value, listBarcodes)
|
||||||
|
showProgress()
|
||||||
viewModel.itemTrash(itemFk = itemFk,warehouseFk = warehouseFk,user = user,password = password,newValue = (value.toInt() * -1).toString(),isTrash = "0")
|
viewModel.itemTrash(itemFk = itemFk,warehouseFk = warehouseFk,user = user,password = password,newValue = (value.toInt() * -1).toString(),isTrash = "0")
|
||||||
}
|
}
|
||||||
}catch (e:Exception){
|
}catch (e:Exception){
|
||||||
|
|
@ -526,7 +536,8 @@ class ItemCardFragment(
|
||||||
}
|
}
|
||||||
viewModel.barcodesEdit(itemFk = itemFk, user = user, password = password, value = code, delete = delete)
|
viewModel.barcodesEdit(itemFk = itemFk, user = user, password = password, value = code, delete = delete)
|
||||||
barcodeAdapter!!.notifyDataSetChanged()
|
barcodeAdapter!!.notifyDataSetChanged()
|
||||||
changeOfflineValue(item,"", listBarcodes)
|
//changeOfflineValue(item,"", listBarcodes)
|
||||||
|
showProgress()
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun showDialogSelectItemTypePacking(){
|
private fun showDialogSelectItemTypePacking(){
|
||||||
|
|
@ -538,7 +549,7 @@ class ItemCardFragment(
|
||||||
val builder = AlertDialog.Builder(this.context)
|
val builder = AlertDialog.Builder(this.context)
|
||||||
builder.setTitle(getString(R.string.mensajeseleccionencajado))
|
builder.setTitle(getString(R.string.mensajeseleccionencajado))
|
||||||
.setItems(array
|
.setItems(array
|
||||||
) { dialog, position ->
|
) { _, position ->
|
||||||
updateItemPackingType(itemsPackingType[position].code.toString())
|
updateItemPackingType(itemsPackingType[position].code.toString())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -83,7 +83,7 @@ class BufferFragment(
|
||||||
}
|
}
|
||||||
|
|
||||||
scan_input.requestFocus()
|
scan_input.requestFocus()
|
||||||
scan_input.setOnEditorActionListener { v, actionId, event ->
|
scan_input.setOnEditorActionListener { _, actionId, _ ->
|
||||||
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) {
|
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) {
|
||||||
goBack = false
|
goBack = false
|
||||||
if (!scan_input.text.isNullOrEmpty()) {
|
if (!scan_input.text.isNullOrEmpty()) {
|
||||||
|
|
@ -124,7 +124,7 @@ class BufferFragment(
|
||||||
} else {
|
} else {
|
||||||
// customDialog.setTitle("Mensaje").setDescription(it.errorMessage)
|
// customDialog.setTitle("Mensaje").setDescription(it.errorMessage)
|
||||||
|
|
||||||
customDialog.setTitle("Mensaje").setDescription("Operación "+entryPoint.toLowerCase() + " realizada correctamente")
|
customDialog.setTitle("Mensaje").setDescription("Operación "+entryPoint.lowercase() + " realizada correctamente")
|
||||||
.setOkButton("Aceptar") {
|
.setOkButton("Aceptar") {
|
||||||
customDialog.dismiss()
|
customDialog.dismiss()
|
||||||
backButton.performClick()
|
backButton.performClick()
|
||||||
|
|
|
||||||
|
|
@ -41,7 +41,7 @@ class ItemBuyersAdapter (
|
||||||
fun bind(item: ItemBuyerVO) {
|
fun bind(item: ItemBuyerVO) {
|
||||||
binding.apply {
|
binding.apply {
|
||||||
this.itemBuyer = item
|
this.itemBuyer = item
|
||||||
if (item != null && item.image != "")
|
if (item.image != "")
|
||||||
imgItem.loadUrl("https://verdnatura.es/vn-image-data/catalog/200x200/"+item.image);
|
imgItem.loadUrl("https://verdnatura.es/vn-image-data/catalog/200x200/"+item.image);
|
||||||
else
|
else
|
||||||
imgItem.loadUrl("https://verdnatura.es/vn-image-data/catalog/200x200/"+item.itemFk);
|
imgItem.loadUrl("https://verdnatura.es/vn-image-data/catalog/200x200/"+item.itemFk);
|
||||||
|
|
@ -74,7 +74,7 @@ class ItemBuyersAdapter (
|
||||||
onStarSelectedListener.onStarSelected(item.id,"5")
|
onStarSelectedListener.onStarSelected(item.id,"5")
|
||||||
}
|
}
|
||||||
|
|
||||||
if (item.stars != null && item.stars != ""){
|
if (item.stars != ""){
|
||||||
try {
|
try {
|
||||||
val punt = item.stars.toInt()
|
val punt = item.stars.toInt()
|
||||||
if (punt == 1){
|
if (punt == 1){
|
||||||
|
|
|
||||||
|
|
@ -173,7 +173,7 @@ class QaualityFragment(
|
||||||
private fun getCalendarFromDate(date:String): Calendar {
|
private fun getCalendarFromDate(date:String): Calendar {
|
||||||
val sdf = SimpleDateFormat("yyyy-MM-dd")
|
val sdf = SimpleDateFormat("yyyy-MM-dd")
|
||||||
val cal = Calendar.getInstance()
|
val cal = Calendar.getInstance()
|
||||||
cal.setTime(sdf.parse(date))
|
cal.time = sdf.parse(date)
|
||||||
return cal
|
return cal
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -182,7 +182,7 @@ class QaualityFragment(
|
||||||
var index = 0
|
var index = 0
|
||||||
var position = 0
|
var position = 0
|
||||||
listItems.forEach { item ->
|
listItems.forEach { item ->
|
||||||
if (item.shelvingFk.toUpperCase() == matricula.toUpperCase()){
|
if (item.shelvingFk.uppercase() == matricula.uppercase()){
|
||||||
item.showStars = true
|
item.showStars = true
|
||||||
if (!isSearch){
|
if (!isSearch){
|
||||||
position = index
|
position = index
|
||||||
|
|
|
||||||
|
|
@ -43,6 +43,7 @@ import es.verdnatura.presentation.view.feature.sacador.model.*
|
||||||
import kotlinx.android.synthetic.main.activity_main.*
|
import kotlinx.android.synthetic.main.activity_main.*
|
||||||
import kotlinx.android.synthetic.main.fragment_collection.*
|
import kotlinx.android.synthetic.main.fragment_collection.*
|
||||||
import kotlinx.android.synthetic.main.toolbar.*
|
import kotlinx.android.synthetic.main.toolbar.*
|
||||||
|
import timber.log.Timber
|
||||||
|
|
||||||
class CollectionFragment(
|
class CollectionFragment(
|
||||||
var collection: CollectionVO = CollectionVO(),
|
var collection: CollectionVO = CollectionVO(),
|
||||||
|
|
@ -52,6 +53,7 @@ class CollectionFragment(
|
||||||
private var password = ""
|
private var password = ""
|
||||||
private var sectorFk = ""
|
private var sectorFk = ""
|
||||||
private var warehouseFk = ""
|
private var warehouseFk = ""
|
||||||
|
private var SectorDescription = ""
|
||||||
private var token = ""
|
private var token = ""
|
||||||
private var voz = ""
|
private var voz = ""
|
||||||
private var sales: List<SaleVO> = listOf()
|
private var sales: List<SaleVO> = listOf()
|
||||||
|
|
@ -111,16 +113,17 @@ class CollectionFragment(
|
||||||
voz = prefs.getString(VOZ, "NO").toString()
|
voz = prefs.getString(VOZ, "NO").toString()
|
||||||
mperror = MediaPlayer.create((activity as MainActivity), R.raw.error)
|
mperror = MediaPlayer.create((activity as MainActivity), R.raw.error)
|
||||||
mpok = MediaPlayer.create((activity as MainActivity), R.raw.ok)
|
mpok = MediaPlayer.create((activity as MainActivity), R.raw.ok)
|
||||||
|
SectorDescription=prefs.getString(SECTORDESCRIP,"Sin Sector").toString()
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if ((collection.collectionFk != null) && type.equals(CONTROLADOR)) {
|
if ((collection.collectionFk != null) && type.equals(CONTROLADOR)) {
|
||||||
//sergio: comprueba si viene de la pantalla de controlador
|
//sergio: comprueba si viene de la pantalla de controlador
|
||||||
viewModel.ticket_checkFullyControlled(user, password, collection.collectionFk)
|
viewModel.ticketOrCollection_checkFullyControlled(user, password, collection.collectionFk)
|
||||||
workerFkFromTicket=collection.tickets.get(0).sales.get(0).workerFk
|
workerFkFromTicket=collection.tickets.get(0).sales.get(0).workerFk
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if (collection.tickets.isEmpty()) {
|
if (collection.tickets.isEmpty()) {
|
||||||
viewModel.collectionTicketGet(user, password, collection.collectionFk, sectorFk, type)
|
viewModel.collectionTicketGet(user, password, collection.collectionFk, sectorFk, type)
|
||||||
}
|
}
|
||||||
|
|
@ -143,7 +146,7 @@ class CollectionFragment(
|
||||||
if (splash_progress != null) splash_progress.visibility = View.VISIBLE
|
if (splash_progress != null) splash_progress.visibility = View.VISIBLE
|
||||||
//toolbar_title.text = "collectionTicket_get"
|
//toolbar_title.text = "collectionTicket_get"
|
||||||
|
|
||||||
requireActivity().main_bottom_navigation.visibility = View.VISIBLE
|
|
||||||
|
|
||||||
setEvents()
|
setEvents()
|
||||||
|
|
||||||
|
|
@ -582,7 +585,7 @@ class CollectionFragment(
|
||||||
var shelvingIndex = 0
|
var shelvingIndex = 0
|
||||||
for (placementVO in saleVO.placements) {
|
for (placementVO in saleVO.placements) {
|
||||||
// para comprobar si es igual a una matricula
|
// para comprobar si es igual a una matricula
|
||||||
if (placementVO.shelving != null && placementVO.visible != null && txtscan.toUpperCase() == placementVO.shelving.toUpperCase() && placementVO.visible != "(0)") {
|
if (placementVO.shelving != null && placementVO.visible != null && txtscan.uppercase() == placementVO.shelving.uppercase() && placementVO.visible != "(0)") {
|
||||||
if (mpok != null) mpok!!.start()
|
if (mpok != null) mpok!!.start()
|
||||||
isOk = true
|
isOk = true
|
||||||
//////Log.i("VERDNATURA:","encontrado producto")
|
//////Log.i("VERDNATURA:","encontrado producto")
|
||||||
|
|
@ -618,6 +621,7 @@ class CollectionFragment(
|
||||||
parking = txtscan
|
parking = txtscan
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
Timber.i("La coleccion es "+tickets[0])
|
||||||
if (mpok != null) mpok!!.start()
|
if (mpok != null) mpok!!.start()
|
||||||
"Ticket aparcado".toast(requireContext())
|
"Ticket aparcado".toast(requireContext())
|
||||||
} else {
|
} else {
|
||||||
|
|
@ -671,7 +675,7 @@ class CollectionFragment(
|
||||||
viewModel.collectionTicketGet(user, password, txtscan, sectorFk, type)
|
viewModel.collectionTicketGet(user, password, txtscan, sectorFk, type)
|
||||||
|
|
||||||
if (type.equals(CONTROLADOR)) {
|
if (type.equals(CONTROLADOR)) {
|
||||||
viewModel.ticket_checkFullyControlled(user, password, txtscan)
|
viewModel.ticketOrCollection_checkFullyControlled(user, password, txtscan)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
splash_progress.visibility = View.GONE
|
splash_progress.visibility = View.GONE
|
||||||
|
|
@ -700,7 +704,7 @@ class CollectionFragment(
|
||||||
//2- Por carro
|
//2- Por carro
|
||||||
var shelvingIndex = 0
|
var shelvingIndex = 0
|
||||||
for (placementVO in saleVO.placements) {
|
for (placementVO in saleVO.placements) {
|
||||||
if (txtscan.toUpperCase() == placementVO.shelving.toUpperCase()) {
|
if (txtscan.uppercase() == placementVO.shelving.uppercase()) {
|
||||||
if (mpok != null) mpok!!.start()
|
if (mpok != null) mpok!!.start()
|
||||||
isOk = true
|
isOk = true
|
||||||
showShelving(position, shelvingIndex)
|
showShelving(position, shelvingIndex)
|
||||||
|
|
@ -1121,7 +1125,9 @@ class CollectionFragment(
|
||||||
collectionFk = collection.collectionFk,
|
collectionFk = collection.collectionFk,
|
||||||
sectorFk = sectorFk
|
sectorFk = sectorFk
|
||||||
)
|
)
|
||||||
getString(R.string.Imprimiendo).toast(requireContext())
|
|
||||||
|
|
||||||
|
(getString(R.string.Imprimiendo) + " por "+SectorDescription).toast(requireContext())
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun addItem() {
|
private fun addItem() {
|
||||||
|
|
@ -1785,7 +1791,7 @@ class CollectionFragment(
|
||||||
val item = sale.itemFk
|
val item = sale.itemFk
|
||||||
val cantidad = sale.quantity.toInt() - sale.pickedQuantity.toInt()
|
val cantidad = sale.quantity.toInt() - sale.pickedQuantity.toInt()
|
||||||
val listtext = sale.longName.split(" ")
|
val listtext = sale.longName.split(" ")
|
||||||
var nombre = ""
|
var nombre: String
|
||||||
if (listtext.isNotEmpty()) {
|
if (listtext.isNotEmpty()) {
|
||||||
nombre = listtext.get(0) + " " + sale.color
|
nombre = listtext.get(0) + " " + sale.color
|
||||||
} else {
|
} else {
|
||||||
|
|
|
||||||
|
|
@ -357,8 +357,8 @@ class CollectionViewModel(context: Context) : BaseViewModel() {
|
||||||
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
fun ticket_checkFullyControlled(usuario:String,password:String,collectionFk:String){
|
fun ticketOrCollection_checkFullyControlled(usuario:String,password:String,collectionFk:String){
|
||||||
getSacadorControladorUserCase.ticket_checkFullyControlled(usuario,password,collectionFk).enqueue(object :
|
getSacadorControladorUserCase.ticketOrCollection_checkFullyControlled(usuario,password,collectionFk).enqueue(object :
|
||||||
Callback<String> {
|
Callback<String> {
|
||||||
override fun onFailure(call: Call<String>, t: Throwable) {
|
override fun onFailure(call: Call<String>, t: Throwable) {
|
||||||
_responsecheckfully.value = ResponseItemVO(isError = true, errorMessage = "" + t.message!!)
|
_responsecheckfully.value = ResponseItemVO(isError = true, errorMessage = "" + t.message!!)
|
||||||
|
|
|
||||||
|
|
@ -48,7 +48,7 @@ class ControladorFragment : BaseFragment<FragmentControladorBinding,ControladorV
|
||||||
customDialog = CustomDialog(requireContext())
|
customDialog = CustomDialog(requireContext())
|
||||||
toolbar_title.text = getString(R.string.controlticket)
|
toolbar_title.text = getString(R.string.controlticket)
|
||||||
setEvents()
|
setEvents()
|
||||||
|
requireActivity().main_bottom_navigation.visibility = View.VISIBLE
|
||||||
super.init()
|
super.init()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -61,7 +61,8 @@ class WebFragment(
|
||||||
webView.setWebChromeClient (WebChromeClient())
|
webView.setWebChromeClient (WebChromeClient())
|
||||||
// webView.setWebViewClient (wvClient);
|
// webView.setWebViewClient (wvClient);
|
||||||
webView.getSettings (). setJavaScriptEnabled (true)
|
webView.getSettings (). setJavaScriptEnabled (true)
|
||||||
webView.getSettings (). setPluginState (WebSettings.PluginState.ON)
|
// sergio:deprecated
|
||||||
|
//webView.getSettings (). setPluginState (WebSettings.PluginState.ON)
|
||||||
val webSettings = webView.settings
|
val webSettings = webView.settings
|
||||||
webSettings.javaScriptEnabled = true
|
webSettings.javaScriptEnabled = true
|
||||||
webSettings.domStorageEnabled = true
|
webSettings.domStorageEnabled = true
|
||||||
|
|
|
||||||
|
|
@ -201,7 +201,7 @@ class ControlVehiculoFragment(
|
||||||
|
|
||||||
if (!goBack) {
|
if (!goBack) {
|
||||||
splash_progress.visibility = VISIBLE
|
splash_progress.visibility = VISIBLE
|
||||||
viewModel.workerMachinery_isRegistered(user, password, userFk)
|
viewModel.workerMachinery_isRegistered(user, password)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -214,10 +214,10 @@ class ControlVehiculoFragment(
|
||||||
)
|
)
|
||||||
} else if (direction.equals("IN")) {
|
} else if (direction.equals("IN")) {
|
||||||
splash_progress.visibility = VISIBLE
|
splash_progress.visibility = VISIBLE
|
||||||
viewModel.machineWorker_add(user, password, plateNumber, userFk)
|
viewModel.machineWorker_add(user, password, plateNumber)
|
||||||
|
|
||||||
} else if (direction.equals("OUT")) {
|
} else if (direction.equals("OUT")) {
|
||||||
viewModel.machineWorker_update(user, password, plateNumber, userFk)
|
viewModel.machineWorker_update(user, password, plateNumber)
|
||||||
|
|
||||||
} else if (direction.equals("")) {
|
} else if (direction.equals("")) {
|
||||||
(activity as MainActivity).openFragmentPickers()
|
(activity as MainActivity).openFragmentPickers()
|
||||||
|
|
|
||||||
|
|
@ -67,7 +67,7 @@ class ControlVehiculoUsuarioFragment(
|
||||||
if (userFk.equals(vUserFK)) {
|
if (userFk.equals(vUserFK)) {
|
||||||
|
|
||||||
splash_progress.visibility = VISIBLE
|
splash_progress.visibility = VISIBLE
|
||||||
viewModel.machine_getWorkerPlate(user, password, userFk)
|
viewModel.machine_getWorkerPlate(user, password)
|
||||||
viewModel.deviceProduction_getnameDevice(user, password, android_id)
|
viewModel.deviceProduction_getnameDevice(user, password, android_id)
|
||||||
viewModel.deviceProductionUser_getWorker(user, password, android_id)
|
viewModel.deviceProductionUser_getWorker(user, password, android_id)
|
||||||
|
|
||||||
|
|
@ -80,7 +80,7 @@ class ControlVehiculoUsuarioFragment(
|
||||||
|
|
||||||
}
|
}
|
||||||
user_image.loadUrl("https://salix.verdnatura.es/api/Images/user/160x160/$userFk/download?access_token=$token")
|
user_image.loadUrl("https://salix.verdnatura.es/api/Images/user/160x160/$userFk/download?access_token=$token")
|
||||||
viewModel.machine_getWorkerPlate(user, password, userFk)
|
viewModel.machine_getWorkerPlate(user, password)
|
||||||
name_vehiclecontrol.text = user
|
name_vehiclecontrol.text = user
|
||||||
registered_vehiclecontrol.text = ""
|
registered_vehiclecontrol.text = ""
|
||||||
deviceName.text = ""
|
deviceName.text = ""
|
||||||
|
|
@ -158,30 +158,20 @@ private fun setDialog(){
|
||||||
//sergio: se modifica el response = null. En casi todas las llamadas se utilizaba para ver si había error.
|
//sergio: se modifica el response = null. En casi todas las llamadas se utilizaba para ver si había error.
|
||||||
// Ahora ya no.
|
// Ahora ya no.
|
||||||
|
|
||||||
if (it.response == null) {
|
if (it.response == "false") {
|
||||||
customDialog.setTitle("Error")
|
|
||||||
.setDescription("Revisar la llamada para obtener datos del trabajador y dispositivo")
|
|
||||||
.setOkButton("Cerrar") {
|
|
||||||
customDialog.dismiss()
|
|
||||||
}.show()
|
|
||||||
} else {
|
} else {
|
||||||
if (it.response == "false") {
|
|
||||||
|
|
||||||
} else {
|
// Log.i("VERDNATURA::", "valor devuelto ${it.response}")
|
||||||
if (it.response != null) {
|
|
||||||
|
|
||||||
// Log.i("VERDNATURA::", "valor devuelto ${it.response}")
|
if (it.type.equals("getnameDevice")) {
|
||||||
|
deviceName.text = it.response
|
||||||
if (it.type.equals("getnameDevice")) {
|
}
|
||||||
deviceName.text = it.response
|
if (it.type.equals("getWorker")) {
|
||||||
}
|
assigned_devicename.text = it.response
|
||||||
if (it.type.equals("getWorker")) {
|
}
|
||||||
assigned_devicename.text = it.response
|
if (it.type.equals("getWorkerPlate")) {
|
||||||
}
|
registered_vehiclecontrol.text = it.response
|
||||||
if (it.type.equals("getWorkerPlate")) {
|
|
||||||
registered_vehiclecontrol.text = it.response
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -33,10 +33,9 @@ class ControlVehiculoViewModel(context: Context) : BaseViewModel() {
|
||||||
fun machineWorker_add(
|
fun machineWorker_add(
|
||||||
usuario: String,
|
usuario: String,
|
||||||
password: String,
|
password: String,
|
||||||
PlateNumber: String,
|
PlateNumber: String
|
||||||
workerFk: String
|
|
||||||
) {
|
) {
|
||||||
getVehicleControlTimeUserCase.machineWorker_add(usuario, password, PlateNumber, workerFk)
|
getVehicleControlTimeUserCase.machineWorker_add(usuario, password, PlateNumber)
|
||||||
.enqueue(object : Callback<Boolean> {
|
.enqueue(object : Callback<Boolean> {
|
||||||
override fun onFailure(call: Call<Boolean>, t: Throwable) {
|
override fun onFailure(call: Call<Boolean>, t: Throwable) {
|
||||||
_responseinsert.value = ResponseItemVO(
|
_responseinsert.value = ResponseItemVO(
|
||||||
|
|
@ -66,10 +65,9 @@ class ControlVehiculoViewModel(context: Context) : BaseViewModel() {
|
||||||
fun machineWorker_update(
|
fun machineWorker_update(
|
||||||
usuario: String,
|
usuario: String,
|
||||||
password: String,
|
password: String,
|
||||||
PlateNumber: String,
|
PlateNumber: String
|
||||||
workerFk: String
|
|
||||||
) {
|
) {
|
||||||
getVehicleControlTimeUserCase.machineWorker_update(usuario, password, PlateNumber, workerFk)
|
getVehicleControlTimeUserCase.machineWorker_update(usuario, password, PlateNumber)
|
||||||
.enqueue(object : Callback<Boolean> {
|
.enqueue(object : Callback<Boolean> {
|
||||||
override fun onFailure(call: Call<Boolean>, t: Throwable) {
|
override fun onFailure(call: Call<Boolean>, t: Throwable) {
|
||||||
_responseinsert.value = ResponseItemVO(
|
_responseinsert.value = ResponseItemVO(
|
||||||
|
|
@ -96,40 +94,10 @@ class ControlVehiculoViewModel(context: Context) : BaseViewModel() {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
fun machineWorker_Worker(usuario: String, password: String, userFk: String) {
|
fun workerMachinery_isRegistered(usuario: String, password: String) {
|
||||||
getVehicleControlTimeUserCase.machineWorker_Worker(
|
|
||||||
usuario,
|
|
||||||
password,
|
|
||||||
userFk
|
|
||||||
).enqueue(object : Callback<String> {
|
|
||||||
override fun onFailure(call: Call<String>, t: Throwable) {
|
|
||||||
_responsecontrol.value = ResponseItemVO(
|
|
||||||
isError = true,
|
|
||||||
errorMessage = "Error al comprobar el control vehículo"
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onResponse(call: Call<String>, response: Response<String>) {
|
|
||||||
if (response.body() == null) {
|
|
||||||
_responsecontrol.value = ResponseItemVO(
|
|
||||||
isError = true,
|
|
||||||
errorMessage = "Error al comprobar control vehículo"
|
|
||||||
)
|
|
||||||
} else {
|
|
||||||
_responsecontrol.value =
|
|
||||||
ResponseItemVO(isError = false, response = response.body()!!)
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
fun workerMachinery_isRegistered(usuario: String, password: String, userFk: String) {
|
|
||||||
getVehicleControlTimeUserCase.workerMachinery_isRegistered(
|
getVehicleControlTimeUserCase.workerMachinery_isRegistered(
|
||||||
usuario,
|
usuario,
|
||||||
password,
|
password
|
||||||
userFk
|
|
||||||
).enqueue(object : Callback<String> {
|
).enqueue(object : Callback<String> {
|
||||||
override fun onFailure(call: Call<String>, t: Throwable) {
|
override fun onFailure(call: Call<String>, t: Throwable) {
|
||||||
_responsecontrol.value = ResponseItemVO(
|
_responsecontrol.value = ResponseItemVO(
|
||||||
|
|
@ -156,11 +124,11 @@ class ControlVehiculoViewModel(context: Context) : BaseViewModel() {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
fun deviceProduction_getnameDevice(usuario: String, password: String, userFk: String) {
|
fun deviceProduction_getnameDevice(usuario: String, password: String, android_id: String) {
|
||||||
getVehicleControlTimeUserCase.deviceProduction_getnameDevice(
|
getVehicleControlTimeUserCase.deviceProduction_getnameDevice(
|
||||||
usuario,
|
usuario,
|
||||||
password,
|
password,
|
||||||
userFk
|
android_id
|
||||||
).enqueue(object : Callback<String> {
|
).enqueue(object : Callback<String> {
|
||||||
override fun onFailure(call: Call<String>, t: Throwable) {
|
override fun onFailure(call: Call<String>, t: Throwable) {
|
||||||
// Log.i("VERDNATURA::","${t.message}")
|
// Log.i("VERDNATURA::","${t.message}")
|
||||||
|
|
@ -228,50 +196,16 @@ class ControlVehiculoViewModel(context: Context) : BaseViewModel() {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
fun deviceProduction_getdeviceNameFromUser(usuario: String, password: String, userFk: String) {
|
|
||||||
getVehicleControlTimeUserCase.deviceProduction_getdeviceNameFromUser(
|
|
||||||
usuario,
|
|
||||||
password,
|
|
||||||
userFk
|
|
||||||
).enqueue(object : Callback<String> {
|
|
||||||
override fun onFailure(call: Call<String>, t: Throwable) {
|
|
||||||
_responsemachine.value = ResponseItemMachineControl(
|
|
||||||
isError = true,
|
|
||||||
errorMessage = "Error al comprobar el trabajador del dispositivo",
|
|
||||||
type = ""
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onResponse(call: Call<String>, response: Response<String>) {
|
|
||||||
if (response.body() == null) {
|
|
||||||
_responsemachine.value = ResponseItemMachineControl(
|
|
||||||
isError = true,
|
|
||||||
errorMessage = "Error al comprobar el trabajador del dispositivo",
|
|
||||||
type = ""
|
|
||||||
)
|
|
||||||
} else {
|
|
||||||
_responsemachine.value =
|
|
||||||
ResponseItemMachineControl(
|
|
||||||
isError = false,
|
|
||||||
response = response.body()!!,
|
|
||||||
type = "getdeviceNameFromUser"
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
fun machine_getWorkerPlate(usuario: String, password: String) {
|
||||||
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
fun machine_getWorkerPlate(usuario: String, password: String, userFk: String) {
|
|
||||||
getVehicleControlTimeUserCase.machine_getWorkerPlate(
|
getVehicleControlTimeUserCase.machine_getWorkerPlate(
|
||||||
usuario,
|
usuario,
|
||||||
password,
|
password
|
||||||
userFk
|
|
||||||
).enqueue(object : Callback<String> {
|
).enqueue(object : Callback<String> {
|
||||||
override fun onFailure(call: Call<String>, t: Throwable) {
|
override fun onFailure(call: Call<String>, t: Throwable) {
|
||||||
|
|
||||||
// Log.i("VERDNATURA::","Error ${t.message}")
|
|
||||||
_responsemachine.value = ResponseItemMachineControl(
|
_responsemachine.value = ResponseItemMachineControl(
|
||||||
isError = true,
|
isError = true,
|
||||||
errorMessage = " Error al comprobar el trabajador si ha cogido el vehículo",
|
errorMessage = " Error al comprobar el trabajador si ha cogido el vehículo",
|
||||||
|
|
|
||||||
|
|
@ -2,10 +2,12 @@ package es.verdnatura.presentation.view.feature.historico.adapter
|
||||||
|
|
||||||
import android.view.LayoutInflater
|
import android.view.LayoutInflater
|
||||||
import android.view.ViewGroup
|
import android.view.ViewGroup
|
||||||
|
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import es.verdnatura.R
|
import es.verdnatura.R
|
||||||
import es.verdnatura.databinding.ItemHistoricoRowBinding
|
import es.verdnatura.databinding.ItemHistoricoRowBinding
|
||||||
import es.verdnatura.presentation.view.feature.historico.model.ItemHistoricoVO
|
import es.verdnatura.presentation.view.feature.historico.model.ItemHistoricoVO
|
||||||
|
import androidx.core.content.ContextCompat
|
||||||
import java.text.SimpleDateFormat
|
import java.text.SimpleDateFormat
|
||||||
import java.util.*
|
import java.util.*
|
||||||
|
|
||||||
|
|
@ -36,9 +38,10 @@ class HistoricoAdapter (
|
||||||
val sdf = SimpleDateFormat("yyyy-MM-dd")
|
val sdf = SimpleDateFormat("yyyy-MM-dd")
|
||||||
val currentDate = sdf.format(Date())
|
val currentDate = sdf.format(Date())
|
||||||
if (currentDate == item.shipped){
|
if (currentDate == item.shipped){
|
||||||
historicoDate.setBackgroundColor(res.getColor(R.color.verdnatura_pumpkin_orange))
|
// historicoDate.setBackgroundColor(res.getColor(R.color.verdnatura_pumpkin_orange))
|
||||||
|
historicoDate.setBackgroundColor(ContextCompat.getColor(historicoDate.getContext(),R.color.verdnatura_pumpkin_orange))
|
||||||
}else{
|
}else{
|
||||||
historicoDate.setBackgroundColor(res.getColor(R.color.verdnatura_black_5))
|
historicoDate.setBackgroundColor(ContextCompat.getColor(historicoDate.getContext(),R.color.verdnatura_black_5))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
package es.verdnatura.presentation.view.feature.historicovehiculo.adapter
|
package es.verdnatura.presentation.view.feature.historicovehiculo.adapter
|
||||||
import android.view.LayoutInflater
|
import android.view.LayoutInflater
|
||||||
import android.view.ViewGroup
|
import android.view.ViewGroup
|
||||||
|
import androidx.core.content.ContextCompat
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import es.verdnatura.R
|
import es.verdnatura.R
|
||||||
import es.verdnatura.databinding.ItemHistoricovehiculoRowBinding
|
import es.verdnatura.databinding.ItemHistoricovehiculoRowBinding
|
||||||
|
|
@ -37,9 +38,9 @@ class HistoricoVehiculoAdapter (
|
||||||
val sdf = SimpleDateFormat("yyyy-MM-dd")
|
val sdf = SimpleDateFormat("yyyy-MM-dd")
|
||||||
val currentDate = sdf.format(Date())
|
val currentDate = sdf.format(Date())
|
||||||
if (currentDate == item.inTimed){
|
if (currentDate == item.inTimed){
|
||||||
historicoDate.setBackgroundColor(res.getColor(R.color.verdnatura_pumpkin_orange))
|
historicoDate.setBackgroundColor(ContextCompat.getColor(historicoDate.context,R.color.verdnatura_pumpkin_orange))
|
||||||
}else{
|
}else{
|
||||||
historicoDate.setBackgroundColor(res.getColor(R.color.verdnatura_black_5))
|
historicoDate.setBackgroundColor(ContextCompat.getColor(historicoDate.context,R.color.verdnatura_black_5))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -62,7 +62,7 @@ class HistoricoVehiculoFragment (
|
||||||
|
|
||||||
////Log.i("VERDNATURA:","la matricula es $numberPlate")
|
////Log.i("VERDNATURA:","la matricula es $numberPlate")
|
||||||
//sergio: revisar entrypoint
|
//sergio: revisar entrypoint
|
||||||
viewModel.machineWorker_getHistorical(user,password,numberPlate,userFk)
|
viewModel.machineWorker_getHistorical(user,password,numberPlate)
|
||||||
toolbar_title.text = getString(R.string.vehiclediary)
|
toolbar_title.text = getString(R.string.vehiclediary)
|
||||||
setEvents()
|
setEvents()
|
||||||
super.init()
|
super.init()
|
||||||
|
|
|
||||||
|
|
@ -26,8 +26,8 @@ class HistoricoVehiculoViewModel (context: Context) : BaseViewModel() {
|
||||||
val loadHistoricoVehiculoList = Transformations.map(_historicovehiculoList) { Event(it) }
|
val loadHistoricoVehiculoList = Transformations.map(_historicovehiculoList) { Event(it) }
|
||||||
|
|
||||||
|
|
||||||
fun machineWorker_getHistorical(usuario:String,password:String,plateNumber:String,nameWorker:String){
|
fun machineWorker_getHistorical(usuario:String,password:String,plateNumber:String){
|
||||||
GetVehicleControlTimeUserCase.machineWorker_getHistorical(usuario,password,plateNumber,nameWorker).enqueue(object :
|
GetVehicleControlTimeUserCase.machineWorker_getHistorical(usuario,password,plateNumber).enqueue(object :
|
||||||
Callback<List<ItemHistoricoVehiculo>> {
|
Callback<List<ItemHistoricoVehiculo>> {
|
||||||
override fun onFailure(call: Call<List<ItemHistoricoVehiculo>>, t: Throwable) {
|
override fun onFailure(call: Call<List<ItemHistoricoVehiculo>>, t: Throwable) {
|
||||||
val listError:ArrayList<ItemHistoricoVehiculo> = ArrayList()
|
val listError:ArrayList<ItemHistoricoVehiculo> = ArrayList()
|
||||||
|
|
|
||||||
|
|
@ -168,7 +168,7 @@ class InventaryFragment : BaseFragment<FragmentInventaryBinding,InventaryViewMod
|
||||||
}else{
|
}else{
|
||||||
listInvetory.removeAll(listInvetoryAux)
|
listInvetory.removeAll(listInvetoryAux)
|
||||||
listInvetoryAux.forEach {
|
listInvetoryAux.forEach {
|
||||||
if ((it.itemFk.contains(filter_itemFk.text.toString(),true)) || (it.producer?.contains(filter_itemFk.text.toString(),true))){
|
if ((it.itemFk.contains(filter_itemFk.text.toString(),true)) || (it.producer.contains(filter_itemFk.text.toString(),true))){
|
||||||
listInvetory.add(it)
|
listInvetory.add(it)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,13 @@
|
||||||
package es.verdnatura.presentation.view.feature.login.activity
|
package es.verdnatura.presentation.view.feature.login.activity
|
||||||
|
|
||||||
|
import android.content.Intent
|
||||||
import es.verdnatura.R
|
import es.verdnatura.R
|
||||||
import es.verdnatura.databinding.ActivityLoginBinding
|
import es.verdnatura.databinding.ActivityLoginBinding
|
||||||
import es.verdnatura.presentation.base.BaseActivity
|
import es.verdnatura.presentation.base.BaseActivity
|
||||||
import es.verdnatura.presentation.common.TAG
|
import es.verdnatura.presentation.common.TAG
|
||||||
import es.verdnatura.presentation.common.addFragment
|
import es.verdnatura.presentation.common.addFragment
|
||||||
import es.verdnatura.presentation.view.feature.login.fragment.LoginFragment
|
import es.verdnatura.presentation.view.feature.login.fragment.LoginFragment
|
||||||
|
import es.verdnatura.presentation.view.feature.main.activity.MainActivity
|
||||||
|
|
||||||
class LoginActivity : BaseActivity<ActivityLoginBinding>() {
|
class LoginActivity : BaseActivity<ActivityLoginBinding>() {
|
||||||
|
|
||||||
|
|
@ -24,7 +26,17 @@ class LoginActivity : BaseActivity<ActivityLoginBinding>() {
|
||||||
ViewGroup.LayoutParams.MATCH_PARENT,
|
ViewGroup.LayoutParams.MATCH_PARENT,
|
||||||
ViewGroup.LayoutParams.WRAP_CONTENT))*/
|
ViewGroup.LayoutParams.WRAP_CONTENT))*/
|
||||||
|
|
||||||
|
//goToMain()
|
||||||
|
|
||||||
addFragment(LoginFragment.newInstance(), R.id.main_frame_layout, LoginFragment.TAG)
|
addFragment(LoginFragment.newInstance(), R.id.main_frame_layout, LoginFragment.TAG)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun goToMain() {
|
||||||
|
val intent = Intent(this, MainActivity::class.java)
|
||||||
|
startActivity(intent)
|
||||||
|
//splash_progress.visibility=View.GONE
|
||||||
|
finish()
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -54,12 +54,11 @@ class LoginFragment : BaseFragment<FragmentLoginBinding, LoginViewModel>(LoginVi
|
||||||
getANDROIDID()
|
getANDROIDID()
|
||||||
)*/
|
)*/
|
||||||
|
|
||||||
|
viewModel.device_checkLogin(
|
||||||
viewModel.device_checkLogin(
|
|
||||||
edittext_username.text.toString(),
|
edittext_username.text.toString(),
|
||||||
edittext_password.text.toString(),
|
edittext_password.text.toString(),
|
||||||
getANDROIDID()
|
getANDROIDID()
|
||||||
)
|
)
|
||||||
|
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
@ -154,7 +153,7 @@ class LoginFragment : BaseFragment<FragmentLoginBinding, LoginViewModel>(LoginVi
|
||||||
|
|
||||||
}
|
}
|
||||||
if (it.IsVersionCritical == 1) {
|
if (it.IsVersionCritical == 1) {
|
||||||
customDialog.setDescription("Se requiere actualizar la app para que funcione correctamente.")
|
customDialog.setDescription(getString(R.string.updatecritical))
|
||||||
} else {
|
} else {
|
||||||
customDialog.setKoButton("Cancelar") {
|
customDialog.setKoButton("Cancelar") {
|
||||||
customDialog.dismiss()
|
customDialog.dismiss()
|
||||||
|
|
@ -400,6 +399,7 @@ class LoginFragment : BaseFragment<FragmentLoginBinding, LoginViewModel>(LoginVi
|
||||||
private fun goToMain() {
|
private fun goToMain() {
|
||||||
val intent = Intent(activity, MainActivity::class.java)
|
val intent = Intent(activity, MainActivity::class.java)
|
||||||
startActivity(intent)
|
startActivity(intent)
|
||||||
|
//splash_progress.visibility=View.GONE
|
||||||
requireActivity().finish()
|
requireActivity().finish()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -141,7 +141,7 @@ class LoginViewModel(context: Context) : BaseViewModel() {
|
||||||
var loginDevice: LoginDevice?
|
var loginDevice: LoginDevice?
|
||||||
|
|
||||||
if (response.raw().code() == 555) {
|
if (response.raw().code() == 555) {
|
||||||
var message = response.raw().message().toString()
|
// var message = response.raw().message().toString()
|
||||||
loginDevice = LoginDevice(
|
loginDevice = LoginDevice(
|
||||||
isError = true,
|
isError = true,
|
||||||
errorMessage = "Usuario o contraseña incorrectos."
|
errorMessage = "Usuario o contraseña incorrectos."
|
||||||
|
|
|
||||||
|
|
@ -86,6 +86,8 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
|
||||||
Timber.plant(Timber.DebugTree())
|
Timber.plant(Timber.DebugTree())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun haveSector(): Boolean {
|
private fun haveSector(): Boolean {
|
||||||
|
|
@ -208,7 +210,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
|
||||||
PasilleroFragment.TAG,
|
PasilleroFragment.TAG,
|
||||||
false
|
false
|
||||||
)
|
)
|
||||||
true
|
//true
|
||||||
}
|
}
|
||||||
getString(R.string.Sacadores) -> {
|
getString(R.string.Sacadores) -> {
|
||||||
fm.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE)
|
fm.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE)
|
||||||
|
|
@ -220,7 +222,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
|
||||||
MAINACTIVITY.TAG,
|
MAINACTIVITY.TAG,
|
||||||
false
|
false
|
||||||
)
|
)
|
||||||
true
|
//true
|
||||||
}
|
}
|
||||||
getString(R.string.Controladores) -> {
|
getString(R.string.Controladores) -> {
|
||||||
fm.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE)
|
fm.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE)
|
||||||
|
|
@ -232,7 +234,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
|
||||||
false
|
false
|
||||||
)
|
)
|
||||||
|
|
||||||
true
|
// true
|
||||||
}
|
}
|
||||||
getString(R.string.Paletizadores) -> {
|
getString(R.string.Paletizadores) -> {
|
||||||
fm.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE)
|
fm.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE)
|
||||||
|
|
@ -245,7 +247,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
|
||||||
false
|
false
|
||||||
)
|
)
|
||||||
|
|
||||||
true
|
// true
|
||||||
}
|
}
|
||||||
getString(R.string.Ajustes) -> {
|
getString(R.string.Ajustes) -> {
|
||||||
fm.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE)
|
fm.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE)
|
||||||
|
|
@ -258,7 +260,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
else -> false
|
//else -> false
|
||||||
}
|
}
|
||||||
|
|
||||||
true
|
true
|
||||||
|
|
|
||||||
|
|
@ -11,6 +11,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
|
||||||
import es.verdnatura.R
|
import es.verdnatura.R
|
||||||
import es.verdnatura.databinding.FragmentExpeditionPalletDetailBinding
|
import es.verdnatura.databinding.FragmentExpeditionPalletDetailBinding
|
||||||
import es.verdnatura.domain.notNull
|
import es.verdnatura.domain.notNull
|
||||||
|
import es.verdnatura.domain.toast
|
||||||
import es.verdnatura.presentation.base.BaseFragment
|
import es.verdnatura.presentation.base.BaseFragment
|
||||||
import es.verdnatura.presentation.common.OnOptionsSelectedListener
|
import es.verdnatura.presentation.common.OnOptionsSelectedListener
|
||||||
import es.verdnatura.presentation.common.OnPalletClickListener
|
import es.verdnatura.presentation.common.OnPalletClickListener
|
||||||
|
|
@ -39,6 +40,7 @@ class ExpeditionPalletDetailFragment(
|
||||||
private var password = ""
|
private var password = ""
|
||||||
private var sectorFk = ""
|
private var sectorFk = ""
|
||||||
private var warehouseFk = ""
|
private var warehouseFk = ""
|
||||||
|
private var SectorDescription = ""
|
||||||
private var adapter : ExpeditionPalletViewAdapter? = null
|
private var adapter : ExpeditionPalletViewAdapter? = null
|
||||||
private lateinit var customDialogList: CustomDialogList
|
private lateinit var customDialogList: CustomDialogList
|
||||||
private var onPalletClickListener:OnPalletClickListener? = null
|
private var onPalletClickListener:OnPalletClickListener? = null
|
||||||
|
|
@ -64,6 +66,7 @@ class ExpeditionPalletDetailFragment(
|
||||||
password = prefs.getString(PASSWORD,"").toString()
|
password = prefs.getString(PASSWORD,"").toString()
|
||||||
sectorFk = prefs.getInt(SECTORFK,1).toString()
|
sectorFk = prefs.getInt(SECTORFK,1).toString()
|
||||||
warehouseFk = prefs.getInt(WAREHOUSEFK,1).toString()
|
warehouseFk = prefs.getInt(WAREHOUSEFK,1).toString()
|
||||||
|
SectorDescription=prefs.getString(SECTORDESCRIP,"Sin Sector").toString()
|
||||||
|
|
||||||
|
|
||||||
super.onCreate(savedInstanceState)
|
super.onCreate(savedInstanceState)
|
||||||
|
|
@ -119,7 +122,9 @@ class ExpeditionPalletDetailFragment(
|
||||||
}else if(item == iconPrint){
|
}else if(item == iconPrint){
|
||||||
splash_progress.visibility = View.VISIBLE
|
splash_progress.visibility = View.VISIBLE
|
||||||
|
|
||||||
|
(getString(R.string.Imprimiendo)+" por " +SectorDescription).toast(requireContext())
|
||||||
viewModel.expeditionPalletPrintSet(user,password,itemPallet!!.Pallet,sectorFk)
|
viewModel.expeditionPalletPrintSet(user,password,itemPallet!!.Pallet,sectorFk)
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
|
||||||
|
|
@ -228,7 +228,7 @@ class ExpeditionPalletFragment(
|
||||||
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) {
|
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) {
|
||||||
if (!customDialogList.getValue().isNullOrEmpty()){
|
if (!customDialogList.getValue().isNullOrEmpty()){
|
||||||
try{
|
try{
|
||||||
val numExpedition = customDialogList.getValue().toDouble()
|
// val numExpedition = customDialogList.getValue().toDouble()
|
||||||
if(customDialogList.getValue().length >= 7){
|
if(customDialogList.getValue().length >= 7){
|
||||||
listExpeditions.add(0,BarcodeVO(code = customDialogList.getValue()))
|
listExpeditions.add(0,BarcodeVO(code = customDialogList.getValue()))
|
||||||
customDialogList.setDescription("Total: "+listExpeditions.size)
|
customDialogList.setDescription("Total: "+listExpeditions.size)
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ import android.view.inputmethod.EditorInfo
|
||||||
import androidx.lifecycle.Observer
|
import androidx.lifecycle.Observer
|
||||||
import androidx.recyclerview.widget.LinearLayoutManager
|
import androidx.recyclerview.widget.LinearLayoutManager
|
||||||
import es.verdnatura.R
|
import es.verdnatura.R
|
||||||
import es.verdnatura.databinding.FragmentExpeditionstateBinding
|
import es.verdnatura.databinding.FragmentItemexpeditionstateCardBinding
|
||||||
import es.verdnatura.presentation.base.BaseFragment
|
import es.verdnatura.presentation.base.BaseFragment
|
||||||
import es.verdnatura.presentation.common.OnItemExpeditionStateRowClickListener
|
import es.verdnatura.presentation.common.OnItemExpeditionStateRowClickListener
|
||||||
import es.verdnatura.presentation.view.component.CustomDialog
|
import es.verdnatura.presentation.view.component.CustomDialog
|
||||||
|
|
@ -29,8 +29,8 @@ import kotlinx.android.synthetic.main.toolbar.*
|
||||||
|
|
||||||
class ExpeditionStateFragment(
|
class ExpeditionStateFragment(
|
||||||
var entryPoint: String = ""
|
var entryPoint: String = ""
|
||||||
) : BaseFragment<FragmentExpeditionstateBinding, ExpeditionStateViewModel>(ExpeditionStateViewModel::class) {
|
// ) : BaseFragment<FragmentExpeditionstateBinding, ExpeditionStateViewModel>(ExpeditionStateViewModel::class) {
|
||||||
|
) : BaseFragment<FragmentItemexpeditionstateCardBinding, ExpeditionStateViewModel>(ExpeditionStateViewModel::class) {
|
||||||
private var urlLarge: String = ""
|
private var urlLarge: String = ""
|
||||||
private var titleImage: String = ""
|
private var titleImage: String = ""
|
||||||
private var user = ""
|
private var user = ""
|
||||||
|
|
@ -98,7 +98,7 @@ class ExpeditionStateFragment(
|
||||||
warehouseFk = prefs.getInt(WAREHOUSEFK, 1).toString()
|
warehouseFk = prefs.getInt(WAREHOUSEFK, 1).toString()
|
||||||
// this.itemFk = itemFk
|
// this.itemFk = itemFk
|
||||||
splash_progress.visibility = View.VISIBLE
|
splash_progress.visibility = View.VISIBLE
|
||||||
viewModel.expedition_getStateJSON(expeditionFk, user!!, password!!)
|
viewModel.expedition_getStateJSON(expeditionFk, user, password)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
package es.verdnatura.presentation.view.feature.parking.fragment
|
package es.verdnatura.presentation.view.feature.parking.fragment
|
||||||
|
|
||||||
|
import android.annotation.SuppressLint
|
||||||
import android.content.SharedPreferences
|
import android.content.SharedPreferences
|
||||||
import android.media.MediaPlayer
|
import android.media.MediaPlayer
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
|
|
@ -18,6 +19,7 @@ import es.verdnatura.presentation.view.feature.main.activity.MainActivity
|
||||||
import es.verdnatura.presentation.view.feature.parking.adapter.ParkingAdapter
|
import es.verdnatura.presentation.view.feature.parking.adapter.ParkingAdapter
|
||||||
import kotlinx.android.synthetic.main.fragment_parking.*
|
import kotlinx.android.synthetic.main.fragment_parking.*
|
||||||
import kotlinx.android.synthetic.main.toolbar.*
|
import kotlinx.android.synthetic.main.toolbar.*
|
||||||
|
import timber.log.Timber
|
||||||
|
|
||||||
class ParkingFragment : BaseFragment<FragmentParkingBinding,ParkingViewModel>(ParkingViewModel::class) {
|
class ParkingFragment : BaseFragment<FragmentParkingBinding,ParkingViewModel>(ParkingViewModel::class) {
|
||||||
|
|
||||||
|
|
@ -42,7 +44,9 @@ class ParkingFragment : BaseFragment<FragmentParkingBinding,ParkingViewModel>(Pa
|
||||||
override fun init() {
|
override fun init() {
|
||||||
setEvents()
|
setEvents()
|
||||||
toolbar_title.text = "Parking"
|
toolbar_title.text = "Parking"
|
||||||
viewModel.hideProgressLoading()
|
//sergio: después de las últimas actualizaciones se queda activo. Se cambia opción visibilidad.
|
||||||
|
//viewModel.hideProgressLoading()
|
||||||
|
splash_progress.visibility=View.GONE
|
||||||
setList()
|
setList()
|
||||||
customDialog = CustomDialog(requireContext())
|
customDialog = CustomDialog(requireContext())
|
||||||
super.init()
|
super.init()
|
||||||
|
|
|
||||||
|
|
@ -44,6 +44,7 @@ class PreSacadorFragment : BaseFragment<FragmentPreSacadorBinding,PreSacadorView
|
||||||
private var password = ""
|
private var password = ""
|
||||||
private var sectorFk = ""
|
private var sectorFk = ""
|
||||||
private var warehouseFk = ""
|
private var warehouseFk = ""
|
||||||
|
private var SectorDescription = ""
|
||||||
var mperror: MediaPlayer? = null
|
var mperror: MediaPlayer? = null
|
||||||
var mpok: MediaPlayer? = null
|
var mpok: MediaPlayer? = null
|
||||||
private var sales:ArrayList<PreSacadorItemVO> = ArrayList()
|
private var sales:ArrayList<PreSacadorItemVO> = ArrayList()
|
||||||
|
|
@ -82,6 +83,7 @@ class PreSacadorFragment : BaseFragment<FragmentPreSacadorBinding,PreSacadorView
|
||||||
warehouseFk = prefs.getInt(WAREHOUSEFK,1).toString()
|
warehouseFk = prefs.getInt(WAREHOUSEFK,1).toString()
|
||||||
mperror = MediaPlayer.create((activity as MainActivity),R.raw.error)
|
mperror = MediaPlayer.create((activity as MainActivity),R.raw.error)
|
||||||
mpok = MediaPlayer.create((activity as MainActivity),R.raw.ok)
|
mpok = MediaPlayer.create((activity as MainActivity),R.raw.ok)
|
||||||
|
SectorDescription=prefs.getString(SECTORDESCRIP,"Sin Sector").toString()
|
||||||
|
|
||||||
super.onCreate(savedInstanceState)
|
super.onCreate(savedInstanceState)
|
||||||
}
|
}
|
||||||
|
|
@ -294,7 +296,7 @@ class PreSacadorFragment : BaseFragment<FragmentPreSacadorBinding,PreSacadorView
|
||||||
//1- Por carro
|
//1- Por carro
|
||||||
var shelvingIndex = 0
|
var shelvingIndex = 0
|
||||||
for (placementVO in saleVO.carros){
|
for (placementVO in saleVO.carros){
|
||||||
if (txtscan.toUpperCase() == placementVO.shelving.toUpperCase()){
|
if (txtscan.uppercase() == placementVO.shelving.uppercase()){
|
||||||
if (mpok != null) mpok!!.start()
|
if (mpok != null) mpok!!.start()
|
||||||
isOk = true
|
isOk = true
|
||||||
showShelving(index,shelvingIndex)
|
showShelving(index,shelvingIndex)
|
||||||
|
|
@ -328,7 +330,7 @@ class PreSacadorFragment : BaseFragment<FragmentPreSacadorBinding,PreSacadorView
|
||||||
//1- Por carro
|
//1- Por carro
|
||||||
var shelvingIndex = 0
|
var shelvingIndex = 0
|
||||||
for (placementVO in saleVO.carros){
|
for (placementVO in saleVO.carros){
|
||||||
if (txtscan.toUpperCase() == placementVO.shelving.toUpperCase()){
|
if (txtscan.uppercase() == placementVO.shelving.uppercase()){
|
||||||
if (mpok != null) mpok!!.start()
|
if (mpok != null) mpok!!.start()
|
||||||
isOk = true
|
isOk = true
|
||||||
showShelving(position,shelvingIndex)
|
showShelving(position,shelvingIndex)
|
||||||
|
|
@ -607,7 +609,7 @@ class PreSacadorFragment : BaseFragment<FragmentPreSacadorBinding,PreSacadorView
|
||||||
sectorFk = sectorFk
|
sectorFk = sectorFk
|
||||||
)
|
)
|
||||||
////Log.i("VERDNATURA:","La collection es $ticket, sectorFk $sectorFk, user $user i pass $password")
|
////Log.i("VERDNATURA:","La collection es $ticket, sectorFk $sectorFk, user $user i pass $password")
|
||||||
"Imprimiendo...".toast(requireContext())
|
(getString(R.string.Imprimiendo) + " por " + SectorDescription).toast(requireContext())
|
||||||
}
|
}
|
||||||
|
|
||||||
//OTROS
|
//OTROS
|
||||||
|
|
|
||||||
|
|
@ -90,7 +90,7 @@ class QrFragment(
|
||||||
(activity as MainActivity).hideKeyboard(scan_input)
|
(activity as MainActivity).hideKeyboard(scan_input)
|
||||||
return@setOnEditorActionListener true
|
return@setOnEditorActionListener true
|
||||||
}
|
}
|
||||||
false
|
//false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -286,7 +286,7 @@ class ReposicionFragment : BaseFragment<ReposicionFragmentBinding, ReposicionVie
|
||||||
//1- Por carro
|
//1- Por carro
|
||||||
var shelvingIndex = 0
|
var shelvingIndex = 0
|
||||||
for (placementVO in saleVO.carros){
|
for (placementVO in saleVO.carros){
|
||||||
if (txtscan.toUpperCase() == placementVO.shelving.toUpperCase()){
|
if (txtscan.uppercase() == placementVO.shelving.uppercase()){
|
||||||
if (mpok!= null) mpok!!.start()
|
if (mpok!= null) mpok!!.start()
|
||||||
isOk = true
|
isOk = true
|
||||||
showShelving(index,shelvingIndex)
|
showShelving(index,shelvingIndex)
|
||||||
|
|
@ -318,7 +318,7 @@ class ReposicionFragment : BaseFragment<ReposicionFragmentBinding, ReposicionVie
|
||||||
//1- Por carro
|
//1- Por carro
|
||||||
var shelvingIndex = 0
|
var shelvingIndex = 0
|
||||||
for (placementVO in saleVO.carros){
|
for (placementVO in saleVO.carros){
|
||||||
if (txtscan.toUpperCase() == placementVO.shelving.toUpperCase()){
|
if (txtscan.uppercase() == placementVO.shelving.uppercase()){
|
||||||
if(mpok != null) mpok!!.start()
|
if(mpok != null) mpok!!.start()
|
||||||
isOk = true
|
isOk = true
|
||||||
showShelving(position,shelvingIndex)
|
showShelving(position,shelvingIndex)
|
||||||
|
|
|
||||||
|
|
@ -63,7 +63,7 @@ class SacadorFragment :
|
||||||
password = prefs.getString(PASSWORD, "").toString()
|
password = prefs.getString(PASSWORD, "").toString()
|
||||||
sectorFk = prefs.getInt(SECTORFK, 1).toString()
|
sectorFk = prefs.getInt(SECTORFK, 1).toString()
|
||||||
warehouseFk = prefs.getInt(WAREHOUSEFK, 1).toString()
|
warehouseFk = prefs.getInt(WAREHOUSEFK, 1).toString()
|
||||||
wagons = prefs!!.getInt(WAGON, 2).toString()
|
wagons = prefs.getInt(WAGON, 2).toString()
|
||||||
//sergio:listener para collectionnew
|
//sergio:listener para collectionnew
|
||||||
/* setFragmentResultListener("requestKey") { key, bundle ->
|
/* setFragmentResultListener("requestKey") { key, bundle ->
|
||||||
resultTagMode = bundle.getString("tagMode")
|
resultTagMode = bundle.getString("tagMode")
|
||||||
|
|
|
||||||
|
|
@ -29,7 +29,7 @@ class ShelvingParkingViewModel(context: Context) : BaseViewModel() {
|
||||||
|
|
||||||
|
|
||||||
fun shelvingParking_get(usuario:String,password:String,vShelvingFk:String,vWarehouseFk:String,vDayRange:String){
|
fun shelvingParking_get(usuario:String,password:String,vShelvingFk:String,vWarehouseFk:String,vDayRange:String){
|
||||||
getShelvingParkingUserCase.shelvingParking_get(usuario,password,vShelvingFk.toUpperCase(),vWarehouseFk,vDayRange).enqueue(object :
|
getShelvingParkingUserCase.shelvingParking_get(usuario,password,vShelvingFk.uppercase(),vWarehouseFk,vDayRange).enqueue(object :
|
||||||
Callback<List<ItemShelvingParkingVO>> {
|
Callback<List<ItemShelvingParkingVO>> {
|
||||||
override fun onFailure(call: Call<List<ItemShelvingParkingVO>>, t: Throwable) {
|
override fun onFailure(call: Call<List<ItemShelvingParkingVO>>, t: Throwable) {
|
||||||
val listError:ArrayList<ItemShelvingParkingVO> = ArrayList()
|
val listError:ArrayList<ItemShelvingParkingVO> = ArrayList()
|
||||||
|
|
|
||||||
|
|
@ -4,14 +4,13 @@ package es.verdnatura.presentation.view.feature.smarttag.register
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.content.SharedPreferences
|
import android.content.SharedPreferences
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import android.util.Log
|
|
||||||
import android.view.View.*
|
import android.view.View.*
|
||||||
import android.view.inputmethod.EditorInfo
|
import android.view.inputmethod.EditorInfo
|
||||||
import androidx.activity.OnBackPressedCallback
|
import androidx.activity.OnBackPressedCallback
|
||||||
import androidx.lifecycle.Observer
|
import androidx.lifecycle.Observer
|
||||||
import androidx.recyclerview.widget.LinearLayoutManager
|
import androidx.recyclerview.widget.LinearLayoutManager
|
||||||
import es.verdnatura.R
|
import es.verdnatura.R
|
||||||
import es.verdnatura.databinding.FragmentSmarttagRegisterBinding
|
import es.verdnatura.databinding.FragmentSacadorAssociatesmarttagBinding
|
||||||
import es.verdnatura.domain.toast
|
import es.verdnatura.domain.toast
|
||||||
import es.verdnatura.presentation.base.BaseFragment
|
import es.verdnatura.presentation.base.BaseFragment
|
||||||
import es.verdnatura.presentation.common.*
|
import es.verdnatura.presentation.common.*
|
||||||
|
|
@ -32,13 +31,12 @@ import kotlinx.android.synthetic.main.fragment_controlador.splash_progress
|
||||||
import kotlinx.android.synthetic.main.fragment_expedition_scan.*
|
import kotlinx.android.synthetic.main.fragment_expedition_scan.*
|
||||||
import kotlinx.android.synthetic.main.fragment_login.*
|
import kotlinx.android.synthetic.main.fragment_login.*
|
||||||
import kotlinx.android.synthetic.main.fragment_sacador.*
|
import kotlinx.android.synthetic.main.fragment_sacador.*
|
||||||
import kotlinx.android.synthetic.main.fragment_sacador_associatesmarttag.*
|
|
||||||
import kotlinx.android.synthetic.main.fragment_smarttag_register.*
|
|
||||||
import kotlinx.android.synthetic.main.toolbar.*
|
import kotlinx.android.synthetic.main.toolbar.*
|
||||||
|
|
||||||
class RegisterSmartTagsFragment(
|
class RegisterSmartTagsFragment(
|
||||||
var entryPoint: String = ""
|
var entryPoint: String = ""
|
||||||
) : BaseFragment<FragmentSmarttagRegisterBinding, SmartTagsViewModel>(
|
) : BaseFragment<FragmentSacadorAssociatesmarttagBinding, SmartTagsViewModel>(
|
||||||
SmartTagsViewModel::class
|
SmartTagsViewModel::class
|
||||||
) {
|
) {
|
||||||
|
|
||||||
|
|
@ -49,7 +47,7 @@ class RegisterSmartTagsFragment(
|
||||||
private var sectorFk = ""
|
private var sectorFk = ""
|
||||||
private var warehouseFk = ""
|
private var warehouseFk = ""
|
||||||
private var goBack: Boolean = false
|
private var goBack: Boolean = false
|
||||||
private var onCollectionSelectedListener: OnCollectionSelectedListener? = null
|
//private var onCollectionSelectedListener: OnCollectionSelectedListener? = null
|
||||||
override fun getLayoutId(): Int = R.layout.fragment_sacador_associatesmarttag
|
override fun getLayoutId(): Int = R.layout.fragment_sacador_associatesmarttag
|
||||||
private lateinit var customDialog: CustomDialog
|
private lateinit var customDialog: CustomDialog
|
||||||
private lateinit var customDialogList: CustomDialogList
|
private lateinit var customDialogList: CustomDialogList
|
||||||
|
|
@ -204,30 +202,20 @@ class RegisterSmartTagsFragment(
|
||||||
customDialog.dismiss()
|
customDialog.dismiss()
|
||||||
}.show()
|
}.show()
|
||||||
} else {
|
} else {
|
||||||
if (it.response == null) {
|
var nameSmartTagwithWagon: String
|
||||||
|
|
||||||
customDialog.setTitle("Error")
|
//"Etiqueta/matrícula añadida correctamente".toast(context)
|
||||||
.setDescription("Etiqueta o carro no válido")
|
//var sizeSmartTags = listSmartTags.size + 1
|
||||||
.setOkButton("Cerrar") {
|
|
||||||
customDialog.dismiss()
|
|
||||||
}.show()
|
|
||||||
|
|
||||||
} else {
|
nameSmartTagwithWagon =
|
||||||
var nameSmartTagwithWagon = ""
|
getTextScaned(listSmartTags.size + 1) + itemScaned
|
||||||
|
customDialogList.setTitle(getTextToPosition(listSmartTags.size + 1))
|
||||||
//"Etiqueta/matrícula añadida correctamente".toast(context)
|
|
||||||
//var sizeSmartTags = listSmartTags.size + 1
|
|
||||||
|
|
||||||
nameSmartTagwithWagon =
|
|
||||||
getTextScaned(listSmartTags.size + 1) + itemScaned
|
|
||||||
customDialogList.setTitle(getTextToPosition(listSmartTags.size + 1))
|
|
||||||
|
|
||||||
|
|
||||||
listSmartTags.add(SmartTag(itemScaned, nameSmartTagwithWagon))
|
listSmartTags.add(SmartTag(itemScaned, nameSmartTagwithWagon))
|
||||||
smartAdapter!!.notifyDataSetChanged()
|
smartAdapter!!.notifyDataSetChanged()
|
||||||
customDialogList.setValue("")
|
customDialogList.setValue("")
|
||||||
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
splash_progress.visibility = GONE
|
splash_progress.visibility = GONE
|
||||||
})
|
})
|
||||||
|
|
|
||||||
|
|
@ -183,7 +183,7 @@ class AssociateSmartTagsFragment(
|
||||||
with(viewModel) {
|
with(viewModel) {
|
||||||
splash_progress.visibility = GONE
|
splash_progress.visibility = GONE
|
||||||
responseadd.observe(viewLifecycleOwner, Observer {
|
responseadd.observe(viewLifecycleOwner, Observer {
|
||||||
Log.i("VERDNATURA::", "Revisar llamada de las etiquetas smarttags : ${it.response}")
|
// Log.i("VERDNATURA::", "Revisar llamada de las etiquetas smarttags : ${it.response}")
|
||||||
|
|
||||||
if (it.isError) {
|
if (it.isError) {
|
||||||
|
|
||||||
|
|
@ -201,14 +201,13 @@ class AssociateSmartTagsFragment(
|
||||||
}.show()
|
}.show()
|
||||||
|
|
||||||
} else {*/
|
} else {*/
|
||||||
var nameSmartTagwithWagon = ""
|
|
||||||
|
|
||||||
//"Etiqueta/matrícula añadida correctamente".toast(context)
|
//"Etiqueta/matrícula añadida correctamente".toast(context)
|
||||||
//var sizeSmartTags = listSmartTags.size + 1
|
//var sizeSmartTags = listSmartTags.size + 1
|
||||||
|
|
||||||
nameSmartTagwithWagon =
|
var nameSmartTagwithWagon =
|
||||||
getTextScaned(listSmartTags.size + 1) + itemScaned
|
getTextScaned(0) + itemScaned
|
||||||
customDialogList.setTitle(getTextToPosition(listSmartTags.size + 1))
|
customDialogList.setTitle(getTextToPosition(0))
|
||||||
|
|
||||||
listSmartTags.add(SmartTag(itemScaned, nameSmartTagwithWagon))
|
listSmartTags.add(SmartTag(itemScaned, nameSmartTagwithWagon))
|
||||||
smartAdapter!!.notifyDataSetChanged()
|
smartAdapter!!.notifyDataSetChanged()
|
||||||
|
|
@ -236,7 +235,7 @@ class AssociateSmartTagsFragment(
|
||||||
}.show()
|
}.show()
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
var nameSmartTagwithWagon = ""
|
//var nameSmartTagwithWagon = ""
|
||||||
|
|
||||||
/* nameSmartTagwithWagon =
|
/* nameSmartTagwithWagon =
|
||||||
getTextScaned(listSmartTags.size + 1) + itemScaned
|
getTextScaned(listSmartTags.size + 1) + itemScaned
|
||||||
|
|
@ -258,8 +257,8 @@ class AssociateSmartTagsFragment(
|
||||||
|
|
||||||
private fun getTextToPosition(TagsScaned: Int): String {
|
private fun getTextToPosition(TagsScaned: Int): String {
|
||||||
var message = ""
|
var message = ""
|
||||||
var TagScaned = 0
|
|
||||||
when (TagScaned) {
|
when (TagsScaned) {
|
||||||
0 -> message = "Escanea etiqueta/s electrónica/s o matrícula/s"
|
0 -> message = "Escanea etiqueta/s electrónica/s o matrícula/s"
|
||||||
1 -> message = "Escanea etiqueta superior"
|
1 -> message = "Escanea etiqueta superior"
|
||||||
2 -> message = "Escanea etiqueta del medio"
|
2 -> message = "Escanea etiqueta del medio"
|
||||||
|
|
@ -272,7 +271,7 @@ class AssociateSmartTagsFragment(
|
||||||
private fun getTextScaned(TagScaned: Int): String {
|
private fun getTextScaned(TagScaned: Int): String {
|
||||||
var message = ""
|
var message = ""
|
||||||
|
|
||||||
var TagScaned = 0
|
|
||||||
when (TagScaned) {
|
when (TagScaned) {
|
||||||
0 -> message = "Escaneado:"
|
0 -> message = "Escaneado:"
|
||||||
1 -> message = "Carro:"
|
1 -> message = "Carro:"
|
||||||
|
|
@ -332,7 +331,7 @@ class AssociateSmartTagsFragment(
|
||||||
customDialogList.getEditText().requestFocus()
|
customDialogList.getEditText().requestFocus()
|
||||||
(activity as MainActivity).hideKeyboard(customDialogList.getEditText())
|
(activity as MainActivity).hideKeyboard(customDialogList.getEditText())
|
||||||
|
|
||||||
customDialogList.getEditText().setOnEditorActionListener { v, actionId, event ->
|
customDialogList.getEditText().setOnEditorActionListener { _, actionId, _ ->
|
||||||
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5 || actionId == 6) {
|
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5 || actionId == 6) {
|
||||||
if (!customDialogList.getValue().isNullOrEmpty()) {
|
if (!customDialogList.getValue().isNullOrEmpty()) {
|
||||||
bindShelving_add(customDialogList.getValue())
|
bindShelving_add(customDialogList.getValue())
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@ package es.verdnatura.presentation.view.feature.ubicador.adapter
|
||||||
|
|
||||||
import android.view.LayoutInflater
|
import android.view.LayoutInflater
|
||||||
import android.view.ViewGroup
|
import android.view.ViewGroup
|
||||||
|
import androidx.core.content.ContextCompat
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import es.verdnatura.R
|
import es.verdnatura.R
|
||||||
import es.verdnatura.databinding.ItemUbicationRowBinding
|
import es.verdnatura.databinding.ItemUbicationRowBinding
|
||||||
|
|
@ -50,9 +51,10 @@ class UbicadorAdapter (
|
||||||
}
|
}
|
||||||
|
|
||||||
if (item.visible == "0"){
|
if (item.visible == "0"){
|
||||||
visibleText.setTextColor(res.getColor(R.color.verdnatura_brown_grey))
|
visibleText.setTextColor(ContextCompat.getColor(visibleText.context,R.color.verdnatura_brown_grey))
|
||||||
|
|
||||||
}else{
|
}else{
|
||||||
visibleText.setTextColor(res.getColor(R.color.verdnatura_pumpkin_orange))
|
visibleText.setTextColor(ContextCompat.getColor(visibleText.context,R.color.verdnatura_pumpkin_orange))
|
||||||
}
|
}
|
||||||
|
|
||||||
moreImg.setOnClickListener {
|
moreImg.setOnClickListener {
|
||||||
|
|
|
||||||
|
|
@ -163,7 +163,7 @@ class UbicadorFragment(
|
||||||
customDialogInput.setTitle("Aparcar carro").setValue("").setOkButton("Aparcar"){
|
customDialogInput.setTitle("Aparcar carro").setValue("").setOkButton("Aparcar"){
|
||||||
viewModel.shelvingPark(user,password,shelvingFk,customDialogInput.getValue())
|
viewModel.shelvingPark(user,password,shelvingFk,customDialogInput.getValue())
|
||||||
parking = customDialogInput.getValue()
|
parking = customDialogInput.getValue()
|
||||||
toolbar_title.text = shelvingFk.toUpperCase() + " P: "+parking + " E: "+etiquetas
|
toolbar_title.text = shelvingFk.uppercase() + " P: "+parking + " E: "+etiquetas
|
||||||
if(mpok != null) mpok!!.start()
|
if(mpok != null) mpok!!.start()
|
||||||
customDialogInput.dismiss()
|
customDialogInput.dismiss()
|
||||||
}.setKoButton("Cancelar"){
|
}.setKoButton("Cancelar"){
|
||||||
|
|
@ -179,7 +179,7 @@ class UbicadorFragment(
|
||||||
customDialogInput.dismiss()
|
customDialogInput.dismiss()
|
||||||
parking = customDialogInput.getValue()
|
parking = customDialogInput.getValue()
|
||||||
if (toolbar_title != null && shelvingFk != null && parking != null && etiquetas != null){
|
if (toolbar_title != null && shelvingFk != null && parking != null && etiquetas != null){
|
||||||
toolbar_title.text = shelvingFk.toUpperCase() + " P: "+parking+ " E: "+etiquetas
|
toolbar_title.text = shelvingFk.uppercase() + " P: "+parking+ " E: "+etiquetas
|
||||||
}else{
|
}else{
|
||||||
toolbar_title.text = ""
|
toolbar_title.text = ""
|
||||||
}
|
}
|
||||||
|
|
@ -198,7 +198,7 @@ class UbicadorFragment(
|
||||||
customDialogInput.setTitle("Cambiar matrícula").setValue("").setOkButton("Guardar"){
|
customDialogInput.setTitle("Cambiar matrícula").setValue("").setOkButton("Guardar"){
|
||||||
viewModel.shelvingChange(user,password,shelvingFk,customDialogInput.getValue())
|
viewModel.shelvingChange(user,password,shelvingFk,customDialogInput.getValue())
|
||||||
shelvingFk = customDialogInput.getValue()
|
shelvingFk = customDialogInput.getValue()
|
||||||
toolbar_title.text = shelvingFk.toUpperCase() + " P: "+parking+ " E: "+etiquetas
|
toolbar_title.text = shelvingFk.uppercase() + " P: "+parking+ " E: "+etiquetas
|
||||||
if(mpok != null) mpok!!.start()
|
if(mpok != null) mpok!!.start()
|
||||||
customDialogInput.dismiss()
|
customDialogInput.dismiss()
|
||||||
}.setKoButton("Cancelar"){
|
}.setKoButton("Cancelar"){
|
||||||
|
|
@ -212,7 +212,7 @@ class UbicadorFragment(
|
||||||
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) {
|
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) {
|
||||||
viewModel.shelvingChange(user,password,shelvingFk,customDialogInput.getValue())
|
viewModel.shelvingChange(user,password,shelvingFk,customDialogInput.getValue())
|
||||||
shelvingFk = customDialogInput.getValue()
|
shelvingFk = customDialogInput.getValue()
|
||||||
toolbar_title.text = shelvingFk.toUpperCase() + " P: "+parking+ " E: "+etiquetas
|
toolbar_title.text = shelvingFk.uppercase() + " P: "+parking+ " E: "+etiquetas
|
||||||
if(mpok != null) mpok!!.start()
|
if(mpok != null) mpok!!.start()
|
||||||
customDialogInput.dismiss()
|
customDialogInput.dismiss()
|
||||||
return@setOnEditorActionListener true
|
return@setOnEditorActionListener true
|
||||||
|
|
@ -254,11 +254,11 @@ class UbicadorFragment(
|
||||||
contEtiquetas += item.stickers.toInt()
|
contEtiquetas += item.stickers.toInt()
|
||||||
}catch (e: Exception) {}
|
}catch (e: Exception) {}
|
||||||
|
|
||||||
parking = item.code.toUpperCase()
|
parking = item.code.uppercase()
|
||||||
listItems.add(item)
|
listItems.add(item)
|
||||||
}
|
}
|
||||||
etiquetas = contEtiquetas.toString()
|
etiquetas = contEtiquetas.toString()
|
||||||
toolbar_title.text = shelvingFk.toUpperCase() + " P: "+parking+ " E: "+etiquetas
|
toolbar_title.text = shelvingFk.uppercase() + " P: "+parking+ " E: "+etiquetas
|
||||||
if(it.list.size > 0)
|
if(it.list.size > 0)
|
||||||
edit_prioridad.setText(it.list[0].priority)
|
edit_prioridad.setText(it.list[0].priority)
|
||||||
splash_progress.visibility = View.GONE
|
splash_progress.visibility = View.GONE
|
||||||
|
|
|
||||||
|
|
@ -34,7 +34,7 @@ class UbicadorViewModel(context: Context) : BaseViewModel() {
|
||||||
|
|
||||||
|
|
||||||
fun itemShelvingList(usuario:String,password:String,vShelvingFk:String){
|
fun itemShelvingList(usuario:String,password:String,vShelvingFk:String){
|
||||||
getUbicadorUserCase.itemShelvingList(usuario,password,vShelvingFk.toUpperCase()).enqueue(object :
|
getUbicadorUserCase.itemShelvingList(usuario,password,vShelvingFk.uppercase()).enqueue(object :
|
||||||
Callback<List<ItemUbicadorVO>> {
|
Callback<List<ItemUbicadorVO>> {
|
||||||
override fun onFailure(call: Call<List<ItemUbicadorVO>>, t: Throwable) {
|
override fun onFailure(call: Call<List<ItemUbicadorVO>>, t: Throwable) {
|
||||||
val listError:ArrayList<ItemUbicadorVO> = ArrayList()
|
val listError:ArrayList<ItemUbicadorVO> = ArrayList()
|
||||||
|
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 16 KiB |
|
|
@ -1,5 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
|
||||||
<item android:color="@color/verdnatura_white" android:state_checked="true"/>
|
|
||||||
<item android:color="@color/verdnatura_brown_grey" android:state_checked="false"/>
|
|
||||||
</selector>
|
|
||||||
|
|
@ -1,9 +0,0 @@
|
||||||
<!-- drawable/barcode.xml -->
|
|
||||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:tint="#F7931E"
|
|
||||||
android:height="24dp"
|
|
||||||
android:width="24dp"
|
|
||||||
android:viewportWidth="24"
|
|
||||||
android:viewportHeight="24">
|
|
||||||
<path android:fillColor="#fff" android:pathData="M2,6H4V18H2V6M5,6H6V18H5V6M7,6H10V18H7V6M11,6H12V18H11V6M14,6H16V18H14V6M17,6H20V18H17V6M21,6H22V18H21V6Z" />
|
|
||||||
</vector>
|
|
||||||
|
|
@ -1,9 +0,0 @@
|
||||||
<!-- drawable/timer_sand.xml -->
|
|
||||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:tint="#F7931E"
|
|
||||||
android:height="24dp"
|
|
||||||
android:width="24dp"
|
|
||||||
android:viewportWidth="24"
|
|
||||||
android:viewportHeight="24">
|
|
||||||
<path android:fillColor="#FFF" android:pathData="M6,2H18V8H18V8L14,12L18,16V16H18V22H6V16H6V16L10,12L6,8V8H6V2M16,16.5L12,12.5L8,16.5V20H16V16.5M12,11.5L16,7.5V4H8V7.5L12,11.5M10,6H14V6.75L12,8.75L10,6.75V6Z" />
|
|
||||||
</vector>
|
|
||||||
|
|
@ -1,8 +0,0 @@
|
||||||
<!-- drawable/movie_remove_outline.xml -->
|
|
||||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:height="24dp"
|
|
||||||
android:width="24dp"
|
|
||||||
android:viewportWidth="24"
|
|
||||||
android:viewportHeight="24">
|
|
||||||
<path android:fillColor="#F7931E" android:pathData="M13 19C13 19.34 13.04 19.67 13.09 20H4C2.9 20 2 19.11 2 18V6C2 4.89 2.9 4 4 4H5L7 8H10L8 4H10L12 8H15L13 4H15L17 8H20L18 4H22V13.81C21.39 13.46 20.72 13.22 20 13.09V10H5.76L4 6.47V18H13.09C13.04 18.33 13 18.66 13 19M22.54 16.88L21.12 15.47L19 17.59L16.88 15.47L15.47 16.88L17.59 19L15.47 21.12L16.88 22.54L19 20.41L21.12 22.54L22.54 21.12L20.41 19L22.54 16.88Z" />
|
|
||||||
</vector>
|
|
||||||
|
|
@ -1,9 +0,0 @@
|
||||||
<!-- drawable/timer_sand_full.xml -->
|
|
||||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:tint="#F7931E"
|
|
||||||
android:height="24dp"
|
|
||||||
android:width="24dp"
|
|
||||||
android:viewportWidth="24"
|
|
||||||
android:viewportHeight="24">
|
|
||||||
<path android:fillColor="#F7931E" android:pathData="M6,2V8H6V8L10,12L6,16V16H6V22H18V16H18V16L14,12L18,8V8H18V2H6Z" />
|
|
||||||
</vector>
|
|
||||||
|
|
@ -1,9 +0,0 @@
|
||||||
<!-- drawable/car_emergency.xml -->
|
|
||||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:tint="#F7931E"
|
|
||||||
android:height="24dp"
|
|
||||||
android:width="24dp"
|
|
||||||
android:viewportWidth="24"
|
|
||||||
android:viewportHeight="24">
|
|
||||||
<path android:fillColor="#fff" android:pathData="M11 0V3H13V0H11M7.88 1.46L6.46 2.87L8.59 5L10 3.58L7.88 1.46M16.12 1.46L14 3.58L15.41 5L17.54 2.88L16.12 1.46M12 5A2 2 0 0 0 10 7V8H6.5C5.84 8 5.28 8.42 5.08 9L3 15V23A1 1 0 0 0 4 24H5A1 1 0 0 0 6 23V22H18V23A1 1 0 0 0 19 24H20A1 1 0 0 0 21 23V15L18.92 9C18.72 8.42 18.16 8 17.5 8H14V7A2 2 0 0 0 12 5M6.5 9.5H17.5L19 14H5L6.5 9.5M6.5 16A1.5 1.5 0 0 1 8 17.5A1.5 1.5 0 0 1 6.5 19A1.5 1.5 0 0 1 5 17.5A1.5 1.5 0 0 1 6.5 16M17.5 16A1.5 1.5 0 0 1 19 17.5A1.5 1.5 0 0 1 17.5 19A1.5 1.5 0 0 1 16 17.5A1.5 1.5 0 0 1 17.5 16Z" />
|
|
||||||
</vector>
|
|
||||||
|
|
@ -1,14 +0,0 @@
|
||||||
|
|
||||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:shape="rectangle" >
|
|
||||||
<corners
|
|
||||||
android:radius="20dp"
|
|
||||||
/>
|
|
||||||
<solid
|
|
||||||
android:color="#FFFFFF"
|
|
||||||
/>
|
|
||||||
<size
|
|
||||||
android:width="250dp"
|
|
||||||
android:height="60dp"
|
|
||||||
/>
|
|
||||||
</shape>
|
|
||||||
|
|
@ -1,8 +0,0 @@
|
||||||
<!-- drawable/delete.xml -->
|
|
||||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:height="24dp"
|
|
||||||
android:width="24dp"
|
|
||||||
android:viewportWidth="24"
|
|
||||||
android:viewportHeight="24">
|
|
||||||
<path android:fillColor="#fff" android:pathData="M19,4H15.5L14.5,3H9.5L8.5,4H5V6H19M6,19A2,2 0 0,0 8,21H16A2,2 0 0,0 18,19V7H6V19Z" />
|
|
||||||
</vector>
|
|
||||||
|
|
@ -1,5 +0,0 @@
|
||||||
<vector android:height="24dp" android:tint="#FFFFFF"
|
|
||||||
android:viewportHeight="24.0" android:viewportWidth="24.0"
|
|
||||||
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
|
|
||||||
<path android:fillColor="#FFFFFF" android:pathData="M20,8h-3L17,4L3,4c-1.1,0 -2,0.9 -2,2v11h2c0,1.66 1.34,3 3,3s3,-1.34 3,-3h6c0,1.66 1.34,3 3,3s3,-1.34 3,-3h2v-5l-3,-4zM6,18.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM19.5,9.5l1.96,2.5L17,12L17,9.5h2.5zM18,18.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5z"/>
|
|
||||||
</vector>
|
|
||||||
|
|
@ -1,5 +0,0 @@
|
||||||
<vector android:height="24dp" android:tint="#F7931E"
|
|
||||||
android:viewportHeight="24.0" android:viewportWidth="24.0"
|
|
||||||
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
|
|
||||||
<path android:fillColor="#F7931E" android:pathData="M20,8h-3L17,4L3,4c-1.1,0 -2,0.9 -2,2v11h2c0,1.66 1.34,3 3,3s3,-1.34 3,-3h6c0,1.66 1.34,3 3,3s3,-1.34 3,-3h2v-5l-3,-4zM6,18.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM19.5,9.5l1.96,2.5L17,12L17,9.5h2.5zM18,18.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5z"/>
|
|
||||||
</vector>
|
|
||||||
|
|
@ -1,5 +0,0 @@
|
||||||
<vector android:height="24dp" android:tint="#FFFFFF"
|
|
||||||
android:viewportHeight="24.0" android:viewportWidth="24.0"
|
|
||||||
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
|
|
||||||
<path android:fillColor="#FFFFFF" android:pathData="M6.99,11L3,15l3.99,4v-3H14v-2H6.99v-3zM21,9l-3.99,-4v3H10v2h7.01v3L21,9z"/>
|
|
||||||
</vector>
|
|
||||||
|
|
@ -1,8 +0,0 @@
|
||||||
<!-- drawable/walk.xml -->
|
|
||||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:height="24dp"
|
|
||||||
android:width="24dp"
|
|
||||||
android:viewportWidth="24"
|
|
||||||
android:viewportHeight="24">
|
|
||||||
<path android:fillColor="#FFFFFF" android:pathData="M14.12,10H19V8.2H15.38L13.38,4.87C13.08,4.37 12.54,4.03 11.92,4.03C11.74,4.03 11.58,4.06 11.42,4.11L6,5.8V11H7.8V7.33L9.91,6.67L6,22H7.8L10.67,13.89L13,17V22H14.8V15.59L12.31,11.05L13.04,8.18M14,3.8C15,3.8 15.8,3 15.8,2C15.8,1 15,0.2 14,0.2C13,0.2 12.2,1 12.2,2C12.2,3 13,3.8 14,3.8Z" />
|
|
||||||
</vector>
|
|
||||||
|
|
@ -1,232 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<layout xmlns:tools="http://schemas.android.com/tools"
|
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
|
||||||
|
|
||||||
<data>
|
|
||||||
|
|
||||||
<variable
|
|
||||||
name="viewModel"
|
|
||||||
type="es.verdnatura.presentation.view.feature.articulo.model.ItemCardVO" />
|
|
||||||
</data>
|
|
||||||
|
|
||||||
<androidx.constraintlayout.widget.ConstraintLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent">
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<ScrollView
|
|
||||||
android:id="@+id/scroll_view"
|
|
||||||
android:layout_width="0dp"
|
|
||||||
android:layout_height="0dp"
|
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:layout_constraintTop_toTopOf="parent">
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:orientation="vertical" >
|
|
||||||
|
|
||||||
|
|
||||||
<com.google.android.material.textfield.TextInputLayout
|
|
||||||
android:id="@+id/textinputlayout_username"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:textColorHint="@android:color/darker_gray"
|
|
||||||
android:layout_marginTop="@dimen/toolbar_height">
|
|
||||||
|
|
||||||
<com.google.android.material.textfield.TextInputEditText
|
|
||||||
android:id="@+id/edit_itemFk"
|
|
||||||
style="@style/InputLineTextSearch"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:backgroundTint="@android:color/white"
|
|
||||||
android:hint="@string/Escaneaetiqueta"
|
|
||||||
android:inputType="text"
|
|
||||||
android:lines="1"
|
|
||||||
android:maxLines="1"
|
|
||||||
android:textColor="@color/verdnatura_white"
|
|
||||||
android:textColorHint="@android:color/darker_gray" />
|
|
||||||
</com.google.android.material.textfield.TextInputLayout>
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:id="@+id/itemcard_layout"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<ImageView
|
|
||||||
android:id="@+id/itemcard_image"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="@dimen/itemcard_image_height"
|
|
||||||
android:scaleType="centerCrop"
|
|
||||||
android:src="@drawable/loadphoto" />
|
|
||||||
<!-- TAGS ======================================================================================================= -->
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:orientation="horizontal"
|
|
||||||
android:padding="@dimen/layout_margin_min"
|
|
||||||
android:layout_marginBottom="@dimen/layout_margin_min">
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:orientation="vertical"
|
|
||||||
android:layout_weight="1">
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:orientation="horizontal">
|
|
||||||
<TextView
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/Tamaño"
|
|
||||||
android:textColor="@color/verdnatura_brown_grey"
|
|
||||||
android:textSize="@dimen/body2"
|
|
||||||
android:textStyle="bold"
|
|
||||||
android:layout_marginEnd="@dimen/layout_margin_min"/>
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/itemcard_tag1"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text=""
|
|
||||||
android:textColor="@color/verdnatura_white"
|
|
||||||
android:textSize="@dimen/body2"
|
|
||||||
android:textStyle="bold" />
|
|
||||||
</LinearLayout>
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:orientation="horizontal">
|
|
||||||
<TextView
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/Longitud"
|
|
||||||
android:textColor="@color/verdnatura_brown_grey"
|
|
||||||
android:textSize="@dimen/body2"
|
|
||||||
android:textStyle="bold"
|
|
||||||
android:layout_marginEnd="@dimen/layout_margin_min"/>
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/itemcard_tag2"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text=""
|
|
||||||
android:textColor="@color/verdnatura_white"
|
|
||||||
android:textSize="@dimen/body2"
|
|
||||||
android:textStyle="bold" />
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:orientation="vertical"
|
|
||||||
android:layout_weight="1">
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:orientation="horizontal">
|
|
||||||
<TextView
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/Color"
|
|
||||||
android:textColor="@color/verdnatura_brown_grey"
|
|
||||||
android:textSize="@dimen/body2"
|
|
||||||
android:textStyle="bold"
|
|
||||||
android:layout_marginEnd="@dimen/layout_margin_min"/>
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/itemcard_tag3"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text=""
|
|
||||||
android:textColor="@color/verdnatura_white"
|
|
||||||
android:textSize="@dimen/body2"
|
|
||||||
android:textStyle="bold" />
|
|
||||||
</LinearLayout>
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:orientation="horizontal">
|
|
||||||
<TextView
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/Origen"
|
|
||||||
android:textColor="@color/verdnatura_brown_grey"
|
|
||||||
android:textSize="@dimen/body2"
|
|
||||||
android:textStyle="bold"
|
|
||||||
android:layout_marginEnd="@dimen/layout_margin_min"/>
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/itemcard_tag4"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text=""
|
|
||||||
android:textColor="@color/verdnatura_white"
|
|
||||||
android:textSize="@dimen/body2"
|
|
||||||
android:textStyle="bold"/>
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
<!-- VALORES ================================================================================================== -->
|
|
||||||
<RelativeLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:descendantFocusability="blocksDescendants">
|
|
||||||
|
|
||||||
<androidx.recyclerview.widget.RecyclerView
|
|
||||||
android:id="@+id/itemcard_recyclerview"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:clipToPadding="false"
|
|
||||||
tools:listitem="@layout/item_card_row" />
|
|
||||||
</RelativeLayout>>
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
</ScrollView>
|
|
||||||
|
|
||||||
<include
|
|
||||||
android:id="@+id/main_toolbar"
|
|
||||||
layout="@layout/toolbar"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:layout_constraintTop_toTopOf="parent" />
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:id="@+id/splash_progress"
|
|
||||||
android:visibility="gone"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
android:orientation="vertical"
|
|
||||||
android:background="@color/verdnatura_black_8_alpha_6"
|
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:layout_constraintTop_toTopOf="parent"
|
|
||||||
android:gravity="center">
|
|
||||||
|
|
||||||
<com.airbnb.lottie.LottieAnimationView
|
|
||||||
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="@dimen/verdnatura_logo_large_height"
|
|
||||||
|
|
||||||
app:lottie_autoPlay="true"
|
|
||||||
app:lottie_loop="true"
|
|
||||||
app:lottie_rawRes="@raw/orange_loading"
|
|
||||||
app:lottie_speed="2" />
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
|
||||||
</layout>
|
|
||||||
|
|
@ -3,12 +3,6 @@
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||||
|
|
||||||
<data>
|
|
||||||
|
|
||||||
<variable
|
|
||||||
name="viewModel"
|
|
||||||
type="es.verdnatura.presentation.view.feature.inventario.model.ItemInventaryVO" />
|
|
||||||
</data>
|
|
||||||
|
|
||||||
<androidx.constraintlayout.widget.ConstraintLayout
|
<androidx.constraintlayout.widget.ConstraintLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
|
|
|
||||||
|
|
@ -3,12 +3,7 @@
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||||
|
|
||||||
<data>
|
|
||||||
|
|
||||||
<variable
|
|
||||||
name="viewModel"
|
|
||||||
type="es.verdnatura.presentation.view.feature.articulo.model.ItemCardVO" />
|
|
||||||
</data>
|
|
||||||
|
|
||||||
<androidx.constraintlayout.widget.ConstraintLayout
|
<androidx.constraintlayout.widget.ConstraintLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
|
|
|
||||||
|
|
@ -3,12 +3,6 @@
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
xmlns:tool="http://schemas.android.com/tools">
|
xmlns:tool="http://schemas.android.com/tools">
|
||||||
|
|
||||||
<data>
|
|
||||||
|
|
||||||
<variable
|
|
||||||
name="viewModel"
|
|
||||||
type="es.verdnatura.presentation.view.feature.pasillero.fragment.PasilleroViewModel" />
|
|
||||||
</data>
|
|
||||||
|
|
||||||
<androidx.constraintlayout.widget.ConstraintLayout
|
<androidx.constraintlayout.widget.ConstraintLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
|
|
|
||||||
|
|
@ -1,244 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<layout xmlns:tools="http://schemas.android.com/tools"
|
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
|
||||||
|
|
||||||
<data>
|
|
||||||
<variable
|
|
||||||
name="viewModel"
|
|
||||||
type="es.verdnatura.presentation.view.feature.smarttag.sacador.model.SmartTagScan" />
|
|
||||||
</data>
|
|
||||||
|
|
||||||
<androidx.constraintlayout.widget.ConstraintLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
android:background="@color/verdnatura_black">
|
|
||||||
|
|
||||||
<include
|
|
||||||
android:id="@+id/main_toolbar"
|
|
||||||
layout="@layout/toolbar"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:layout_constraintTop_toTopOf="parent" />
|
|
||||||
<LinearLayout
|
|
||||||
android:orientation="vertical"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent">
|
|
||||||
|
|
||||||
<com.google.android.material.textfield.TextInputLayout
|
|
||||||
android:id="@+id/scan_input_plate"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginStart="25dp"
|
|
||||||
android:layout_marginTop="100dp"
|
|
||||||
android:layout_marginEnd="25dp"
|
|
||||||
android:textColorHint="@android:color/darker_gray"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:layout_constraintTop_toBottomOf="@+id/main_toolbar">
|
|
||||||
|
|
||||||
<com.google.android.material.textfield.TextInputEditText
|
|
||||||
android:id="@+id/scan_plate"
|
|
||||||
style="@style/InputLineTextSearch"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_marginStart="25dp"
|
|
||||||
android:layout_marginTop="100dp"
|
|
||||||
android:layout_marginEnd="25dp"
|
|
||||||
android:gravity="center_horizontal"
|
|
||||||
android:backgroundTint="@color/colorPrimary"
|
|
||||||
android:hint="@string/Escaneamatricula"
|
|
||||||
android:inputType="text"
|
|
||||||
android:lines="1"
|
|
||||||
android:maxLines="1"
|
|
||||||
android:textColor="@color/verdnatura_white"
|
|
||||||
android:textColorHint="@android:color/darker_gray"
|
|
||||||
android:textDirection="firstStrong"
|
|
||||||
android:nextFocusDown="@+id/scan_smarttag"/>
|
|
||||||
</com.google.android.material.textfield.TextInputLayout>
|
|
||||||
|
|
||||||
|
|
||||||
<com.google.android.material.textfield.TextInputLayout
|
|
||||||
android:id="@+id/scan_input_smarttag"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginStart="50dp"
|
|
||||||
android:layout_marginTop="50dp"
|
|
||||||
android:layout_marginEnd="25dp"
|
|
||||||
android:textColorHint="@android:color/darker_gray"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:layout_constraintTop_toBottomOf="@+id/main_toolbar">
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<com.google.android.material.textfield.TextInputEditText
|
|
||||||
android:id="@+id/scan_smarttags"
|
|
||||||
style="@style/InputLineTextSearch"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_marginStart="50dp"
|
|
||||||
android:layout_marginTop="50dp"
|
|
||||||
android:layout_marginEnd="50dp"
|
|
||||||
android:gravity="center_horizontal"
|
|
||||||
android:backgroundTint="@color/colorPrimary"
|
|
||||||
android:hint="Escanea etiqueta superior"
|
|
||||||
android:inputType="text"
|
|
||||||
android:lines="1"
|
|
||||||
android:maxLines="1"
|
|
||||||
android:textColor="@color/verdnatura_white"
|
|
||||||
android:textColorHint="@android:color/darker_gray"
|
|
||||||
android:textDirection="firstStrong"
|
|
||||||
android:nextFocusDown="@+id/scan_input_shelving"/>
|
|
||||||
</com.google.android.material.textfield.TextInputLayout>
|
|
||||||
|
|
||||||
<com.google.android.material.textfield.TextInputLayout
|
|
||||||
android:id="@+id/scan_input_smarttag2"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginStart="50dp"
|
|
||||||
android:layout_marginTop="50dp"
|
|
||||||
android:layout_marginEnd="25dp"
|
|
||||||
android:textColorHint="@android:color/darker_gray"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:layout_constraintTop_toBottomOf="@+id/main_toolbar">
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<com.google.android.material.textfield.TextInputEditText
|
|
||||||
android:id="@+id/scan_smarttags2"
|
|
||||||
style="@style/InputLineTextSearch"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_marginStart="50dp"
|
|
||||||
android:layout_marginTop="50dp"
|
|
||||||
android:layout_marginEnd="50dp"
|
|
||||||
android:gravity="center_horizontal"
|
|
||||||
android:backgroundTint="@color/colorPrimary"
|
|
||||||
android:hint="Escanea etiqueta del medio"
|
|
||||||
android:inputType="text"
|
|
||||||
android:lines="1"
|
|
||||||
android:maxLines="1"
|
|
||||||
android:textColor="@color/verdnatura_white"
|
|
||||||
android:textColorHint="@android:color/darker_gray"
|
|
||||||
android:textDirection="firstStrong"
|
|
||||||
android:nextFocusDown="@+id/scan_input_shelving"/>
|
|
||||||
</com.google.android.material.textfield.TextInputLayout>
|
|
||||||
|
|
||||||
<com.google.android.material.textfield.TextInputLayout
|
|
||||||
android:id="@+id/scan_input_smarttag3"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginStart="50dp"
|
|
||||||
android:layout_marginTop="50dp"
|
|
||||||
android:layout_marginEnd="25dp"
|
|
||||||
android:textColorHint="@android:color/darker_gray"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:layout_constraintTop_toBottomOf="@+id/main_toolbar">
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<com.google.android.material.textfield.TextInputEditText
|
|
||||||
android:id="@+id/scan_smarttags3"
|
|
||||||
style="@style/InputLineTextSearch"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_marginStart="50dp"
|
|
||||||
android:layout_marginTop="50dp"
|
|
||||||
android:layout_marginEnd="50dp"
|
|
||||||
android:gravity="center_horizontal"
|
|
||||||
android:backgroundTint="@color/colorPrimary"
|
|
||||||
android:hint="Escanea etiqueta inferior"
|
|
||||||
android:inputType="text"
|
|
||||||
android:lines="1"
|
|
||||||
android:maxLines="1"
|
|
||||||
android:textColor="@color/verdnatura_white"
|
|
||||||
android:textColorHint="@android:color/darker_gray"
|
|
||||||
android:textDirection="firstStrong"
|
|
||||||
android:nextFocusDown="@+id/scan_input_shelving"/>
|
|
||||||
</com.google.android.material.textfield.TextInputLayout>
|
|
||||||
|
|
||||||
|
|
||||||
<com.google.android.material.textfield.TextInputLayout
|
|
||||||
android:id="@+id/scan_input_shelving"
|
|
||||||
android:visibility="gone"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginStart="25dp"
|
|
||||||
android:layout_marginTop="50dp"
|
|
||||||
android:layout_marginEnd="25dp"
|
|
||||||
android:inputType="number"
|
|
||||||
|
|
||||||
android:textColorHint="@android:color/darker_gray"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:layout_constraintTop_toBottomOf="@+id/main_toolbar">
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<com.google.android.material.textfield.TextInputEditText
|
|
||||||
android:id="@+id/scan_shelving"
|
|
||||||
style="@style/InputLineTextSearch"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_marginStart="50dp"
|
|
||||||
android:layout_marginTop="100dp"
|
|
||||||
android:layout_marginEnd="50dp"
|
|
||||||
android:backgroundTint="@color/colorPrimary"
|
|
||||||
android:gravity="center_horizontal"
|
|
||||||
android:hint="@string/Escaneashelving"
|
|
||||||
android:inputType="text"
|
|
||||||
android:lines="1"
|
|
||||||
android:maxLines="1"
|
|
||||||
android:textColor="@color/verdnatura_white"
|
|
||||||
android:textColorHint="@android:color/darker_gray"
|
|
||||||
android:textDirection="firstStrong"
|
|
||||||
android:visibility="gone"
|
|
||||||
android:drawableEnd="@drawable/ic_arrow_drop_down_black_24dp"/>
|
|
||||||
|
|
||||||
</com.google.android.material.textfield.TextInputLayout>
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<Button
|
|
||||||
android:id="@+id/button_registersmarttag"
|
|
||||||
style="@style/DefaultButton"
|
|
||||||
android:layout_width="250dp"
|
|
||||||
android:layout_marginTop="50dp"
|
|
||||||
android:layout_gravity="center_horizontal"
|
|
||||||
android:background="@drawable/btn_orange"
|
|
||||||
android:text="REGISTRAR CARRO"
|
|
||||||
android:textColor="@color/verdnatura_white" />
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:id="@+id/splash_progress"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
android:background="@color/verdnatura_black_8_alpha_6"
|
|
||||||
android:gravity="center"
|
|
||||||
android:orientation="vertical"
|
|
||||||
android:visibility="visible"
|
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
|
||||||
app:layout_constraintHorizontal_bias="1.0"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:layout_constraintTop_toTopOf="parent"
|
|
||||||
app:layout_constraintVertical_bias="1.0">
|
|
||||||
|
|
||||||
<com.airbnb.lottie.LottieAnimationView
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="@dimen/verdnatura_logo_large_height"
|
|
||||||
app:lottie_autoPlay="true"
|
|
||||||
app:lottie_loop="true"
|
|
||||||
app:lottie_rawRes="@raw/orange_loading"
|
|
||||||
app:lottie_speed="2" />
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
|
||||||
</layout>
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -45,7 +45,7 @@
|
||||||
<string name="Carrodestino">Carro destino</string>
|
<string name="Carrodestino">Carro destino</string>
|
||||||
<string name="Transferir">Transferir</string>
|
<string name="Transferir">Transferir</string>
|
||||||
<string name="Sinsector">Sin sector</string>
|
<string name="Sinsector">Sin sector</string>
|
||||||
<string name="Nodisponibleenestaversión">No disponible en esta versión</string>
|
|
||||||
<string name="Close">Cerrar</string>
|
<string name="Close">Cerrar</string>
|
||||||
<string name="Noexistessectores">No existes sectores.</string>
|
<string name="Noexistessectores">No existes sectores.</string>
|
||||||
<string name="Seleccionaunsector">Selecciona un sector</string>
|
<string name="Seleccionaunsector">Selecciona un sector</string>
|
||||||
|
|
@ -62,11 +62,10 @@
|
||||||
<string name="Disponible">Disponible</string>
|
<string name="Disponible">Disponible</string>
|
||||||
<string name="Ubicado">Ubicado</string>
|
<string name="Ubicado">Ubicado</string>
|
||||||
<string name="SINUBICAR">Sin ubicar</string>
|
<string name="SINUBICAR">Sin ubicar</string>
|
||||||
<string name="BUSCARITEM">Buscar item</string>
|
|
||||||
<string name="MINIMO">Mínimo</string>
|
<string name="MINIMO">Mínimo</string>
|
||||||
<string name="txtparking">Primero escanea tantos carros o tickets como quieras aparcar y finalmente escanea el parking para finalizar el proceso</string>
|
<string name="txtparking">Primero escanea tantos carros o tickets como quieras aparcar y finalmente escanea el parking para finalizar el proceso</string>
|
||||||
<string name="Ticketaparcado">Ticket aparcado</string>
|
<string name="Ticketaparcado">Ticket aparcado</string>
|
||||||
<string name="Imprimiendo">Imprimiendo...</string>
|
<string name="Imprimiendo">Imprimiendo </string>
|
||||||
<string name="Verdisponible">Ver disponible</string>
|
<string name="Verdisponible">Ver disponible</string>
|
||||||
<string name="Buscar">Buscar</string>
|
<string name="Buscar">Buscar</string>
|
||||||
<string name="Agregarartículoparaticket">Agregar artículo para ticket:</string>
|
<string name="Agregarartículoparaticket">Agregar artículo para ticket:</string>
|
||||||
|
|
@ -88,11 +87,9 @@
|
||||||
<string name="Actualizar">Actualizar</string>
|
<string name="Actualizar">Actualizar</string>
|
||||||
<string name="reposicion">Reposición</string>
|
<string name="reposicion">Reposición</string>
|
||||||
<string name="obtener">Obtener</string>
|
<string name="obtener">Obtener</string>
|
||||||
<string name="CANTIDAD2">Cantidad</string>
|
|
||||||
<string name="DARALTA">Dar de alta</string>
|
<string name="DARALTA">Dar de alta</string>
|
||||||
<string name="DARBAJA">Dar de baja</string>
|
<string name="DARBAJA">Dar de baja</string>
|
||||||
<string name="Calidad">Calidad</string>
|
<string name="Calidad">Calidad</string>
|
||||||
<string name="enbreveDisponible">En breve disponible</string>
|
|
||||||
<string name="ubicado">Ubicado</string>
|
<string name="ubicado">Ubicado</string>
|
||||||
<string name="sinubicar">Sin ubicar</string>
|
<string name="sinubicar">Sin ubicar</string>
|
||||||
<string name="altillo">Altillo</string>
|
<string name="altillo">Altillo</string>
|
||||||
|
|
@ -107,8 +104,7 @@
|
||||||
<string name="Barcode">Barcode</string>
|
<string name="Barcode">Barcode</string>
|
||||||
<string name="tipodeencajado">Tipo de encajado</string>
|
<string name="tipodeencajado">Tipo de encajado</string>
|
||||||
<string name="total">Total</string>
|
<string name="total">Total</string>
|
||||||
<string name="mensajeseleccionencajado">Selecciona zona encajado :</string>
|
<string name="mensajeseleccionencajado">Selecciona zona encajado :</string>s
|
||||||
<string name="buscararticulo">Buscar artículo</string>
|
|
||||||
<string name="itemdiary">Histórico</string>
|
<string name="itemdiary">Histórico</string>
|
||||||
<string name="getcollection">Obtener colección</string>
|
<string name="getcollection">Obtener colección</string>
|
||||||
<string name="getticketpre">Obtener ticket previa</string>
|
<string name="getticketpre">Obtener ticket previa</string>
|
||||||
|
|
@ -118,21 +114,13 @@
|
||||||
<string name="itemPlacementSupplyGetOrder">Reposiciones</string>
|
<string name="itemPlacementSupplyGetOrder">Reposiciones</string>
|
||||||
<string name="faultsReview">Faltas</string>
|
<string name="faultsReview">Faltas</string>
|
||||||
<string name="shelvingParking_get">Parking estanterías</string>
|
<string name="shelvingParking_get">Parking estanterías</string>
|
||||||
<string name="test">Buscar item search</string>
|
|
||||||
<string name="verticket">Ver ticket</string>
|
<string name="verticket">Ver ticket</string>
|
||||||
<string name="mensajeadvertenciaIMEI">Debes aceptar el permiso de llamadas telefónicas para utilizar el dispositivo</string>
|
|
||||||
<string name="Error">Error</string>
|
|
||||||
<string name="mensajenoimei">No se ha podido leer IMEI</string>
|
|
||||||
<string name="vehiclecontrol">Control vehículos</string>
|
<string name="vehiclecontrol">Control vehículos</string>
|
||||||
<string name="Worker">Trabajador</string>
|
<string name="Worker">Trabajador</string>
|
||||||
<string name="state">Estado</string>
|
|
||||||
<string name="vehiclediary">Histórico del vehículo</string>
|
<string name="vehiclediary">Histórico del vehículo</string>
|
||||||
<string name="SmarttagAssociate">Asociar SmartTag Sacador</string>
|
<string name="SmarttagAssociate">Asociar SmartTag Sacador</string>
|
||||||
<string name="vehiclecontroluser">Control de usuario</string>
|
<string name="vehiclecontroluser">Control de usuario</string>
|
||||||
<string name="SmarttagRegister">Registro de Smarttags</string>
|
<string name="SmarttagRegister">Registro de Smarttags</string>
|
||||||
<string name="assigned_vehiclecontrol">Vehículo asignado:</string>
|
|
||||||
<string name="assigned_smartphone">Dispositivo asignado al usuario:</string>
|
|
||||||
<string name="now_smartphone">Dispositivo que lleva:</string>
|
|
||||||
<string name="registered_vehiclecontrol">El usuario lleva la máquina:</string>
|
<string name="registered_vehiclecontrol">El usuario lleva la máquina:</string>
|
||||||
<string name="Filtrocliente">Buscar cliente</string>
|
<string name="Filtrocliente">Buscar cliente</string>
|
||||||
<string name="InTimed">Desde</string>
|
<string name="InTimed">Desde</string>
|
||||||
|
|
@ -156,7 +144,6 @@
|
||||||
<string name="updatecritical">Se necesario actualizar la app para que funcione correctamente.</string>
|
<string name="updatecritical">Se necesario actualizar la app para que funcione correctamente.</string>
|
||||||
<string name="available">Disponible</string>
|
<string name="available">Disponible</string>
|
||||||
<string name="minQuantity">Cantidad mín.</string>
|
<string name="minQuantity">Cantidad mín.</string>
|
||||||
<string name="item">Item</string>
|
|
||||||
<string name="producer">Productor</string>
|
<string name="producer">Productor</string>
|
||||||
<string name="controlticket">Controlar ticket</string>
|
<string name="controlticket">Controlar ticket</string>
|
||||||
<string name="ExpeditionScan">Escanear expedición</string>
|
<string name="ExpeditionScan">Escanear expedición</string>
|
||||||
|
|
|
||||||
|
|
@ -44,7 +44,6 @@
|
||||||
<string name="Carrodestino">Destination car</string>
|
<string name="Carrodestino">Destination car</string>
|
||||||
<string name="Transferir">To transfer</string>
|
<string name="Transferir">To transfer</string>
|
||||||
<string name="Sinsector">Without sector</string>
|
<string name="Sinsector">Without sector</string>
|
||||||
<string name="Nodisponibleenestaversión">Not available in this version</string>
|
|
||||||
<string name="Close">Close</string>
|
<string name="Close">Close</string>
|
||||||
<string name="Noexistessectores">There are no sectors.</string>
|
<string name="Noexistessectores">There are no sectors.</string>
|
||||||
<string name="Seleccionaunsector">Select a sector</string>
|
<string name="Seleccionaunsector">Select a sector</string>
|
||||||
|
|
@ -61,11 +60,10 @@
|
||||||
<string name="Disponible">Available</string>
|
<string name="Disponible">Available</string>
|
||||||
<string name="Ubicado">Located</string>
|
<string name="Ubicado">Located</string>
|
||||||
<string name="SINUBICAR">Unlocated</string>
|
<string name="SINUBICAR">Unlocated</string>
|
||||||
<string name="BUSCARITEM">Search item</string>
|
|
||||||
<string name="MINIMO">Minimun</string>
|
<string name="MINIMO">Minimun</string>
|
||||||
<string name="txtparking">First scan as many cars or tickets as you want to park and finally scan the parking to finish the process</string>
|
<string name="txtparking">First scan as many cars or tickets as you want to park and finally scan the parking to finish the process</string>
|
||||||
<string name="Ticketaparcado">Parked ticket</string>
|
<string name="Ticketaparcado">Parked ticket</string>
|
||||||
<string name="Imprimiendo">Printing ...</string>
|
<string name="Imprimiendo">Printing </string>
|
||||||
<string name="Verdisponible">See available</string>
|
<string name="Verdisponible">See available</string>
|
||||||
<string name="Buscar">Search</string>
|
<string name="Buscar">Search</string>
|
||||||
<string name="Agregarartículoparaticket">Add item for ticket:</string>
|
<string name="Agregarartículoparaticket">Add item for ticket:</string>
|
||||||
|
|
@ -87,11 +85,9 @@
|
||||||
<string name="Actualizar">Update</string>
|
<string name="Actualizar">Update</string>
|
||||||
<string name="reposicion">Replacement</string>
|
<string name="reposicion">Replacement</string>
|
||||||
<string name="obtener">Get</string>
|
<string name="obtener">Get</string>
|
||||||
<string name="CANTIDAD2">Quantity</string>
|
|
||||||
<string name="DARALTA">Add</string>
|
<string name="DARALTA">Add</string>
|
||||||
<string name="DARBAJA">Remove</string>
|
<string name="DARBAJA">Remove</string>
|
||||||
<string name="Calidad">Quality</string>
|
<string name="Calidad">Quality</string>
|
||||||
<string name="enbreveDisponible">Available soon</string>
|
|
||||||
<string name="ubicado">Visible</string>
|
<string name="ubicado">Visible</string>
|
||||||
<string name="altillo">Upstairs</string>
|
<string name="altillo">Upstairs</string>
|
||||||
<string name="packingType">Packing type</string>
|
<string name="packingType">Packing type</string>
|
||||||
|
|
@ -107,7 +103,6 @@
|
||||||
<string name="tipodeencajado">Tipo de encajado</string>
|
<string name="tipodeencajado">Tipo de encajado</string>
|
||||||
<string name="total">Total</string>
|
<string name="total">Total</string>
|
||||||
<string name="mensajeseleccionencajado">Select packing type zone :</string>
|
<string name="mensajeseleccionencajado">Select packing type zone :</string>
|
||||||
<string name="buscararticulo">Search article</string>
|
|
||||||
<string name="itemdiary">Item diary</string>
|
<string name="itemdiary">Item diary</string>
|
||||||
<string name="getcollection">Get collection</string>
|
<string name="getcollection">Get collection</string>
|
||||||
<string name="getticketpre">Get previous ticket</string>
|
<string name="getticketpre">Get previous ticket</string>
|
||||||
|
|
@ -117,22 +112,14 @@
|
||||||
<string name="itemPlacementSupplyGetOrder">Placement supply</string>
|
<string name="itemPlacementSupplyGetOrder">Placement supply</string>
|
||||||
<string name="faultsReview">Faults review</string>
|
<string name="faultsReview">Faults review</string>
|
||||||
<string name="shelvingParking_get">Shelving parking</string>
|
<string name="shelvingParking_get">Shelving parking</string>
|
||||||
<string name="test">Search item test</string>
|
|
||||||
<string name="verticket">Show ticket</string>
|
<string name="verticket">Show ticket</string>
|
||||||
<string name="mensajeadvertenciaIMEI">You must accept the phone call permission to use the device</string>
|
|
||||||
<string name="Error">Error</string>
|
|
||||||
<string name="mensajenoimei">Unable to read IMEI</string>
|
|
||||||
<string name="vehiclecontrol">" Vehicles control"</string>
|
<string name="vehiclecontrol">" Vehicles control"</string>
|
||||||
<string name="Worker">Worker</string>
|
<string name="Worker">Worker</string>
|
||||||
<string name="state">State</string>
|
|
||||||
<string name="vehiclediary">Historical vehicle</string>
|
<string name="vehiclediary">Historical vehicle</string>
|
||||||
<string name="SmarttagAssociate">Associate SmartTag Punch</string>
|
<string name="SmarttagAssociate">Associate SmartTag Punch</string>
|
||||||
<string name="vehiclecontroluser">Vehicle user control</string>
|
<string name="vehiclecontroluser">Vehicle user control</string>
|
||||||
<string name="SmarttagRegister">Register smarttag</string>
|
<string name="SmarttagRegister">Register smarttag</string>
|
||||||
<string name="assigned_vehiclecontrol">Vehicle assigned:</string>
|
|
||||||
<string name="registered_vehiclecontrol">Vehicle registered:</string>
|
<string name="registered_vehiclecontrol">Vehicle registered:</string>
|
||||||
<string name="now_smartphone">Smartphone carries:</string>
|
|
||||||
<string name="assigned_smartphone">Smartphone assigned to:</string>
|
|
||||||
<string name="Filtrocliente">Search client</string>
|
<string name="Filtrocliente">Search client</string>
|
||||||
<string name="InTimed">From</string>
|
<string name="InTimed">From</string>
|
||||||
<string name="OutTimed">Until</string>
|
<string name="OutTimed">Until</string>
|
||||||
|
|
@ -155,10 +142,8 @@
|
||||||
<string name="updatecritical">It needs to be updated for it to work properly</string>
|
<string name="updatecritical">It needs to be updated for it to work properly</string>
|
||||||
<string name="available">Available</string>
|
<string name="available">Available</string>
|
||||||
<string name="minQuantity">Min quantity</string>
|
<string name="minQuantity">Min quantity</string>
|
||||||
<string name="item">Item</string>
|
|
||||||
<string name="producer">Producer</string>
|
<string name="producer">Producer</string>
|
||||||
<string name="controlticket">Control ticket</string>
|
<string name="controlticket">Control ticket</string>
|
||||||
<string name="ExpeditionScan">Scan expedition</string>
|
<string name="ExpeditionScan">Scan expedition</string>
|
||||||
|
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
|
|
|
||||||
12
build.gradle
12
build.gradle
|
|
@ -1,21 +1,21 @@
|
||||||
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
||||||
|
|
||||||
buildscript {
|
buildscript {
|
||||||
ext.kotlin_version = '1.4.20'
|
ext.kotlin_version = '1.5.31'//1.4.20
|
||||||
|
|
||||||
ext {
|
ext {
|
||||||
// UI components
|
// UI components
|
||||||
lottieVersion = '3.4.0'
|
lottieVersion = '3.4.0'
|
||||||
lifecycle = '2.2.0'
|
lifecycle = '2.2.0'
|
||||||
koin = '2.0.1'//2.0.1// de las 4 librerias se modifica de
|
koin = '2.1.6'//2.0.1//
|
||||||
// Images
|
// Images
|
||||||
glide = '4.11.0'
|
glide = '4.11.0'
|
||||||
piccasso = '2.71828'
|
// piccasso = '2.71828'
|
||||||
coil = '0.9.5'
|
coil = '1.4.0'//0.9.5
|
||||||
}
|
}
|
||||||
repositories {
|
repositories {
|
||||||
google()
|
google()
|
||||||
jcenter()//mavenCentral()
|
mavenCentral() //jcenter()
|
||||||
|
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
|
|
@ -32,7 +32,7 @@ buildscript {
|
||||||
allprojects {
|
allprojects {
|
||||||
repositories {
|
repositories {
|
||||||
google()
|
google()
|
||||||
jcenter()//mavenCentral()
|
mavenCentral()//jcenter()//
|
||||||
maven{url 'https://jitpack.io'}
|
maven{url 'https://jitpack.io'}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,11 @@
|
||||||
# http://www.gradle.org/docs/current/userguide/build_environment.html
|
# http://www.gradle.org/docs/current/userguide/build_environment.html
|
||||||
# Specifies the JVM arguments used for the daemon process.
|
# Specifies the JVM arguments used for the daemon process.
|
||||||
# The setting is particularly useful for tweaking memory settings.
|
# The setting is particularly useful for tweaking memory settings.
|
||||||
org.gradle.jvmargs=-Xmx1536m
|
# esta es la version optimizada
|
||||||
|
org.gradle.jvmargs=-XX:+UseParallelGC
|
||||||
|
# esta es la version por defecto
|
||||||
|
##org.gradle.jvmargs=-Xmx1536m
|
||||||
|
# esta es la version old
|
||||||
# When configured, Gradle will run in incubating parallel mode.
|
# When configured, Gradle will run in incubating parallel mode.
|
||||||
# This option should only be used with decoupled projects. More details, visit
|
# This option should only be used with decoupled projects. More details, visit
|
||||||
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
|
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
|
||||||
|
|
@ -19,3 +23,4 @@ android.useAndroidX=true
|
||||||
android.enableJetifier=true
|
android.enableJetifier=true
|
||||||
# Kotlin code style for this project: "official" or "obsolete":
|
# Kotlin code style for this project: "official" or "obsolete":
|
||||||
kotlin.code.style=official
|
kotlin.code.style=official
|
||||||
|
#org.gradle.warning.mode=all
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue