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

Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into Category_G

Browse Source 
# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
#	GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
This commit is contained in:
Gagan290
2016-12-29 12:35:46 +05:30
parent b39076fcf2
commit 2c077f5c3d
2 changed files with 14 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
+10 -49
View File
@@ -13,23 +13,18 @@ import cpm.com.gskmtorange.xmlHandlers.TableBean;
* Created by ashishc on 29-12-2016.
*/
public class GSKOrangeDB extends SQLiteOpenHelper{
public static final String DATABASE_NAME = "GSK_ORANGE";
public static final int DATABASE_VERSION = 13;
private SQLiteDatabase db;
TableBean tableBean;
public class GSKOrangeDB extends SQLiteOpenHelper {
public static final String DATABASE_NAME = "GSK_ORANGE";
public static final int DATABASE_VERSION = 13;
private SQLiteDatabase db;
TableBean tableBean;
public GSKOrangeDB(Context context) {
super(context, DATABASE_NAME, null, DATABASE_VERSION);
}
public void open() {
try {
db = this.getWritableDatabase();
} catch (Exception e) {
e.printStackTrace();
@@ -38,39 +33,26 @@ public class GSKOrangeDB extends SQLiteOpenHelper{
@Override
public void onCreate(SQLiteDatabase db) {
db.execSQL(TableBean.getJourneyPlan());
}
@Override
public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
db.execSQL("DROP TABLE IF EXISTS " + TableBean.getJourneyPlan());
}
public void deleteTableWithStoreID(String storeid, String process_id) {
}
public void deleteTableWithStoreID(String storeid, String process_id){
public void deleteAllTables() {
}
public void deleteAllTables(){
}
public void InsertJCP(JourneyPlanGetterSetter data) {
db.delete("JOURNEY_PLAN", null, null);
ContentValues values = new ContentValues();
try {
for (int i = 0; i < data.getSTORE_ID().size(); i++) {
@@ -110,30 +92,9 @@ public class GSKOrangeDB extends SQLiteOpenHelper{
}
}
catch (Exception ex) {
} catch (Exception ex) {
Log.d("Exception in JCP", ex.toString());
}
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java
+4 -3
View File
@@ -21,7 +21,8 @@ import cpm.com.gskmtorange.R;
* Created by ashishc on 27-12-2016.
*/
public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallback,GoogleApiClient.ConnectionCallbacks, GoogleApiClient.OnConnectionFailedListener, LocationListener{
public class GeoTagActivity extends AppCompatActivity {
//implements OnMapReadyCallback,GoogleApiClient.ConnectionCallbacks, GoogleApiClient.OnConnectionFailedListener, LocationListener{
private GoogleMap mMap;
double latitude =0.0;
@@ -40,7 +41,7 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCa
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
preferences = PreferenceManager.getDefaultSharedPreferences(this);
username = preferences.getString(CommonString.KEY_USERNAME, null);
//username = preferences.getString(CommonString.KEY_USERNAME, null);
fab = (FloatingActionButton) findViewById(R.id.fab);
@@ -51,7 +52,7 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCa
mapFragment = (SupportMapFragment) getSupportFragmentManager()
.findFragmentById(R.id.map);
mapFragment.getMapAsync(this);
//mapFragment.getMapAsync(this);