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

Merge pull request #100 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/ysy_upload_updated

Browse Source 
Ysy upload updated
This commit is contained in:
YadavendraSinghYaduvanshi
2017-01-25 10:52:06 +05:30
committed by GitHub
parent 38753c7128 16bdac6be1
commit b7356ecf50
9 changed files with 43 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/misc.xml
Generated
+1 -1
View File
@@ -41,7 +41,7 @@
<ConfirmationsSetting value="0" id="Add" /> <ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" /> <ConfirmationsSetting value="0" id="Remove" />
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" 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
+2 -2
View File
@@ -14,8 +14,8 @@ android {
applicationId "cpm.com.gskmtorange" applicationId "cpm.com.gskmtorange"
minSdkVersion 15 minSdkVersion 15
targetSdkVersion 22 targetSdkVersion 22
versionCode 1 versionCode 2
versionName "1.0" versionName "1.1"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
} }
buildTypes { buildTypes {
GSKMTOrange/src/main/AndroidManifest.xml
+1
View File
@@ -150,6 +150,7 @@
android:name=".upload.UploadActivity" android:name=".upload.UploadActivity"
android:configChanges="screenSize|orientation|keyboardHidden" android:configChanges="screenSize|orientation|keyboardHidden"
android:label="@string/title_activity_upload" android:label="@string/title_activity_upload"
android:theme="@style/AppTheme.NoActionBar"
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<activity <activity
android:name=".dailyentry.SettingsActivity" android:name=".dailyentry.SettingsActivity"
GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
+4 -2
View File
@@ -84,8 +84,6 @@ public class MainActivity extends AppCompatActivity
db = new GSKOrangeDB(MainActivity.this); db = new GSKOrangeDB(MainActivity.this);
db.open(); db.open();
coverageList = db.getCoverageData(date);
webView.setWebViewClient(new MyWebViewClient()); webView.setWebViewClient(new MyWebViewClient());
webView.getSettings().setJavaScriptEnabled(true); webView.getSettings().setJavaScriptEnabled(true);
@@ -128,6 +126,10 @@ public class MainActivity extends AppCompatActivity
@Override @Override
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();
db.open();
coverageList = db.getCoverageData(date);
preferences = PreferenceManager.getDefaultSharedPreferences(this); preferences = PreferenceManager.getDefaultSharedPreferences(this);
updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, "")); updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
toolbar.setTitle(getString(R.string.main_menu_activity_name)); toolbar.setTitle(getString(R.string.main_menu_activity_name));
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CheckoutActivity.java
+1 -1
View File
@@ -105,7 +105,7 @@ public class CheckoutActivity extends AppCompatActivity {
dialog = new Dialog(context); dialog = new Dialog(context);
dialog.setContentView(R.layout.custom); dialog.setContentView(R.layout.custom);
dialog.setTitle("Sending Checkout Data"); dialog.setTitle(getString(R.string.title_activity_checkout));
dialog.setCancelable(false); dialog.setCancelable(false);
dialog.show(); dialog.show();
pb = (ProgressBar) dialog.findViewById(R.id.progressBar1); pb = (ProgressBar) dialog.findViewById(R.id.progressBar1);
GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java
+1 -2
View File
@@ -247,8 +247,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
+ "[APP_VERSION]" + app_version + "[/APP_VERSION]" + "[APP_VERSION]" + app_version + "[/APP_VERSION]"
+ "[LONGITUDE]" + coverageList.get(i).getLongitude() + "[/LONGITUDE]" + "[LONGITUDE]" + coverageList.get(i).getLongitude() + "[/LONGITUDE]"
+ "[IN_TIME]" + coverageList.get(i).getInTime() + "[/IN_TIME]" + "[IN_TIME]" + coverageList.get(i).getInTime() + "[/IN_TIME]"
//+ "[OUT_TIME]" + coverageList.get(i).getOutTime() + "[/OUT_TIME]" + "[OUT_TIME]" + coverageList.get(i).getOutTime() + "[/OUT_TIME]"
+ "[OUT_TIME]" + "00:00" + "[/OUT_TIME]"
+ "[UPLOAD_STATUS]" + "N" + "[/UPLOAD_STATUS]" + "[UPLOAD_STATUS]" + "N" + "[/UPLOAD_STATUS]"
+ "[USER_ID]" + userId + "[/USER_ID]" + "[USER_ID]" + userId + "[/USER_ID]"
+ "[IMAGE_URL]" + coverageList.get(i).getImage() + "[/IMAGE_URL]" + "[IMAGE_URL]" + coverageList.get(i).getImage() + "[/IMAGE_URL]"
GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java
+14 -11
View File
@@ -13,6 +13,7 @@ import android.os.AsyncTask;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.support.v7.app.AppCompatActivity; import android.support.v7.app.AppCompatActivity;
import android.os.Bundle; import android.os.Bundle;
import android.support.v7.widget.Toolbar;
import android.view.WindowManager; import android.view.WindowManager;
import android.widget.ProgressBar; import android.widget.ProgressBar;
import android.widget.TextView; import android.widget.TextView;
@@ -79,10 +80,13 @@ public class UploadActivity extends AppCompatActivity {
private int factor, k = 0; private int factor, k = 0;
Object result = ""; Object result = "";
Toolbar toolbar;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_upload); setContentView(R.layout.activity_main);
toolbar = (Toolbar) findViewById(R.id.toolbar);
getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
@@ -199,7 +203,7 @@ public class UploadActivity extends AppCompatActivity {
super.onPreExecute(); super.onPreExecute();
dialog = new Dialog(context); dialog = new Dialog(context);
dialog.setContentView(R.layout.custom); dialog.setContentView(R.layout.custom);
dialog.setTitle("Uploading Data"); dialog.setTitle(getString(R.string.uploaddata));
dialog.setCancelable(false); dialog.setCancelable(false);
dialog.show(); dialog.show();
@@ -250,8 +254,7 @@ public class UploadActivity extends AppCompatActivity {
+ "[APP_VERSION]" + app_version + "[/APP_VERSION]" + "[APP_VERSION]" + app_version + "[/APP_VERSION]"
+ "[LONGITUDE]" + coverageList.get(i).getLongitude() + "[/LONGITUDE]" + "[LONGITUDE]" + coverageList.get(i).getLongitude() + "[/LONGITUDE]"
+ "[IN_TIME]" + coverageList.get(i).getInTime() + "[/IN_TIME]" + "[IN_TIME]" + coverageList.get(i).getInTime() + "[/IN_TIME]"
//+ "[OUT_TIME]" + coverageList.get(i).getOutTime() + "[/OUT_TIME]" + "[OUT_TIME]" + coverageList.get(i).getOutTime() + "[/OUT_TIME]"
+ "[OUT_TIME]" + "00:00" + "[/OUT_TIME]"
+ "[UPLOAD_STATUS]" + "N" + "[/UPLOAD_STATUS]" + "[UPLOAD_STATUS]" + "N" + "[/UPLOAD_STATUS]"
+ "[USER_ID]" + userId + "[/USER_ID]" + "[USER_ID]" + userId + "[/USER_ID]"
+ "[IMAGE_URL]" + coverageList.get(i).getImage() + "[/IMAGE_URL]" + "[IMAGE_URL]" + coverageList.get(i).getImage() + "[/IMAGE_URL]"
@@ -342,7 +345,7 @@ public class UploadActivity extends AppCompatActivity {
} }
} }
data.value = 10; data.value = 10;
data.name = "MSL_Availability Uploading"; data.name = getString(R.string.availability_data_uploading);
publishProgress(data); publishProgress(data);
@@ -467,7 +470,7 @@ public class UploadActivity extends AppCompatActivity {
} }
} }
data.value = 20; data.value = 20;
data.name = "Stock Facing Uploading"; data.name = getString(R.string.stock_data_uploading);
publishProgress(data); publishProgress(data);
@@ -526,7 +529,7 @@ public class UploadActivity extends AppCompatActivity {
} }
} }
data.value = 30; data.value = 30;
data.name = "Promotion Data Uploading"; data.name = getString(R.string.promo_data_uploading);
publishProgress(data); publishProgress(data);
@@ -585,7 +588,7 @@ public class UploadActivity extends AppCompatActivity {
} }
} }
data.value = 35; data.value = 35;
data.name = "Additional Promotion Data Uploading"; data.name = getString(R.string.additional_data_uploading);
publishProgress(data); publishProgress(data);
@@ -700,9 +703,8 @@ public class UploadActivity extends AppCompatActivity {
} }
} }
data.value = 35; data.value = 35;
data.name = "Additional Visibility Data"; data.name = getString(R.string.additional_data_uploading);
publishProgress(data); publishProgress(data);
/////ashish close /////ashish close
@@ -845,7 +847,7 @@ public class UploadActivity extends AppCompatActivity {
} }
data.value = 40; data.value = 40;
data.name = "T2P Data Uploading"; data.name = getString(R.string.t2p_data_uploading);
publishProgress(data); publishProgress(data);
//Image Upload //Image Upload
@@ -1069,6 +1071,7 @@ public class UploadActivity extends AppCompatActivity {
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();
updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, "")); updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
toolbar.setTitle(getString(R.string.title_activity_upload));
} }
GSKMTOrange/src/main/res/values-tr/string.xml
+10
View File
@@ -216,6 +216,16 @@
<string name="select_promo">Seçiniz</string> <string name="select_promo">Seçiniz</string>
<!--Gagan end code 3--> <!--Gagan end code 3-->
//text for uploading screen
<string name="coverage_data_uploading">Kapsam yükleniyor</string>
<string name="availability_data_uploading">Bulunurluk verisi paylaşılıyor</string>
<string name="stock_data_uploading">Stok verisi paylaşılıyor</string>
<string name="t2p_data_uploading">Kalıcı teşhir verisi paylaşılıyor</string>
<string name="additional_data_uploading">Ek teşhir verisi paylaşılıyor</string>
<string name="promo_data_uploading">Promosyon verisi paylaşılıyor</string>
<string name="no_data_for_upload">Yükleme İçin Veri Yok</string>
<string name="title_activity_checkout">Çıkış yapmak</string>
</resources> </resources>
GSKMTOrange/src/main/res/values/strings.xml
+9 -1
View File
@@ -209,7 +209,7 @@
<!-- TODO: Remove or change this placeholder text --> <!-- TODO: Remove or change this placeholder text -->
<string name="hello_blank_fragment">Hello blank fragment</string> <string name="hello_blank_fragment">Hello blank fragment</string>
<string name="title_activity_checkout">CheckoutActivity</string> <string name="title_activity_checkout">Checkout Activity</string>
<string name="checkout_successful">Checkout Success</string> <string name="checkout_successful">Checkout Success</string>
<string name="NetworkError">Network Error ,</string> <string name="NetworkError">Network Error ,</string>
@@ -251,5 +251,13 @@
<string name="select_promo">Select</string> <string name="select_promo">Select</string>
<!--Gagan end code 3--> <!--Gagan end code 3-->
//text for uploading screen
<string name="coverage_data_uploading">Coverage Uploading</string>
<string name="availability_data_uploading">Availability Data Uploading</string>
<string name="stock_data_uploading">Stock Data Uploading</string>
<string name="t2p_data_uploading">T2P Data Uploading</string>
<string name="additional_data_uploading">Additional Visibility Data Uploading</string>
<string name="promo_data_uploading">Promo Data Uploading</string>
</resources> </resources>