Finish ScriptBuild

This commit is contained in:
Giuseppe Scorrano 2019-02-15 12:21:04 +01:00
commit 70d3d1934b
10 changed files with 267 additions and 178 deletions

Binary file not shown.

View File

@ -98,14 +98,14 @@ dependencies {
implementation 'com.google.firebase:firebase-core:16.0.7'
implementation 'com.google.firebase:firebase-crash:16.2.1'
implementation 'com.google.firebase:firebase-perf:16.2.3'
implementation 'com.crashlytics.sdk.android:crashlytics:2.9.8'
implementation 'androidx.appcompat:appcompat:1.1.0-alpha01'
implementation 'com.crashlytics.sdk.android:crashlytics:2.9.9'
implementation 'androidx.appcompat:appcompat:1.1.0-alpha02'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'com.google.android.material:material:1.1.0-alpha03'
implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha3'
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.recyclerview:recyclerview:1.1.0-alpha02'
implementation 'androidx.preference:preference:1.1.0-alpha02'
implementation 'androidx.preference:preference:1.1.0-alpha03'
implementation 'com.squareup.okhttp3:okhttp:3.12.1'
implementation 'com.squareup.retrofit2:retrofit:2.3.0'
implementation 'com.squareup.retrofit2:converter-gson:2.0.0'

View File

@ -6,6 +6,8 @@ import com.crashlytics.android.Crashlytics;
import com.orhanobut.logger.AndroidLogAdapter;
import com.orhanobut.logger.Logger;
import java.io.IOException;
import io.fabric.sdk.android.Fabric;
import it.integry.integrywmsnative.BuildConfig;
import it.integry.integrywmsnative.core.REST.watcher.ServerStatusChecker;
@ -45,6 +47,7 @@ public class AppContext {
}
private void initSettings() {
Stash.init(mContext);
SettingsManager.init(mContext);

View File

@ -0,0 +1,27 @@
package it.integry.wms.dynamic_customization;
import android.content.Context;
import android.util.Log;
import it.integry.integrywmsnative.core.class_router.ClassRouter;
import it.integry.integrywmsnative.core.utility.UtilityExceptions;
import it.integry.wms.dynamic_customization.extensions.FiltroOrdiniVendita;
import it.integry.wms.dynamic_customization.extensions.OrdiniVendita;
public class DynamicContext {
public void init(Context context) {
Log.d("DynamicContext", "Caricamento personalizzazioni per VGAlimenti");
try {
ClassRouter.registerPath(ClassRouter.PATH.FILTRO_ORDINI_VENDITA, FiltroOrdiniVendita.class);
ClassRouter.registerPath(ClassRouter.PATH.ORDINI_VENDITA, OrdiniVendita.class);
} catch (Exception ex) {
UtilityExceptions.defaultException(context, ex);
}
Log.d("DynamicContext", "Caricamento personalizzazioni per VGAlimenti COMPLETATO");
}
}

View File

@ -0,0 +1,12 @@
package it.integry.wms.dynamic_customization.extensions;
import it.integry.integrywmsnative.core.class_router.interfaces.IFiltroOrdiniVendita;
public class FiltroOrdiniVendita implements IFiltroOrdiniVendita {
@Override
public boolean shoudShowCodMdepFilter() {
return true;
}
}

View File

@ -0,0 +1,45 @@
package it.integry.wms.dynamic_customization.extensions;
import android.app.ProgressDialog;
import java.util.List;
import it.integry.integrywmsnative.core.REST.consumers.ColliMagazzinoRESTConsumer;
import it.integry.integrywmsnative.core.REST.model.DistribuzioneColloDTO;
import it.integry.integrywmsnative.core.class_router.interfaces.IOrdiniVendita;
import it.integry.integrywmsnative.core.expansion.RunnableArgs;
import it.integry.integrywmsnative.core.model.MtbColt;
import it.integry.integrywmsnative.core.settings.SettingsManager;
import it.integry.integrywmsnative.core.utility.UtilityString;
import it.integry.integrywmsnative.gest.vendita.dto.OrdineVenditaGroupedInevasoDTO;
public class OrdiniVendita implements IOrdiniVendita {
@Override
public void distribuisciCollo(ProgressDialog progress, MtbColt mtbColt, List<OrdineVenditaGroupedInevasoDTO> testateOrdini, RunnableArgs<List<MtbColt>> onComplete, RunnableArgs<Exception> onFailed) {
String codMdepOrder = testateOrdini.get(0).ordini.get(0).getCodMdep();
//Se il deposito del collo è diverso dal deposito dell'utente allora sto "evadendo" la merce per una vendita presente
//su un altro deposito
if(!UtilityString.isNullOrEmpty(codMdepOrder) &&
!codMdepOrder.equalsIgnoreCase(SettingsManager.i().userSession.depo.getCodMdep())) {
ColliMagazzinoRESTConsumer.distribuisciCollo(mtbColt,
DistribuzioneColloDTO.CriterioDistribuzione.UPDATE,
onComplete,
onFailed);
} else {
ColliMagazzinoRESTConsumer.distribuisciCollo(mtbColt,
SettingsManager.iDB().getDefaultCriterioDistribuzione(),
onComplete,
onFailed);
}
}
}

View File

@ -2,50 +2,53 @@
SET nome_azienda=%1
setlocal enabledelayedexpansion
set INTEXTFILE=build.gradle
set OUTTEXTFILE=build_out.gradle
set SEARCHTEXT=:dynamic__base
set REPLACETEXT=:dynamic_%nome_azienda%
set OUTPUTLINE=
rem setlocal enabledelayedexpansion
rem set INTEXTFILE=build.gradle
rem set OUTTEXTFILE=build_out.gradle
rem set SEARCHTEXT=:dynamic__base
rem set REPLACETEXT=:dynamic_%nome_azienda%
rem set OUTPUTLINE=
cd app
rem cd app
for /f "tokens=1,* delims=¶" %%A in ( '"findstr /n ^^ %INTEXTFILE%"') do (
SET string=%%A
for /f "delims=: tokens=1,*" %%a in ("!string!") do set "string=%%b"
if "!string!" == "" (
echo.>>%OUTTEXTFILE%
) else (
SET modified=!string:%SEARCHTEXT%=%REPLACETEXT%!
echo !modified! >> %OUTTEXTFILE%
)
)
del %INTEXTFILE%
rename %OUTTEXTFILE% %INTEXTFILE%
rem for /f "tokens=1,* delims=¶" %%A in ( '"findstr /n ^^ %INTEXTFILE%"') do (
rem SET string=%%A
rem for /f "delims=: tokens=1,*" %%a in ("!string!") do set "string=%%b"
rem if "!string!" == "" (
rem echo.>>%OUTTEXTFILE%
rem ) else (
rem SET modified=!string:%SEARCHTEXT%=%REPLACETEXT%!
rem echo !modified! >> %OUTTEXTFILE%
rem )
rem )
rem del %INTEXTFILE%
rem rename %OUTTEXTFILE% %INTEXTFILE%
cd ..
rem cd ..
call gradlew app:build --stacktrace
XCOPY dynamic_%nome_azienda%\src\main\java\it\integry app\src\main\java\it\integry\ /E
CALL gradlew app:build --stacktrace
cd app
RMDIR app\src\main\java\it\integry\wms\ /S /Q
for /f "tokens=1,* delims=¶" %%A in ( '"findstr /n ^^ %INTEXTFILE%"') do (
SET string=%%A
for /f "delims=: tokens=1,*" %%a in ("!string!") do set "string=%%b"
if "!string!" == "" (
echo.>>%OUTTEXTFILE%
) else (
SET modified=!string:%REPLACETEXT%=%SEARCHTEXT%!
echo !modified! >> %OUTTEXTFILE%
)
)
del %INTEXTFILE%
rename %OUTTEXTFILE% %INTEXTFILE%
rem cd app
cd ..
rem for /f "tokens=1,* delims=¶" %%A in ( '"findstr /n ^^ %INTEXTFILE%"') do (
rem SET string=%%A
rem for /f "delims=: tokens=1,*" %%a in ("!string!") do set "string=%%b"
rem if "!string!" == "" (
rem echo.>>%OUTTEXTFILE%
rem ) else (
rem SET modified=!string:%REPLACETEXT%=%SEARCHTEXT%!
rem echo !modified! >> %OUTTEXTFILE%
rem )
rem )
rem del %INTEXTFILE%
rem rename %OUTTEXTFILE% %INTEXTFILE%
rem
rem cd ..
mkdir app\build\outputs\apk\release\%nome_azienda%
MKDIR app\build\outputs\apk\release\%nome_azienda%
move app\build\outputs\apk\release\*.apk app\build\outputs\apk\release\%nome_azienda%\
move app\build\outputs\apk\release\*.txt app\build\outputs\apk\release\%nome_azienda%\
MOVE app\build\outputs\apk\release\*.apk app\build\outputs\apk\release\%nome_azienda%\
MOVE app\build\outputs\apk\release\*.txt app\build\outputs\apk\release\%nome_azienda%\

View File

@ -4,7 +4,7 @@
<dist:module
dist:instant="false"
dist:onDemand="true"
dist:onDemand="false"
dist:title="@string/title_dynamic__base">
<dist:fusing dist:include="true" />
</dist:module>

View File

@ -7,9 +7,8 @@ android {
targetSdkVersion 28
versionCode 1
versionName "1.0"
}
buildToolsVersion '28.0.3'
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8

View File

@ -4,7 +4,7 @@
<dist:module
dist:instant="false"
dist:onDemand="true"
dist:onDemand="false"
dist:title="@string/title_dynamic_vgalimenti">
<dist:fusing dist:include="true" />
</dist:module>