uae_adhoch_issue_resolve

GSKMTOrange/build.gradle

@@ -28,19 +28,19 @@ android {
         versionName "4.3"*/
 
         //For UAE
-       /* versionCode 25
+        versionCode 28
-        versionName "3.7"*/
+        versionName "4.0"
-
 
         //For Turkey
-       /* versionCode 26
+      /*  versionCode 26
         versionName "3.8"*/
 
         //For KSA
        /* versionCode 28
         versionName "4.0"*/
-        versionCode 27
+      //  aading price facing
-        versionName "3.8"
+       /* versionCode 27
+        versionName "3.8"*/
 
         //For SA
        /* versionCode 28

GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java

@@ -96,7 +96,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.TableBean;
  */
 
 public class GSKOrangeDB extends SQLiteOpenHelper {
-    public static final String DATABASE_NAME = "GSK_ORANGE_DB612";
+    public static final String DATABASE_NAME = "GSK_ORANGE_DB614";
     public static final int DATABASE_VERSION = 15;
     TableBean tableBean;
     private SQLiteDatabase db;

GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java

@@ -205,7 +205,6 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
       /*  museridView.setText("testuae");
         mPasswordView.setText("cpm123");*/
 
-
         //KSA
       /*  museridView.setText("Esmail.d");
         mPasswordView.setText("cpm@123");*/
@@ -218,8 +217,8 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
 
 
         //turkey
-        museridView.setText("testmer");
+    /*    museridView.setText("testmer");
-        mPasswordView.setText("cpm123");
+        mPasswordView.setText("cpm123");*/
         //sa
       /*  museridView.setText("testsa");
         mPasswordView.setText("cpm123");

GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java

@@ -390,20 +390,6 @@ public class MainActivity extends AppCompatActivity
             AlertDialog alert = builder.create();
             alert.show();
 
-           /* try {
-                int i = 1/0;
-            }
-            catch (Exception e){
-                Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString());
-                Crashlytics.logException(e.getCause());
-                Crashlytics.logException(new Exception("My custom error message"));
-            }
-
-            Integer.parseInt("");
-*/
-
-            //  finish();
-
 
         } else if (id == R.id.nav_setting) {
 

GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java

@@ -147,7 +147,7 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
         _UserId = preferences.getString(CommonString.KEY_USERNAME, "");
         intime = preferences.getString(CommonString.KEY_STORE_IN_TIME, "");
         country_id = preferences.getString(CommonString.KEY_COUNTRY_ID, "");
-        //store_flag_str = preferences.getString(CommonString.KEY_STORE_FLAG, null);
+      //  store_flag_str = preferences.getString(CommonString.KEY_STORE_FLAG, null);
 
         store_flag_str = getIntent().getStringExtra(CommonString.KEY_STORE_FLAG);
         store_id = getIntent().getStringExtra(CommonString.KEY_STORE_ID);
@@ -505,7 +505,8 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
                                     String status;
 //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)) {
-                                    if (store_flag_str.equals(CommonString.FROM_JCP) || country_id.equalsIgnoreCase("5")  || store_flag_str.equals(CommonString.FROM_PHARMA)|| store_flag_str.equals(CommonString.FROM_DEVIATION)) {
+                                    if (store_flag_str.equals(CommonString.FROM_JCP) || country_id.equalsIgnoreCase("5")
+                                            || store_flag_str.equals(CommonString.FROM_PHARMA)) {
                                         status = CommonString.KEY_INVALID;
                                     } else {
                                         status = CommonString.KEY_VALID;
@@ -936,11 +937,16 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
                 dialog.dismiss();
 //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 +"")) {
-                if (store_flag_str.equals(CommonString.FROM_JCP)|| country_id.equalsIgnoreCase("5")||store_flag_str.equals(CommonString.FROM_DEVIATION)) {
+                //uae adhoch
+               /* if (store_flag_str.equals(CommonString.FROM_JCP)|| country_id.equalsIgnoreCase("5")
+                        ||store_flag_str.equals(CommonString.FROM_DEVIATION)) {*/
+
+                if (store_flag_str.equals(CommonString.FROM_JCP)|| country_id.equalsIgnoreCase("5")) {
+
                     Intent in = new Intent(StoreimageActivity.this, StoreWisePerformanceActivity.class);
                     startActivity(in);
-                    finish();
                     overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
+                    finish();
                 } else if (store_flag_str.equals(CommonString.FROM_PHARMA)) {
                     Intent in = new Intent(StoreimageActivity.this, PharmaActivity.class);
                     startActivity(in);

GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StoreWisePerformanceActivity.java

@@ -75,6 +75,7 @@ public class StoreWisePerformanceActivity extends AppCompatActivity {
             country_id = preferences.getString(CommonString.KEY_COUNTRY_ID, null);
             store_flag_str = preferences.getString(CommonString.KEY_STORE_FLAG, null);
 
+
             toolbar.setTitle(getResources().getString(R.string.title_activity_store_wise_performance));
             setSupportActionBar(toolbar);
 

GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadImageWithRetrofit.java

@@ -306,6 +306,7 @@ public class UploadImageWithRetrofit {
 
     }
 
+/*
    public File saveBitmapToFileSmaller(File file) {
        File file2 = file;
        try {
@@ -333,7 +334,8 @@ public class UploadImageWithRetrofit {
        }
        return file2;
    }
-  /* public File saveBitmapToFileSmaller(File file) {
+*/
+   public File saveBitmapToFileSmaller(File file) {
        File file2 = file;
        try {
            int inWidth = 0;
@@ -377,7 +379,7 @@ public class UploadImageWithRetrofit {
            return file;
        }
        return file2;
-   }*/
+   }
 
 
     public void showAlert(final Context context, String str, final boolean flag) {

library/build/generated/source/buildConfig/debug/com/androidbuts/multispinnerfilter/BuildConfig.java

@@ -1,12 +0,0 @@
-/**
- * Automatically generated file. DO NOT MODIFY
- */
-package com.androidbuts.multispinnerfilter;
-
-public final class BuildConfig {
-  public static final boolean DEBUG = Boolean.parseBoolean("true");
-  public static final String LIBRARY_PACKAGE_NAME = "com.androidbuts.multispinnerfilter";
-  public static final String BUILD_TYPE = "debug";
-  public static final int VERSION_CODE = 1;
-  public static final String VERSION_NAME = "1.0";
-}