Finish v1.47.11(524)
Some checks failed
WMS - Android (New)/pipeline/head There was a failure building this commit
Some checks failed
WMS - Android (New)/pipeline/head There was a failure building this commit
This commit is contained in:
commit
126846aef2
@ -30,6 +30,7 @@ pipeline {
|
|||||||
stage('Build') {
|
stage('Build') {
|
||||||
steps {
|
steps {
|
||||||
bat "./gradlew assembleRelease"
|
bat "./gradlew assembleRelease"
|
||||||
|
bat "./gradlew app:uploadCrashlyticsSymbolFileRelease"
|
||||||
archiveArtifacts artifacts: 'app/build/outputs/apk/release/', onlyIfSuccessful: true
|
archiveArtifacts artifacts: 'app/build/outputs/apk/release/', onlyIfSuccessful: true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
|
|||||||
|
|
||||||
android {
|
android {
|
||||||
|
|
||||||
def appVersionCode = 523
|
def appVersionCode = 524
|
||||||
def appVersionName = '1.47.10'
|
def appVersionName = '1.47.11'
|
||||||
|
|
||||||
signingConfigs {
|
signingConfigs {
|
||||||
release {
|
release {
|
||||||
|
|||||||
@ -39,8 +39,6 @@ public class SettingsManager {
|
|||||||
private static SettingsModel settingsModelIstance;
|
private static SettingsModel settingsModelIstance;
|
||||||
private static DBSettingsModel dbSettingsModelIstance;
|
private static DBSettingsModel dbSettingsModelIstance;
|
||||||
|
|
||||||
private static boolean firstStart = false;
|
|
||||||
|
|
||||||
private static Context mContext;
|
private static Context mContext;
|
||||||
private static SystemRESTConsumer mSystemRESTConsumer;
|
private static SystemRESTConsumer mSystemRESTConsumer;
|
||||||
private static ImballiRESTConsumer mImballiRESTConsumer;
|
private static ImballiRESTConsumer mImballiRESTConsumer;
|
||||||
@ -65,15 +63,15 @@ public class SettingsManager {
|
|||||||
public void init() {
|
public void init() {
|
||||||
settingsModelIstance = (SettingsModel) Stash.getObject(TAG, SettingsModel.class);
|
settingsModelIstance = (SettingsModel) Stash.getObject(TAG, SettingsModel.class);
|
||||||
|
|
||||||
if (settingsModelIstance == null) {
|
if (settingsModelIstance == null)
|
||||||
settingsModelIstance = new SettingsModel();
|
settingsModelIstance = new SettingsModel();
|
||||||
|
|
||||||
|
|
||||||
|
if (settingsModelIstance.getServer() == null)
|
||||||
settingsModelIstance.setServer(new SettingsModel.Server());
|
settingsModelIstance.setServer(new SettingsModel.Server());
|
||||||
firstStart = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
dbSettingsModelIstance = new DBSettingsModel();
|
dbSettingsModelIstance = new DBSettingsModel();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public SettingsModel getSettings() {
|
public SettingsModel getSettings() {
|
||||||
@ -89,10 +87,6 @@ public class SettingsManager {
|
|||||||
return dbSettingsModelIstance;
|
return dbSettingsModelIstance;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static boolean isFirstStart() {
|
|
||||||
return firstStart;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean isInstanceAvailable() {
|
public static boolean isInstanceAvailable() {
|
||||||
return i() != null;
|
return i() != null;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -21,7 +21,7 @@ public class ProdRientroMerceOrderListFilterViewModel {
|
|||||||
|
|
||||||
public void init(List<OrdineLavorazioneDTO> initialList) {
|
public void init(List<OrdineLavorazioneDTO> initialList) {
|
||||||
this.initialOrderList = initialList;
|
this.initialOrderList = initialList;
|
||||||
this.currentFilteredOrderList.setValue(this.initialOrderList);
|
this.currentFilteredOrderList.postValue(this.initialOrderList);
|
||||||
}
|
}
|
||||||
|
|
||||||
public MutableLiveData<List<OrdineLavorazioneDTO>> getMutableFilteredOrderList() {
|
public MutableLiveData<List<OrdineLavorazioneDTO>> getMutableFilteredOrderList() {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user