newcode

2017-01-20 15:52:16 +05:30
parent 783a8ed103
commit fb0718e5e2
6 changed files with 27 additions and 13 deletions
@@ -41,7 +41,7 @@
    <ConfirmationsSetting value="0" id="Add" />
    <ConfirmationsSetting value="0" id="Remove" />
  </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" />
  </component>
  <component name="ProjectType">
@@ -15,6 +15,7 @@ import android.os.Environment;
 import android.preference.PreferenceManager;
 import android.support.design.widget.NavigationView;
 import android.support.design.widget.Snackbar;
+import android.support.v4.app.ActivityCompat;
 import android.support.v4.view.GravityCompat;
 import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.ActionBarDrawerToggle;
@@ -274,7 +275,9 @@ public class MainActivity extends AppCompatActivity

        } else if (id == R.id.nav_exit) {

-            finish();
+          //  finish();
+            ActivityCompat.finishAffinity(this);
+
            overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);

        } else if (id == R.id.nav_setting) {
@@ -1146,7 +1146,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
                    brand_id = brandList.get(position).getBRAND_ID().get(0);
                    brand_name = brandList.get(position).getBRAND().get(0);

-                    sku_list = db.getSkuT2PData("1", "1", "1", brand_id);
+                    sku_list = db.getSkuT2PData(store_type_id, class_id, key_account_id, brand_id);
                    SkuGetterSetter select = new SkuGetterSetter();
                    select.setSKU(getResources().getString(R.string.select));
                    sku_list.add(0, select);
@@ -29,6 +29,7 @@ import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.StringReader;
+import java.net.MalformedURLException;
 import java.util.ArrayList;
 import java.util.Locale;

@@ -76,6 +77,7 @@ public class UploadActivity extends AppCompatActivity {
    private FailureGetterSetter failureGetterSetter = null;
    private SharedPreferences preferences;
    private int factor, k = 0;
+    Object result = "";

    @Override
    protected void onCreate(Bundle savedInstanceState) {
@@ -148,7 +150,7 @@ public class UploadActivity extends AppCompatActivity {
        HttpTransportSE androidHttpTransport = new HttpTransportSE(CommonString.URL);
        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_FALSE)) {
@@ -269,7 +271,7 @@ public class UploadActivity extends AppCompatActivity {
                            HttpTransportSE androidHttpTransport = new HttpTransportSE(CommonString.URL);
                            androidHttpTransport.call(CommonString.SOAP_ACTION_UPLOAD_STORE_COVERAGE, envelope);

-                            Object result = envelope.getResponse();
+                            result = envelope.getResponse();

                            datacheck = result.toString();
                            words = datacheck.split("\\;");
@@ -1028,13 +1030,19 @@ public class UploadActivity extends AppCompatActivity {
                        }
                    }
                }
+
+
+            } catch (MalformedURLException e) {
+                e.printStackTrace();
            } catch (IOException e) {
                e.printStackTrace();
            } catch (XmlPullParserException e) {
                e.printStackTrace();
+            }catch (Exception e) {
+                e.printStackTrace();
            }

-            return "";
+            return result.toString();
        }

        @Override
@@ -1042,12 +1050,15 @@ public class UploadActivity extends AppCompatActivity {
            super.onPostExecute(result);

            dialog.dismiss();
-            db.deleteAllTables();
-            if (result.equals("")) {

+            if (result.contains(CommonString.KEY_SUCCESS)) {
+                db.deleteAllTables();
                showAlert(getString(R.string.menu_upload_data));

+            } else {
+                showAlert(getString(R.string.error) + result.toString());
            }
+
        }
    }

@@ -166,12 +166,12 @@
    <string name="adddatatoclick">Veri Eklemek İçin Evet tıklayın</string>
    <string name="displayname">Teşhir Türü</string>

-    <string name="storefront">Click Store Front Image</string>
-    <string name="brandname">Brand Name</string>
-    <string name="skuname">SKU Name</string>
+    <string name="storefront">Mağaza girişinin fotoğrafını çekiniz</string>
+    <string name="brandname">Marka</string>
+    <string name="skuname">Ürünler</string>
    <string name="quantity">Teşhir Sayısı</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="pleaseenterRemarks">Please fill Remark</string>

@@ -225,5 +225,5 @@
    <string name="export_database">Export Database</string>
    <string name="data_exported_successfully">Database Exported Successfully</string>
    <string name="previous_data_upload">Please Upload Previous Data First</string>
-
+    <string name="error">error</string>
 </resources>