AndroidNative2026/Haleon_All_Country
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

uae_store_type_id_add

Browse Source
This commit is contained in:
CPM
2021-03-23 12:57:19 +05:30
parent d14b303ef9
commit 9d6cc81cb0
6 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/build.gradle
+4 -4
View File
@@ -28,12 +28,12 @@ android {
versionName "4.3"*/
//For UAE
versionCode 28
versionName "4.0"
/* versionCode 28
versionName "4.0"*/
//For Turkey
/* versionCode 26
versionName "3.8"*/
versionCode 26
versionName "3.8"
//For KSA
/* versionCode 28
GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java
+3 -1
View File
@@ -204,6 +204,8 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
//UAE
/* museridView.setText("testuae");
mPasswordView.setText("cpm123");*/
/* museridView.setText("testuae1");
mPasswordView.setText("cpm123");*/
//KSA
/* museridView.setText("Esmail.d");
@@ -217,7 +219,7 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
//turkey
/* museridView.setText("testmer");
/* museridView.setText("testmer");
mPasswordView.setText("cpm123");*/
//sa
/* museridView.setText("testsa");
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/POGQuestionsActivity.java
+1 -1
View File
@@ -152,7 +152,7 @@ public class POGQuestionsActivity extends AppCompatActivity {
}
});
if (country_id.equals("2") && (storeType_id.equals("9") || storeType_id.equals("15"))) {
if (country_id.equals("2") && (storeType_id.equals("9") || storeType_id.equals("15")||storeType_id.equals("47"))) {
linPlanogramType.setVisibility(View.VISIBLE);
final ArrayAdapter planogramTypeAdapter = new ArrayAdapter<CharSequence>(this,
android.R.layout.simple_spinner_item);
GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadImageWithRetrofit.java
+3 -2
View File
@@ -306,7 +306,6 @@ public class UploadImageWithRetrofit {
}
/*
public File saveBitmapToFileSmaller(File file) {
File file2 = file;
try {
@@ -334,7 +333,8 @@ public class UploadImageWithRetrofit {
}
return file2;
}
*/
/*
public File saveBitmapToFileSmaller(File file) {
File file2 = file;
try {
@@ -380,6 +380,7 @@ public class UploadImageWithRetrofit {
}
return file2;
}
*/
public void showAlert(final Context context, String str, final boolean flag) {