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

version23.8Beta muestra version

This commit is contained in:
Sergio De la torre 2023-03-07 09:28:44 +01:00
parent c2f4239ff0
commit 664728d97d
3 changed files with 45 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
.idea/workspace.xml
View File

@ -40,15 +40,12 @@
</configurations>
</component>
<component name="ChangeListManager">
<list default="true" id="3b8bed57-fcd9-4c4b-a644-0b0381aae011" name="Default" comment="">
<list default="true" id="3b8bed57-fcd9-4c4b-a644-0b0381aae011" name="Default" comment="version23.8Beta accede a warehouse">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/ExpeditionSummaryActivity.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/ExpeditionSummaryActivity.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/MODELS/Ruta.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/MODELS/Ruta.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/MainActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/MainActivity.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/Utils.java" afterDir="false" />
</list>
<list id="bb82280e-2612-45ba-bd45-0d90b078e5b6" name="ignore" comment="ignore">
<list id="bb82280e-2612-45ba-bd45-0d90b078e5b6" name="ignore" comment="version23.8Beta accede a warehouse">
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/executionHistory/executionHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/executionHistory/executionHistory.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/executionHistory/executionHistory.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/executionHistory/executionHistory.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/fileHashes.bin" afterDir="false" />
@ -144,6 +141,8 @@
&quot;ApkExportedModule&quot;: &quot;vn-delivery.app&quot;,
&quot;ExportApk.ApkPathForvn-delivery.app&quot;: &quot;C:\\Users\\sergiodt\\AndroidStudioProjects\\vn-delivery\\&quot;,
&quot;PROJECT_TRUSTED_KEY&quot;: &quot;true&quot;,
&quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
&quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
&quot;RunOnceActivity.cidr.known.project.marker&quot;: &quot;true&quot;,
&quot;android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-28/android/widget/AbsListView.java_SELECTED&quot;: &quot;AbsListView&quot;,
&quot;android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-28/android/widget/ListView.java_SELECTED&quot;: &quot;ListView&quot;,
@ -322,7 +321,14 @@
<option name="project" value="LOCAL" />
<updated>1673366849427</updated>
</task>
<option name="localTasksCounter" value="6" />
<task id="LOCAL-00006" summary="version23.8Beta accede a warehouse">
<created>1678114236321</created>
<option name="number" value="00006" />
<option name="presentableId" value="LOCAL-00006" />
<option name="project" value="LOCAL" />
<updated>1678114236321</updated>
</task>
<option name="localTasksCounter" value="7" />
<servers />
</component>
<component name="Vcs.Log.History.Properties">
@ -353,7 +359,8 @@
<MESSAGE value="Versión 9.5 App preparada para modificar consultas back, icono cargar cualquier ruta ya direcciona a la pantalla resumen." />
<MESSAGE value="Versión 23.2Beta en Sfusion" />
<MESSAGE value="Versión 23.4Beta en Sfusion" />
<option name="LAST_COMMIT_MESSAGE" value="Versión 23.4Beta en Sfusion" />
<MESSAGE value="version23.8Beta accede a warehouse" />
<option name="LAST_COMMIT_MESSAGE" value="version23.8Beta accede a warehouse" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>

16
app/build.gradle
View File

@ -7,9 +7,9 @@ android {
applicationId "verdnatura.es.repartoverdnatura"
minSdkVersion 19
//targetSdkVersion 28
versionCode 40
versionName "23.8Beta"
//versionName "23.2Beta" Madrid 33
versionCode 42
versionName "23.8"
// versionName "23.8Beta" versionCode 40
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@ -21,18 +21,12 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
getByName("release") {
applicationIdSuffix = ".sfusion"
// applicationIdSuffix = ".sfusion"
}
getByName("debug") {
applicationIdSuffix = ".sfusion"
// applicationIdSuffix = ".sfusion"
}
/* getByName("release") {
applicationIdSuffix = ".sfusion"
}
getByName("debug") {
applicationIdSuffix = ".sfusion"
}*/
}

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

@ -6,17 +6,17 @@ import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.provider.Settings;
import android.text.InputType;
import android.util.Log;
import android.widget.EditText;
import android.widget.Toast;
import java.util.HashMap;
import java.util.Map;
import verdnatura.es.repartoverdnatura.LoginActivity;
public class Utils {
static SharedPreferences sp;
@ -214,12 +214,34 @@ public class Utils {
Intent i = new Intent();
//i.setClassName("es.verdnatura", "es.verdnatura.presentation.view.feature.login.activity.LoginActivity")
i.setClassName("es.verdnatura.sfusion", "es.verdnatura.presentation.view.feature.main.activity.MainActivity");
String versionName = "";
try {
PackageManager packageManager = context.getPackageManager();
String packageName = context.getPackageName();
PackageInfo packageInfo = packageManager.getPackageInfo(packageName, 0);
versionName = packageInfo.versionName;
Toast.makeText(context,"Versión app:"+versionName,Toast.LENGTH_SHORT).show();
} catch (PackageManager.NameNotFoundException e) {
}
if (versionName.contains("Beta")) {
i.setClassName(
"es.verdnatura.sfusion",
"es.verdnatura.presentation.view.feature.main.activity.MainActivity"
);
} else {
i.setClassName(
"es.verdnatura",
"es.verdnatura.presentation.view.feature.main.activity.MainActivity");
}
// i.setClassName("es.verdnatura.sfusion", "es.verdnatura.presentation.view.feature.main.activity.MainActivity");
i.putExtra("user", getUser(context));
i.putExtra("password", getPass(context));
i.putExtra("userfk", Utils.getIdUserLogin(context));
i.putExtra("menu", option);
context.startActivity(i);
context.startActivity(i);
}
}