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

YSY commit

Browse Source
This commit is contained in:
yadavendras
2019-07-26 18:34:58 +05:30
parent aff5b24204
commit 8d2abf5317
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/misc.xml
Generated
+1 -1
View File
@@ -42,7 +42,7 @@
</value> </value>
</option> </option>
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" 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>
<component name="ProjectType"> <component name="ProjectType">
GSKMTOrange/build.gradle
+4 -4
View File
@@ -21,12 +21,12 @@ android {
targetSdkVersion 26 targetSdkVersion 26
//For Egypt //For Egypt
/* versionCode 25 versionCode 25
versionName "3.7"*/ versionName "3.7"
//For UAE //For UAE
versionCode 22 /*versionCode 22
versionName "3.4" versionName "3.4"*/
//For Turkey //For Turkey
/*versionCode 23 /*versionCode 23
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java
+1 -1
View File
@@ -837,7 +837,7 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli
showMyDialog(store_id, current.getSTORE_NAME(), "Yes", current.getVISIT_DATE(), current.getCHECKOUT_STATUS(), current.getGEO_TAG(), current); showMyDialog(store_id, current.getSTORE_NAME(), "Yes", current.getVISIT_DATE(), current.getCHECKOUT_STATUS(), current.getGEO_TAG(), current);
} }
else { else {
if(country_id.equalsIgnoreCase("5")){ if(country_id.equalsIgnoreCase("5") || country_id.equalsIgnoreCase(CommonString.COUNTRY_ID_EGYPT +"")){
if (!current.getGEO_TAG().equalsIgnoreCase("N")) { if (!current.getGEO_TAG().equalsIgnoreCase("N")) {
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java
+3 -2
View File
@@ -503,7 +503,7 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
String status; String status;
if (store_flag_str.equals(CommonString.FROM_JCP) || country_id.equalsIgnoreCase("5") if (store_flag_str.equals(CommonString.FROM_JCP) || country_id.equalsIgnoreCase("5") || country_id.equalsIgnoreCase(CommonString.COUNTRY_ID_EGYPT +"")
|| store_flag_str.equals(CommonString.FROM_ADDITIONAL) || store_flag_str.equals(CommonString.FROM_PHARMA)) { || store_flag_str.equals(CommonString.FROM_ADDITIONAL) || store_flag_str.equals(CommonString.FROM_PHARMA)) {
status = CommonString.KEY_INVALID; status = CommonString.KEY_INVALID;
} else { } else {
@@ -935,7 +935,8 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
if (result.equalsIgnoreCase(CommonString.KEY_SUCCESS)) { if (result.equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
dialog.dismiss(); dialog.dismiss();
if (store_flag_str.equals(CommonString.FROM_JCP)|| country_id.equalsIgnoreCase("5")|| store_flag_str.equals(CommonString.FROM_ADDITIONAL)) { if (store_flag_str.equals(CommonString.FROM_JCP)|| country_id.equalsIgnoreCase("5")|| store_flag_str.equals(CommonString.FROM_ADDITIONAL)
|| country_id.equalsIgnoreCase(CommonString.COUNTRY_ID_EGYPT +"")) {
Intent in = new Intent(StoreimageActivity.this, StoreWisePerformanceActivity.class); Intent in = new Intent(StoreimageActivity.this, StoreWisePerformanceActivity.class);
startActivity(in); startActivity(in);
finish(); finish();