Merge pull request #39 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/YSY_final

Ysy final

.idea/modules.xml

@@ -3,7 +3,6 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/GSKMTOrange/GSKMTOrange.iml" filepath="$PROJECT_DIR$/GSKMTOrange/GSKMTOrange.iml" />
-      <module fileurl="file://$PROJECT_DIR$/GSKORANGEV1.iml" filepath="$PROJECT_DIR$/GSKORANGEV1.iml" />
       <module fileurl="file://$PROJECT_DIR$/GSKORANGEV2.iml" filepath="$PROJECT_DIR$/GSKORANGEV2.iml" />
     </modules>
   </component>

GSKMTOrange/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 24
-    buildToolsVersion "24.0.1"
+    buildToolsVersion '25.0.0'
 
     useLibrary 'org.apache.http.legacy'
 
@@ -15,8 +15,8 @@ android {
         minSdkVersion 15
         targetSdkVersion 22
 
-        versionCode 6
+        versionCode 8
-        versionName "1.5"
+        versionName "2.1"
         
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }

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

@@ -2316,7 +2316,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
 
         try {
 
-            cursordata = db.rawQuery("SELECT * FROM STOCK_DIALOG WHERE COMMON_ID = '" + keyid + "'", null);
+            cursordata = db.rawQuery("SELECT * FROM STOCK_DIALOG_MAIN WHERE COMMON_ID = '" + keyid + "'", null);
 
             if (cursordata != null) {
                 cursordata.moveToFirst();

GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java

@@ -170,14 +170,6 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb
         geocoder = new Geocoder(this);
         Location location = locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER);
 
-
-        if (checkPlayServices()) {
-
-            // Building the GoogleApi client
-            buildGoogleApiClient();
-        }
-
-
         if (checkPlayServices()) {
 
             // Building the GoogleApi client

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

@@ -1,5 +1,6 @@
 package cpm.com.gskmtorange.dailyentry;
 
+import android.Manifest;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.ActivityNotFoundException;
@@ -13,13 +14,16 @@ import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.location.Geocoder;
 import android.location.Location;
+import android.location.LocationManager;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.provider.MediaStore;
+import android.provider.Settings;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
@@ -32,10 +36,19 @@ import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.google.android.gms.appindexing.AppIndex;
 import com.google.android.gms.common.ConnectionResult;
+import com.google.android.gms.common.GooglePlayServicesUtil;
 import com.google.android.gms.common.api.GoogleApiClient;
+import com.google.android.gms.location.LocationListener;
+import com.google.android.gms.location.LocationRequest;
 import com.google.android.gms.location.LocationServices;
 
+import com.google.android.gms.maps.CameraUpdateFactory;
+import com.google.android.gms.maps.GoogleMap;
+import com.google.android.gms.maps.model.LatLng;
+import com.google.android.gms.maps.model.MarkerOptions;
+
 import org.ksoap2.SoapEnvelope;
 import org.ksoap2.serialization.SoapObject;
 import org.ksoap2.serialization.SoapSerializationEnvelope;
@@ -59,6 +72,7 @@ import java.util.Locale;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 
+import cpm.com.gskmtorange.GeoTag.GeoTagActivity;
 import cpm.com.gskmtorange.R;
 import cpm.com.gskmtorange.constant.CommonString;
 import cpm.com.gskmtorange.Database.GSKOrangeDB;
@@ -72,7 +86,7 @@ import cpm.com.gskmtorange.xmlHandlers.FailureXMLHandler;
  * Created by ashishc on 31-05-2016.
  */
 public class StoreimageActivity extends AppCompatActivity implements View.OnClickListener,
-        GoogleApiClient.ConnectionCallbacks, GoogleApiClient.OnConnectionFailedListener {
+        GoogleApiClient.ConnectionCallbacks, GoogleApiClient.OnConnectionFailedListener, LocationListener {
 
     String gallery_package = "";
     Uri outputFileUri;
@@ -91,13 +105,25 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
     String img_str, strflag;
     private GSKOrangeDB database;
 
-    String lat, lon;
+    double lat, lon;
     GoogleApiClient mGoogleApiClient;
     ArrayList<CoverageBean> coverage_list;
     Toolbar toolbar;
     boolean ResultFlag = true;
     ArrayList<CoverageBean> coverage = new ArrayList<CoverageBean>();
 
+    LocationManager locationManager;
+    boolean enabled;
+    private final static int PLAY_SERVICES_RESOLUTION_REQUEST = 1000;
+
+    private LocationRequest mLocationRequest;
+    private static int UPDATE_INTERVAL = 500; // 5 sec
+    private static int FATEST_INTERVAL = 100; // 1 sec
+    private static int DISPLACEMENT = 5; // 10 meters
+    private Location mLastLocation;
+
+    private static final String TAG = StoreimageActivity.class.getSimpleName();
+
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_storeimage);
@@ -133,6 +159,53 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
         img_clicked.setOnClickListener(this);
         btn_save.setOnClickListener(this);
 
+        if (checkPlayServices()) {
+
+            // Building the GoogleApi client
+            buildGoogleApiClient();
+
+            createLocationRequest();
+        }
+
+        locationManager = (LocationManager) getSystemService(Context.LOCATION_SERVICE);
+        enabled = locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER);
+
+        if (!enabled) {
+            AlertDialog.Builder alertDialog = new AlertDialog.Builder(
+                    StoreimageActivity.this);
+
+            // Setting Dialog Title
+            alertDialog.setTitle(getResources().getString(R.string.gps));
+
+            // Setting Dialog Message
+            alertDialog.setMessage(getResources().getString(R.string.gpsebale));
+
+            // Setting Positive "Yes" Button
+            alertDialog.setPositiveButton(getResources().getString(R.string.yes),
+                    new DialogInterface.OnClickListener() {
+                        public void onClick(DialogInterface dialog, int which) {
+
+                            Intent intent = new Intent(
+                                    Settings.ACTION_LOCATION_SOURCE_SETTINGS);
+                            startActivity(intent);
+                        }
+                    });
+
+            // Setting Negative "NO" Button
+            alertDialog.setNegativeButton(getResources().getString(R.string.no),
+                    new DialogInterface.OnClickListener() {
+                        public void onClick(DialogInterface dialog, int which) {
+                            // Write your code here to invoke NO event
+
+                            dialog.cancel();
+                        }
+                    });
+
+            // Showing Alert Message
+            alertDialog.show();
+
+        }
+
         // Create an instance of GoogleAPIClient.
         if (mGoogleApiClient == null) {
             mGoogleApiClient = new GoogleApiClient.Builder(this)
@@ -165,6 +238,125 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
         return super.onOptionsItemSelected(item);
     }
 
+    private boolean checkPlayServices() {
+        int resultCode = GooglePlayServicesUtil
+                .isGooglePlayServicesAvailable(this);
+        if (resultCode != ConnectionResult.SUCCESS) {
+            if (GooglePlayServicesUtil.isUserRecoverableError(resultCode)) {
+                GooglePlayServicesUtil.getErrorDialog(resultCode, this,
+                        PLAY_SERVICES_RESOLUTION_REQUEST).show();
+            } else {
+                Toast.makeText(getApplicationContext(),getResources().getString(R.string.notsuppoted)
+                        , Toast.LENGTH_LONG)
+                        .show();
+                finish();
+            }
+            return false;
+        }
+        return true;
+    }
+
+    protected synchronized void buildGoogleApiClient() {
+        mGoogleApiClient = new GoogleApiClient.Builder(this)
+                .addConnectionCallbacks(this)
+                .addOnConnectionFailedListener(this)
+                .addApi(LocationServices.API).build();
+    }
+
+
+    protected void createLocationRequest() {
+        mLocationRequest = new LocationRequest();
+        mLocationRequest.setInterval(UPDATE_INTERVAL);
+        mLocationRequest.setFastestInterval(FATEST_INTERVAL);
+        mLocationRequest.setPriority(LocationRequest.PRIORITY_HIGH_ACCURACY);
+        mLocationRequest.setSmallestDisplacement(DISPLACEMENT);
+    }
+
+    protected void startLocationUpdates() {
+
+
+        if (ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED
+                || ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED) {
+
+            LocationServices.FusedLocationApi.requestLocationUpdates(mGoogleApiClient, mLocationRequest, this);
+
+        }
+
+    }
+
+    /**
+     * Stopping location updates
+     */
+    protected void stopLocationUpdates() {
+        LocationServices.FusedLocationApi.removeLocationUpdates(mGoogleApiClient, this);
+    }
+
+    @Override
+    public void onConnected(Bundle bundle) {
+
+        mLastLocation = LocationServices.FusedLocationApi.getLastLocation(mGoogleApiClient);
+
+        if (ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED
+                || ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED) {
+            if (mLastLocation != null) {
+                lat = mLastLocation.getLatitude();
+                lon = mLastLocation.getLongitude();
+
+            }
+        }
+
+
+        // if (mRequestingLocationUpdates) {
+        startLocationUpdates();
+        // }
+
+        // startLocationUpdates();
+    }
+
+    @Override
+    public void onConnectionSuspended(int i) {
+        mGoogleApiClient.connect();
+    }
+
+
+    @Override
+    public void onConnectionFailed(ConnectionResult connectionResult) {
+        Log.i(TAG, "Connection failed: ConnectionResult.getErrorCode() = " + connectionResult.getErrorCode());
+    }
+
+
+    protected void onStart() {
+        super.onStart();// ATTENTION: This was auto-generated to implement the App Indexing API.
+// See https://g.co/AppIndexing/AndroidStudio for more information.
+        //client.connect();
+        if (mGoogleApiClient != null) {
+            mGoogleApiClient.connect();
+        }
+        // ATTENTION: This was auto-generated to implement the App Indexing API.
+        // See https://g.co/AppIndexing/AndroidStudio for more information.
+       // AppIndex.AppIndexApi.start(client, getIndexApiAction());
+    }
+
+
+    @Override
+    protected void onStop() {
+        super.onStop();// ATTENTION: This was auto-generated to implement the App Indexing API.
+// See https://g.co/AppIndexing/AndroidStudio for more information.
+       // AppIndex.AppIndexApi.end(client, getIndexApiAction());
+        if (mGoogleApiClient.isConnected()) {
+            mGoogleApiClient.disconnect();
+        }
+        // ATTENTION: This was auto-generated to implement the App Indexing API.
+        // See https://g.co/AppIndexing/AndroidStudio for more information.
+        //client.disconnect();
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        stopLocationUpdates();
+    }
+
     @Override
     public void onBackPressed() {
         /*Intent i = new Intent(this, DailyEntryScreen.class);
@@ -212,8 +404,8 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
                                     cdata.setInTime(intime);
                                     cdata.setReason("");
                                     cdata.setReasonid("0");
-                                    cdata.setLatitude(lat);
+                                    cdata.setLatitude(lat+"");
-                                    cdata.setLongitude(lon);
+                                    cdata.setLongitude(lon+"");
                                     cdata.setImage(img_str);
                                     cdata.setRemark("");
                                     cdata.setStatus(CommonString.KEY_INVALID);
@@ -357,33 +549,22 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
         return cdate;
     }
 
-    @Override
-    public void onConnected(Bundle bundle) {
-        Location mLastLocation = LocationServices.FusedLocationApi.getLastLocation(mGoogleApiClient);
-        if (mLastLocation != null) {
-            lat = String.valueOf(mLastLocation.getLatitude());
-            lon = String.valueOf(mLastLocation.getLongitude());
-        }
-    }
 
-    @Override
-    public void onConnectionSuspended(int i) {
-
-    }
-
-    @Override
-    public void onConnectionFailed(ConnectionResult connectionResult) {
-
-    }
 
     @Override
     protected void onResume() {
         super.onResume();
         updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
         toolbar.setTitle(R.string.title_activity_store_image);
+
+        // Resuming the periodic location updates
+        if (mGoogleApiClient.isConnected() ) {
+            startLocationUpdates();
+        }
+
     }
 
-    protected void onStart() {
+    /*protected void onStart() {
         mGoogleApiClient.connect();
         super.onStart();
     }
@@ -391,7 +572,7 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
     protected void onStop() {
         mGoogleApiClient.disconnect();
         super.onStop();
-    }
+    }*/
 
     private static boolean updateResources(Context context, String language) {
 
@@ -435,6 +616,11 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
         return true;
     }
 
+    @Override
+    public void onLocationChanged(Location location) {
+
+    }
+
 
     public class GeoTagUpload extends AsyncTask<Void, Void, String> {
 

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

@@ -1294,6 +1294,7 @@ public class T2PComplianceActivity extends AppCompatActivity {
         if (new File(str + planogram_image).exists()) {
 
             String imagePath = "file://" + CommonString.FILE_PATH + "/" + planogram_image;
+            //String imagePath = "file://" + CommonString.FILE_PATH + "/" + "image_ref.png";
             String html = "<html><head></head><body><img src=\"" + imagePath + "\"></body></html>";
             webView.loadDataWithBaseURL("", html, "text/html", "utf-8", "");
 

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

@@ -40,7 +40,7 @@ public class CategoryListActivity extends AppCompatActivity {
     CategoryListAdapter adapter;
 
     GSKOrangeDB db;
-    String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id;
+    String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id,camera_allow;
     private SharedPreferences preferences;
 
     @Override
@@ -65,6 +65,7 @@ public class CategoryListActivity extends AppCompatActivity {
         keyAccount_id = preferences.getString(CommonString.KEY_KEYACCOUNT_ID, "");
         class_id = preferences.getString(CommonString.KEY_CLASS_ID, "");
         storeType_id = preferences.getString(CommonString.KEY_STORETYPE_ID, "");
+        camera_allow = preferences.getString(CommonString.KEY_CAMERA_ALLOW, "");
 
 
         /*txt_categoryName = (TextView) findViewById(R.id.txt_categoryName);
@@ -147,6 +148,15 @@ public class CategoryListActivity extends AppCompatActivity {
                         }
                     }
 
+                    //Category image
+                    if (camera_allow.equalsIgnoreCase("1")) {
+                        //if (category_camera_list.size()>0) {
+                        if (!db.isCategoryPictureData(store_id, category_id)) {
+                            flag = false;
+
+                        }
+                    }
+
                     flag_filled = flag;
                 }
 
@@ -364,6 +374,14 @@ public class CategoryListActivity extends AppCompatActivity {
 
                 }
 
+                if (camera_allow.equalsIgnoreCase("1")) {
+                    //if (category_camera_list.size()>0) {
+                    if (!db.isCategoryPictureData(store_id, category_id)) {
+                        flag_filled = false;
+                        break;
+                    }
+                }
+
                 flag_filled = true;
             } else {
                 flag_filled = false;

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

@@ -26,6 +26,7 @@ import java.util.List;
 import java.util.Locale;
 
 import cpm.com.gskmtorange.Database.GSKOrangeDB;
+import cpm.com.gskmtorange.GetterSetter.CategoryPictureGetterSetter;
 import cpm.com.gskmtorange.R;
 import cpm.com.gskmtorange.constant.CommonString;
 import cpm.com.gskmtorange.dailyentry.AdditionalVisibility;
@@ -44,6 +45,8 @@ public class DailyDataMenuActivity extends AppCompatActivity {
     String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id, camera_allow;
     private SharedPreferences preferences;
 
+    ArrayList<CategoryPictureGetterSetter> category_camera_list;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -186,11 +189,12 @@ public class DailyDataMenuActivity extends AppCompatActivity {
             }
             categoryList.add(data);
 
-
             //Category Pictures
             data = new DailyDataMenuGetterSetter();
             data.setCategory_name(getResources().getString(R.string.daily_data_menu_category_picture));
+            //category_camera_list = db.getCategoryPicturedata(categoryId, keyAccount_id, storeType_id, class_id);
             if (camera_allow.equalsIgnoreCase("1")) {
+           //if (category_camera_list.size()>0) {
                 if (db.isCategoryPictureData(store_id, categoryId)) {
                     data.setCategory_img(R.mipmap.picturecatogory_done);
                 } else {

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

@@ -2,12 +2,16 @@ package cpm.com.gskmtorange.gsk_dailyentry;
 
 import android.annotation.SuppressLint;
 import android.app.AlertDialog;
+import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.pm.ActivityInfo;
 import android.content.res.Configuration;
 import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.graphics.Typeface;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
@@ -18,10 +22,15 @@ import android.support.v7.widget.CardView;
 import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.view.LayoutInflater;
+import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.Window;
+import android.view.WindowManager;
 import android.view.inputmethod.InputMethodManager;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
 import android.widget.AbsListView;
 import android.widget.BaseExpandableListAdapter;
 import android.widget.CompoundButton;
@@ -33,6 +42,7 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.ToggleButton;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -41,6 +51,7 @@ import java.util.Locale;
 import cpm.com.gskmtorange.Database.GSKOrangeDB;
 import cpm.com.gskmtorange.R;
 import cpm.com.gskmtorange.constant.CommonString;
+import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_PLANOGRAM_DataGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityStockFacingGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.StockFacing_PlanogramTrackerDataGetterSetter;
 
@@ -67,6 +78,8 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity {
     boolean isDialogOpen = true;
     private SharedPreferences preferences;
 
+    String str = "", _pathforcheck = "";
+
     ArrayList<StockFacing_PlanogramTrackerDataGetterSetter> planogramShelfHeaderDataList = new ArrayList<>();
     ArrayList<StockFacing_PlanogramTrackerDataGetterSetter> planogramSkuChildDataList;
     HashMap<StockFacing_PlanogramTrackerDataGetterSetter, ArrayList<StockFacing_PlanogramTrackerDataGetterSetter>> planogramHashMapListChildData = new HashMap<>();
@@ -119,6 +132,8 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity {
             getSupportActionBar().setHomeButtonEnabled(true);
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
+            str = CommonString.FILE_PATH ;
+
             prepareList();
 
             //Camera
@@ -249,6 +264,125 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity {
         }
     }
 
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.planogram, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        int id = item.getItemId();
+
+        if (id == android.R.id.home) {
+            AlertDialog.Builder builder = new AlertDialog.Builder(MSL_Availability_StockFacingActivity.this);
+            builder.setTitle(getResources().getString(R.string.dialog_title));
+            builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false)
+                    .setPositiveButton(getResources().getString(R.string.ok), new DialogInterface.OnClickListener() {
+                        public void onClick(DialogInterface dialog, int id) {
+
+                            if (!validateData(hashMapListHeaderData, hashMapListChildData)) {
+                                if (!camera_allow.equals("1")) {
+                                    db.deletePlanogramListStoreAndCategorywise(store_id, categoryId,
+                                            planogramShelfHeaderDataList, planogramHashMapListChildData);
+                                }
+                            }
+                            finish();
+                        }
+                    })
+                    .setNegativeButton(getResources().getString(R.string.cancel), new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialog, int which) {
+
+                        }
+                    });
+            AlertDialog alert = builder.create();
+            alert.show();
+            //finish();
+        }
+
+        //Planogram Dialog
+        if (id == R.id.action_planogram) {
+            expandableListView.clearFocus();
+
+            //final Dialog dialog = new Dialog(Stock_FacingActivity.this, android.R.style.Theme_Black_NoTitleBar_Fullscreen);
+            final Dialog dialog = new Dialog(MSL_Availability_StockFacingActivity.this);
+            dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+            //dialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+            dialog.setContentView(R.layout.planogram_dialog_layout);
+            dialog.getWindow().setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT);
+            dialog.setCancelable(false);
+
+            ArrayList<MAPPING_PLANOGRAM_DataGetterSetter> mappingPlanogramList = db.getMappingPlanogramData(categoryId);
+
+            //ImageView img_planogram = (ImageView) dialog.findViewById(R.id.img_planogram);
+            WebView webView = (WebView) dialog.findViewById(R.id.webview);
+            webView.setWebViewClient(new MyWebViewClient());
+
+            webView.getSettings().setAllowFileAccess(true);
+            webView.getSettings().setJavaScriptEnabled(true);
+            webView.getSettings().setBuiltInZoomControls(true);
+
+            String planogram_image = "";
+            if (mappingPlanogramList.size() > 0) {
+                planogram_image = mappingPlanogramList.get(0).getPLANOGRAM_IMAGE();
+            }
+            if (!planogram_image.equals("")) {
+                if (new File(str + planogram_image).exists()) {
+                    Bitmap bmp = BitmapFactory.decodeFile(str + planogram_image);
+                    // img_planogram.setRotation(90);
+                    //img_planogram.setImageBitmap(bmp);
+                    setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+
+                    String imagePath = "file://" + CommonString.FILE_PATH + "/" + planogram_image;
+                    String html = "<html><head></head><body><img src=\"" + imagePath + "\"></body></html>";
+                    webView.loadDataWithBaseURL("", html, "text/html", "utf-8", "");
+
+                    dialog.show();
+                } /*else {
+                //webView.loadUrl(String.valueOf(R.drawable.sad_cloud));
+
+                //img_planogram.setBackgroundResource(R.drawable.sad_cloud);
+            }*/
+            }
+
+
+            ImageView cancel = (ImageView) dialog.findViewById(R.id.img_cancel);
+            cancel.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+                    dialog.dismiss();
+                }
+            });
+
+            //dialog.show();
+            return true;
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+
+    private class MyWebViewClient extends WebViewClient {
+
+        @Override
+        public boolean shouldOverrideUrlLoading(WebView view, String url) {
+            view.loadUrl(url);
+            return true;
+        }
+
+        @Override
+        public void onPageFinished(WebView view, String url) {
+            super.onPageFinished(view, url);
+            view.clearCache(true);
+        }
+
+        @Override
+        public void onPageStarted(WebView view, String url, Bitmap favicon) {
+            super.onPageStarted(view, url, favicon);
+        }
+    }
+
     private void cameraMethod() {
         /*cameraData = new Store_wise_camera_DataGetterSetter();
 
@@ -502,47 +636,6 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity {
         return checkflag;
     }
 
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        // Handle action bar item clicks here. The action bar will
-        // automatically handle clicks on the Home/Up button, so long
-        // as you specify a parent activity in AndroidManifest.xml.
-        int id = item.getItemId();
-
-        if (id == android.R.id.home) {
-            AlertDialog.Builder builder = new AlertDialog.Builder(MSL_Availability_StockFacingActivity.this);
-            builder.setTitle(getResources().getString(R.string.dialog_title));
-            builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false)
-                    .setPositiveButton(getResources().getString(R.string.ok), new DialogInterface.OnClickListener() {
-                        public void onClick(DialogInterface dialog, int id) {
-
-                            if (!validateData(hashMapListHeaderData, hashMapListChildData)) {
-                                if (!camera_allow.equals("1")) {
-                                    db.deletePlanogramListStoreAndCategorywise(store_id, categoryId,
-                                            planogramShelfHeaderDataList, planogramHashMapListChildData);
-                                }
-                            }
-                            finish();
-                        }
-                    })
-                    .setNegativeButton(getResources().getString(R.string.cancel), new DialogInterface.OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dialog, int which) {
-
-                        }
-                    });
-            AlertDialog alert = builder.create();
-            alert.show();
-            //finish();
-        }
-
-        //noinspection SimplifiableIfStatement
-        if (id == R.id.action_settings) {
-            return true;
-        }
-
-        return super.onOptionsItemSelected(item);
-    }
 
     @Override
     public void onBackPressed() {

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

@@ -637,7 +637,7 @@ public class UploadActivity extends AppCompatActivity {
                                             + "[DISPLAY_ID]" + additionalVisibilityList.get(J).getSku_id() + "[/DISPLAY_ID]"
                                             + "[SKU_LIST]" + additional_visibility_dialog_xml + "[/SKU_LIST]"
                                             + "[/ADDITIONAL_VISIBILITY_NEW]";
-
+                                            //Here getSku_id gives display_id
 
                                     additional_visibility_data_xml = additional_visibility_data_xml + onXML;
                                     KeyID = "";
@@ -720,7 +720,7 @@ public class UploadActivity extends AppCompatActivity {
                                     }
 
 
-                                    /*String brandxml = "";
+                                   String brandxml = "";
                                     String brandchild;
 
                                     if (brandList.size() > 0) {
@@ -735,7 +735,7 @@ public class UploadActivity extends AppCompatActivity {
                                                     + "[/BRAND]";
                                             brandxml = brandxml + brandchild;
                                         }
-                                    }*/
+                                    }
 
                                     String present = "";
                                     if (t2PGetterSetters.get(i1).isPresent()) {
@@ -757,7 +757,7 @@ public class UploadActivity extends AppCompatActivity {
                                             + "[PRESENT]" + present + "[/PRESENT]"
                                             + "[GAPS_DATA]" + gaps_xml + "[/GAPS_DATA]"
                                             + "[SKU_DATA]" + sku_xml + "[/SKU_DATA]"
-                                            //+ "[BRAND_DATA]" + brandxml + "[/BRAND_DATA]"
+                                            + "[BRAND_DATA]" + brandxml + "[/BRAND_DATA]"
                                             + "[/T2P_DATA]";
 
                                     t2p_data_xml = t2p_data_xml + onXML;

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:2.3.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Dec 28 10:00:20 PST 2015
+#Wed Apr 12 12:10:11 IST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip