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

Merge pull request #80 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/newfileCha

Browse Source 
Newfile cha
This commit is contained in:
YadavendraSinghYaduvanshi
2017-01-20 16:51:32 +05:30
committed by GitHub
parent c13afe8b50 648a3c21d2
commit aebebbf14c
9 changed files with 60 additions and 44 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_7" 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_8" 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/src/main/java/cpm/com/gskmtorange/MainActivity.java
+4 -1
View File
@@ -15,6 +15,7 @@ import android.os.Environment;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.support.design.widget.NavigationView; import android.support.design.widget.NavigationView;
import android.support.design.widget.Snackbar; import android.support.design.widget.Snackbar;
import android.support.v4.app.ActivityCompat;
import android.support.v4.view.GravityCompat; import android.support.v4.view.GravityCompat;
import android.support.v4.widget.DrawerLayout; import android.support.v4.widget.DrawerLayout;
import android.support.v7.app.ActionBarDrawerToggle; import android.support.v7.app.ActionBarDrawerToggle;
@@ -274,7 +275,9 @@ public class MainActivity extends AppCompatActivity
} else if (id == R.id.nav_exit) { } else if (id == R.id.nav_exit) {
finish(); // finish();
ActivityCompat.finishAffinity(this);
overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out); overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
} else if (id == R.id.nav_setting) { } else if (id == R.id.nav_setting) {
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java
+16 -16
View File
@@ -301,10 +301,10 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder( AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(
AdditionalVisibility.this); AdditionalVisibility.this);
// set title // set title
alertDialogBuilder.setTitle(getResources().getString(R.string.title_activity_Want_save)); alertDialogBuilder.setTitle(getResources().getString(R.string.dialog_title));
// set dialog message // set dialog message
alertDialogBuilder alertDialogBuilder
.setMessage(getResources().getString(R.string.title_activity_save_data)) .setMessage(getResources().getString(R.string.title_activity_Want_save))
.setCancelable(false) .setCancelable(false)
.setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { .setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) { public void onClick(DialogInterface dialog, int id) {
@@ -355,10 +355,10 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder( AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(
AdditionalVisibility.this); AdditionalVisibility.this);
// set title // set title
alertDialogBuilder.setTitle(getResources().getString(R.string.title_activity_Want_save)); alertDialogBuilder.setTitle(getResources().getString(R.string.dialog_title));
// set dialog message // set dialog message
alertDialogBuilder alertDialogBuilder
.setMessage(getResources().getString(R.string.title_activity_save_data)) .setMessage(getResources().getString(R.string.title_activity_Want_save))
.setCancelable(false) .setCancelable(false)
.setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { .setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) { public void onClick(DialogInterface dialog, int id) {
@@ -419,10 +419,10 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder( AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(
AdditionalVisibility.this); AdditionalVisibility.this);
// set title // set title
alertDialogBuilder.setTitle(getResources().getString(R.string.title_activity_Want_to_add)); alertDialogBuilder.setTitle(getResources().getString(R.string.dialog_title));
// set dialog message // set dialog message
alertDialogBuilder alertDialogBuilder
.setMessage(getResources().getString(R.string.adddatatoclick)) .setMessage(getResources().getString(R.string.title_activity_Want_to_add))
.setCancelable(false) .setCancelable(false)
.setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { .setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) { public void onClick(DialogInterface dialog, int id) {
@@ -501,10 +501,10 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder( AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(
AdditionalVisibility.this); AdditionalVisibility.this);
// set title // set title
alertDialogBuilder.setTitle(getResources().getString(R.string.title_activity_Want_to_delete)); alertDialogBuilder.setTitle(getResources().getString(R.string.dialog_title));
// set dialog message // set dialog message
alertDialogBuilder alertDialogBuilder
.setMessage(getResources().getString(R.string.title_activity_click_delete)) .setMessage(getResources().getString(R.string.data_will_be_lost))
.setCancelable(false) .setCancelable(false)
.setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { .setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) { public void onClick(DialogInterface dialog, int id) {
@@ -550,10 +550,10 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder( AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(
AdditionalVisibility.this); AdditionalVisibility.this);
// set title // set title
alertDialogBuilder.setTitle(getResources().getString(R.string.title_activity_Want_to_delete)); alertDialogBuilder.setTitle(getResources().getString(R.string.dialog_title));
// set dialog message // set dialog message
alertDialogBuilder alertDialogBuilder
.setMessage(getResources().getString(R.string.title_activity_click_delete)) .setMessage(getResources().getString(R.string.data_will_be_lost))
.setCancelable(false) .setCancelable(false)
.setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { .setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) { public void onClick(DialogInterface dialog, int id) {
@@ -612,11 +612,11 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder( AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(
AdditionalVisibility.this); AdditionalVisibility.this);
// set title // set title
alertDialogBuilder.setTitle(getResources().getString(R.string.title_activity_Want_to_delete)); alertDialogBuilder.setTitle(getResources().getString(R.string.dialog_title));
// set dialog message // set dialog message
alertDialogBuilder alertDialogBuilder
.setMessage(getResources().getString(R.string.title_activity_click_delete)) .setMessage(getResources().getString(R.string.data_will_be_lost))
.setCancelable(false) .setCancelable(false)
.setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { .setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) { public void onClick(DialogInterface dialog, int id) {
@@ -1290,11 +1290,11 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
AdditionalVisibility.this); AdditionalVisibility.this);
// set title // set title
alertDialogBuilder.setTitle(getResources().getString(R.string.title_activity_Want_to_delete1)); alertDialogBuilder.setTitle(getResources().getString(R.string.dialog_title));
// set dialog message // set dialog message
alertDialogBuilder alertDialogBuilder
.setMessage(getResources().getString(R.string.title_activity_click_delete)) .setMessage(getResources().getString(R.string.data_will_be_lost))
.setCancelable(false) .setCancelable(false)
.setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { .setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) { public void onClick(DialogInterface dialog, int id) {
@@ -1420,11 +1420,11 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
AdditionalVisibility.this); AdditionalVisibility.this);
// set title // set title
alertDialogBuilder.setTitle(getResources().getString(R.string.title_activity_Want_to_delete1)); alertDialogBuilder.setTitle(getResources().getString(R.string.dialog_title));
// set dialog message // set dialog message
alertDialogBuilder alertDialogBuilder
.setMessage(getResources().getString(R.string.title_activity_click_delete)) .setMessage(getResources().getString(R.string.data_will_be_lost))
.setCancelable(false) .setCancelable(false)
.setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { .setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) { public void onClick(DialogInterface dialog, int id) {
GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java
+18 -6
View File
@@ -29,6 +29,7 @@ import java.io.ByteArrayOutputStream;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.StringReader; import java.io.StringReader;
import java.net.MalformedURLException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Locale; import java.util.Locale;
@@ -76,6 +77,7 @@ public class UploadActivity extends AppCompatActivity {
private FailureGetterSetter failureGetterSetter = null; private FailureGetterSetter failureGetterSetter = null;
private SharedPreferences preferences; private SharedPreferences preferences;
private int factor, k = 0; private int factor, k = 0;
Object result = "";
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
@@ -148,7 +150,7 @@ public class UploadActivity extends AppCompatActivity {
HttpTransportSE androidHttpTransport = new HttpTransportSE(CommonString.URL); HttpTransportSE androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UPLOAD_IMAGE, envelope); androidHttpTransport.call(CommonString.SOAP_ACTION_UPLOAD_IMAGE, envelope);
Object result = envelope.getResponse(); result = envelope.getResponse();
if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
if (result.toString().equalsIgnoreCase(CommonString.KEY_FALSE)) { if (result.toString().equalsIgnoreCase(CommonString.KEY_FALSE)) {
@@ -269,7 +271,7 @@ public class UploadActivity extends AppCompatActivity {
HttpTransportSE androidHttpTransport = new HttpTransportSE(CommonString.URL); HttpTransportSE androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UPLOAD_STORE_COVERAGE, envelope); androidHttpTransport.call(CommonString.SOAP_ACTION_UPLOAD_STORE_COVERAGE, envelope);
Object result = envelope.getResponse(); result = envelope.getResponse();
datacheck = result.toString(); datacheck = result.toString();
words = datacheck.split("\\;"); words = datacheck.split("\\;");
@@ -1028,13 +1030,19 @@ public class UploadActivity extends AppCompatActivity {
} }
} }
} }
} catch (MalformedURLException e) {
e.printStackTrace();
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} catch (XmlPullParserException e) { } catch (XmlPullParserException e) {
e.printStackTrace(); e.printStackTrace();
}catch (Exception e) {
e.printStackTrace();
} }
return ""; return result.toString();
} }
@Override @Override
@@ -1042,13 +1050,17 @@ public class UploadActivity extends AppCompatActivity {
super.onPostExecute(result); super.onPostExecute(result);
dialog.dismiss(); dialog.dismiss();
db.deleteAllTables();
showAlert(getString(R.string.menu_upload_data)); if (result.contains(CommonString.KEY_SUCCESS)) {
if (result.equals("")) { db.deleteAllTables();
showAlert(getString(R.string.menu_upload_data));
//showAlert(getString(R.string.menu_upload_data)); //showAlert(getString(R.string.menu_upload_data));
} else {
showAlert(getString(R.string.error) + result.toString());
} }
} }
} }
GSKMTOrange/src/main/res/layout/activity_geo_tag.xml
+2 -2
View File
@@ -30,7 +30,7 @@
android:layout_gravity="bottom|end" android:layout_gravity="bottom|end"
android:layout_margin="@dimen/fab_margin" android:layout_margin="@dimen/fab_margin"
app:srcCompat="@android:drawable/ic_menu_save" app:srcCompat="@android:drawable/ic_menu_save"
app:backgroundTint="@color/colorPrimary" app:backgroundTint="@color/colorAccent"
/> />
<android.support.design.widget.FloatingActionButton <android.support.design.widget.FloatingActionButton
@@ -40,7 +40,7 @@
android:layout_gravity="bottom|left" android:layout_gravity="bottom|left"
android:layout_margin="@dimen/fab_margin" android:layout_margin="@dimen/fab_margin"
android:src="@android:drawable/ic_menu_camera" android:src="@android:drawable/ic_menu_camera"
app:backgroundTint="@color/colorPrimary" app:backgroundTint="@color/colorAccent"
/> />
</android.support.design.widget.CoordinatorLayout> </android.support.design.widget.CoordinatorLayout>
GSKMTOrange/src/main/res/layout/additionalvisibilitylayout.xml
+1 -1
View File
@@ -16,7 +16,7 @@
android:layout_gravity="bottom|end" android:layout_gravity="bottom|end"
android:layout_margin="@dimen/fab_margin" android:layout_margin="@dimen/fab_margin"
app:srcCompat="@android:drawable/ic_menu_save" app:srcCompat="@android:drawable/ic_menu_save"
app:backgroundTint="@color/colorPrimary" app:backgroundTint="@color/colorAccent"
/> />
GSKMTOrange/src/main/res/values-tr/string.xml
+15 -14
View File
@@ -21,9 +21,9 @@
//changes after //changes after
<string name="title_geo_tag_activity_upload_data">Store Uploaded</string> <string name="title_geo_tag_activity_upload_data">Mağaza Verileri Paylaşıldı</string>
<string name="title_geo_tag_activity_geo_data">Store Geo Data Uploaded</string> <string name="title_geo_tag_activity_geo_data">Store Geotag Data Shared</string>
<string name="title_geo_tag_activity_geo_already_done">Store Already Geotagged</string> <string name="title_geo_tag_activity_geo_already_done">Mağaza Zaten Coğrafi Etiketlendi</string>
<string name="main_menu_activity_name">GSK Turuncu Mağaza</string> <string name="main_menu_activity_name">GSK Turuncu Mağaza</string>
<string name="save">Sakla</string> <string name="save">Sakla</string>
@@ -78,7 +78,7 @@
<string name="stock_facing_reference_image">Örnek Fotoğraf</string> <string name="stock_facing_reference_image">Örnek Fotoğraf</string>
<string name="stock_facing_sku_name">Ürün Adı</string> <string name="stock_facing_sku_name">Ürün Adı</string>
<string name="stock_facing_stock">Stock</string> <!--change string--> <string name="stock_facing_stock">Stok</string> <!--change string-->
<string name="stock_facing_faceup">Önyüz</string> <string name="stock_facing_faceup">Önyüz</string>
<string name="stock_facing_sos_target">Raf Payı Hedefi</string> <string name="stock_facing_sos_target">Raf Payı Hedefi</string>
<string name="stock_facing_sos">Raf Payi</string> <string name="stock_facing_sos">Raf Payi</string>
@@ -110,7 +110,7 @@
<string name="title_activity_store_wise_performance">Mağaza Performansı</string> <string name="title_activity_store_wise_performance">Mağaza Performansı</string>
<!--Gagan end new code 1--> <!--Gagan end new code 1-->
<string name="stock">Stock</string> <string name="stock">Stok</string>
<string name="AdditionalDisplay">Ek Teşhir</string> <string name="AdditionalDisplay">Ek Teşhir</string>
<string name="Display">Teşhir Türü</string> <string name="Display">Teşhir Türü</string>
<string name="Photo">Fotoğraf</string> <string name="Photo">Fotoğraf</string>
@@ -125,7 +125,7 @@
<string name="store"> Mağazalar</string> <string name="store"> Mağazalar</string>
<string name="title_activity_Want_to_delete1"> Verileri silmek istiyor musun</string> <string name="title_activity_Want_to_delete1"> Verileri silmek istiyor musun</string>
<string name="title_activity_click_delete">Silme için Evet tıklayın</string> <string name="title_activity_click_delete">Silme için Evet tıklayın</string>
<string name="title_activity_select_dropdown">Please Select dropdown</string> <string name="title_activity_select_dropdown">Tüm alanlari doldurunuz</string>
<string name="export_database">Veritabanı Aktar</string> <string name="export_database">Veritabanı Aktar</string>
<string name="title_activity_service">Servisler</string> <string name="title_activity_service">Servisler</string>
@@ -156,7 +156,7 @@
<string name="title_store_list_activity_store_already_done">Paylaşılan mağaza</string> <string name="title_store_list_activity_store_already_done">Paylaşılan mağaza</string>
<string name="title_store_list_activity_store_data_uploaded">Paylaşılan mağaza</string> <string name="title_store_list_activity_store_data_uploaded">Paylaşılan mağaza</string>
<string name="title_store_list_activity_store_already_checkout">Mağaza zaten çıkılmış</string> <string name="title_store_list_activity_store_already_checkout">Mağaza zaten çıkılmış</string>
<string name="title_store_list_activity_store_again_uploaded">Please Store data again Uploaded</string> <string name="title_store_list_activity_store_again_uploaded">Lütfen Mağaza Verilerini tekrar paylaşın</string>
<string name="title_store_list_checkout_current">Lütfen önce mağazadan çık</string> <string name="title_store_list_checkout_current">Lütfen önce mağazadan çık</string>
<string name="title_store_list_checkout_Already_filled">Doldurulmuş veriler</string> <string name="title_store_list_checkout_Already_filled">Doldurulmuş veriler</string>
<string name="NetworkError">Bağlantı kurulamıyor</string> <string name="NetworkError">Bağlantı kurulamıyor</string>
@@ -166,14 +166,14 @@
<string name="adddatatoclick">Veri Eklemek İçin Evet tıklayın</string> <string name="adddatatoclick">Veri Eklemek İçin Evet tıklayın</string>
<string name="displayname">Teşhir Türü</string> <string name="displayname">Teşhir Türü</string>
<string name="storefront">Click Store Front Image</string> <string name="storefront">Mağaza girişinin fotoğrafını çekiniz</string>
<string name="brandname">Brand Name</string> <string name="brandname">Marka</string>
<string name="skuname">SKU Name</string> <string name="skuname">Ürünler</string>
<string name="quantity">Teşhir Sayısı</string> <string name="quantity">Teşhir Sayısı</string>
<string name="title_activity_store_geotag">Coğrafi Konum</string> <string name="title_activity_store_geotag">Coğrafi Konum</string>
<string name="title_activity_store_list">Store List</string> <string name="title_activity_store_list">Mağazalar</string>
<string name="Remark">Remark</string> <string name="Remark">Yorum</string>
<string name="pleaseenterRemarks">Please fill Remark</string> <string name="pleaseenterRemarks">Lütfen Yorum doldurun</string>
<!--Gagan start new code 2--> <!--Gagan start new code 2-->
@@ -190,7 +190,8 @@
<!--Gagan end new code 2--> <!--Gagan end new code 2-->
<string name="previous_data_upload">Lütfen Önceki Verileri Paylaşın</string> <string name="previous_data_upload">Lütfen Önceki Verileri Paylaşın</string>
<string name="error">Hata! paylaşılıyor</string>
<string name="data_will_be_lost">Veri kaydedilmedi. İlerlemek</string>
</resources> </resources>
GSKMTOrange/src/main/res/values/dimens.xml
+1 -1
View File
@@ -12,7 +12,7 @@
<dimen name="text_size_normal">20sp</dimen> <dimen name="text_size_normal">20sp</dimen>
<dimen name="text_size_small">16sp</dimen> <dimen name="text_size_small">16sp</dimen>
<dimen name="store_entry_text_size">20sp</dimen> <dimen name="store_entry_text_size">15sp</dimen>
<dimen name="text_size_xsmall">12sp</dimen> <dimen name="text_size_xsmall">12sp</dimen>
GSKMTOrange/src/main/res/values/strings.xml
+2 -2
View File
@@ -165,7 +165,7 @@
<string name="clickimage">Please click the image</string> <string name="clickimage">Please click the image</string>
<string name="gps">GPS IS DISABLED...</string> <string name="gps">GPS IS DISABLED...</string>
<string name="gpsebale">Click ok to enable GPS.</string> <string name="gpsebale">Click ok to enable GPS.</string>
<string name="takeimage"> Please Take Image Before Save</string> <string name="takeimage"> Please Take Image</string>
<string name="notsuppoted">This device is not supported.</string> <string name="notsuppoted">This device is not supported.</string>
<string name="uploaddata">Uploading Data</string> <string name="uploaddata">Uploading Data</string>
<string name="geotagdata">Uploading Geotag Data...</string> <string name="geotagdata">Uploading Geotag Data...</string>
@@ -228,5 +228,5 @@
<string name="uploadeddata">Uploaded Data</string> <string name="uploadeddata">Uploaded Data</string>
<string name="previous_data_upload">Please Upload Previous Data First</string> <string name="previous_data_upload">Please Upload Previous Data First</string>
<string name="error">Error Uploading</string>
</resources> </resources>