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-01-25 21:18:40 +05:30
parent f1eff431cd
commit dec95a2073
28 changed files with 94 additions and 3965 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/build.gradle
+1 -1
View File
@@ -37,7 +37,7 @@ android {
versionName "3.4"*/
//For SA
versionCode 23
versionCode 22
versionName "3.5"
GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
+16 -3
View File
@@ -3561,13 +3561,22 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
public ArrayList<CoverageBean> getPreviousCoverageData(String visitdate) {
public ArrayList<CoverageBean> getPreviousCoverageData(String visitdate, String flag_from) {
ArrayList<CoverageBean> list = new ArrayList<CoverageBean>();
Cursor dbcursor = null;
try {
dbcursor = db.rawQuery("SELECT * from " + CommonString.TABLE_COVERAGE_DATA + " where "
+ CommonString.KEY_VISIT_DATE + "<>'" + visitdate + "'", null);
if (flag_from != null) {
dbcursor = db.rawQuery("SELECT * from " + CommonString.TABLE_COVERAGE_DATA + " where "
+ CommonString.KEY_VISIT_DATE + "<>'" + visitdate + "' AND " + CommonString.KEY_STORE_FLAG + "='" + flag_from + "'",
null);
} else {
dbcursor = db.rawQuery("SELECT * from " + CommonString.TABLE_COVERAGE_DATA + " where "
+ CommonString.KEY_VISIT_DATE + "<>'" + visitdate + "'",
null);
}
if (dbcursor != null) {
dbcursor.moveToFirst();
@@ -3594,6 +3603,10 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
sb.setRemark((((dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_COVERAGE_REMARK))))));
}
sb.setCheckOut_Image(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_CHECKOUT_IMAGE)));
sb.setFlag_from(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_STORE_FLAG)));
sb.setSub_reasonId(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_SUB_REASON_ID)));
list.add(sb);
dbcursor.moveToNext();
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java
+2
View File
@@ -574,7 +574,9 @@ public class LoginActivity extends AppCompatActivity {
editor.putString(CommonString.KEY_VERSION, lgs.getAPP_VERSION());
editor.putString(CommonString.KEY_PATH, lgs.getAPP_PATH());
editor.putString(CommonString.KEY_DATE, lgs.getCURRENTDATE());
//editor.putString(CommonString.KEY_DATE, "01/25/2019");
editor.putString(CommonString.KEY_COUNTRY_ID, lgs.getCOUNTRY_ID());
editor.commit();
GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
+1 -1
View File
@@ -493,7 +493,7 @@ public class MainActivity extends AppCompatActivity
public boolean isPreviousValid(String visit_date) {
boolean isvalid = false;
ArrayList<CoverageBean> coverage_list = db.getPreviousCoverageData(visit_date);
ArrayList<CoverageBean> coverage_list = db.getPreviousCoverageData(visit_date, null);
for (int i = 0; i < coverage_list.size(); i++) {
StoreBean storeData = db.getSpecificStoreData(coverage_list.get(i).getVisitDate(), coverage_list.get(i).getStoreId(), coverage_list.get(i).getFlag_from());
if (storeData.getSTORE_ID() != null) {
GSKMTOrange/src/main/java/cpm/com/gskmtorange/autoupdate/AutoUpdateActivity.java
+21 -2
View File
@@ -11,6 +11,7 @@ import android.content.res.Configuration;
import android.content.res.Resources;
import android.net.Uri;
import android.os.AsyncTask;
import android.os.Build;
import android.os.Environment;
import android.preference.PreferenceManager;
import android.support.v4.content.FileProvider;
@@ -251,13 +252,31 @@ public class AutoUpdateActivity extends AppCompatActivity {
dialog.dismiss();
if (result.equals(CommonString.KEY_SUCCESS)) {
Intent i = new Intent(Intent.ACTION_VIEW);
/* Intent i = new Intent(Intent.ACTION_VIEW);
i.setDataAndType(FileProvider.getUriForFile(getApplicationContext(), "cpm.com.gskmtorange.fileprovider", new File(Environment
.getExternalStorageDirectory()
+ "/download/"
+ "app.apk")),
"application/vnd.android.package-archive");
startActivity(i);
startActivity(i);*/
File toInstall = new File(Environment.getExternalStorageDirectory()
+ "/download/"
+ "app.apk");
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
Uri apkUri = FileProvider.getUriForFile(getApplicationContext(), "cpm.com.gskmtorange.fileprovider", toInstall);
Intent intent = new Intent(Intent.ACTION_INSTALL_PACKAGE);
intent.setData(apkUri);
intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
startActivity(intent);
} else {
Uri apkUri = Uri.fromFile(toInstall);
Intent intent = new Intent(Intent.ACTION_VIEW);
intent.setDataAndType(apkUri, "application/vnd.android.package-archive");
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
startActivity(intent);
}
AutoUpdateActivity.this.finish();
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java
+52 -1
View File
@@ -241,7 +241,43 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
protected String doInBackground(Void... params) {
try {
data = new Data();
coverageList = db.getPreviousCoverageData(date);
ArrayList<CoverageBean> adhoc_coverageList = db.getPreviousCoverageData(date, CommonString.FROM_DEVIATION);
if (adhoc_coverageList.size() > 0) {
for (int i = 0; i < adhoc_coverageList.size(); i++) {
String onXML = "[ADHOC_JCP]"
+ "[USER_ID]" + userId + "[/USER_ID]"
+ "[VISIT_DATE]" + adhoc_coverageList.get(i).getVisitDate() + "[/VISIT_DATE]"
+ "[STORE_CD]" + adhoc_coverageList.get(i).getStoreId() + "[/STORE_CD]"
+ "[/ADHOC_JCP]";
final String adhoc_xml = "[DATA]" + onXML + "[/DATA]";
SoapObject request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
request.addProperty("XMLDATA", adhoc_xml);
request.addProperty("KEYS", "ADHOC_JOURNEY_PLAN");
request.addProperty("USERNAME", userId);
request.addProperty("MID", 0);
SoapSerializationEnvelope envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
HttpTransportSE androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
}
}
}
coverageList = db.getPreviousCoverageData(date, null);
if (coverageList.size() > 0) {
if (coverageList.size() == 1) {
@@ -262,6 +298,19 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
String camera_allow = storeData.getCAMERA_ALLOW();
String adhoc;
if (coverageList.get(i).getFlag_from()!=null && coverageList.get(i).getFlag_from().equals(CommonString.FROM_DEVIATION)) {
adhoc = "1";
} else {
adhoc = "0";
}
String sub_reason_id = coverageList.get(i).getSub_reasonId();
if (sub_reason_id!=null && sub_reason_id.equals("")) {
sub_reason_id = "0";
}
String onXML = "[DATA]"
+ "[USER_DATA]"
+ "[STORE_CD]" + coverageList.get(i).getStoreId() + "[/STORE_CD]"
@@ -278,6 +327,8 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
+ "[REASON_REMARK]" + coverageList.get(i).getRemark() + "[/REASON_REMARK]"
+ "[CAMERA_ALLOWED]" + camera_allow + "[/CAMERA_ALLOWED]"
+ "[CHECKOUT_IMAGE]" + coverageList.get(i).getCheckOut_Image() + "[/CHECKOUT_IMAGE]"
+ "[ADHOC]" + adhoc + "[/ADHOC]"
+ "[SUBREASONID]" + sub_reason_id + "[/SUBREASONID]"
+ "[/USER_DATA]"
+ "[/DATA]";