Merge pull request #67 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/JioAC

Jio ac

GSKMTOrange/src/main/AndroidManifest.xml

@@ -49,12 +49,12 @@
             android:screenOrientation="portrait" />
         <activity
             android:name=".GeoTag.GeoTagStoreList"
-            android:label="@string/title_activity_store_list_geotag"
+            android:label="@string/title_activity_store_list"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".dailyentry.StoreListActivity"
-            android:label="@string/title_activity_store_list_geotag"
+            android:label="@string/title_activity_store_list"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar" />
         <activity

GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java

@@ -694,12 +694,25 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb
 
             } catch (SocketException ex) {
                 ex.printStackTrace();
+                Intent intent = new Intent(
+                        GeoTagActivity.this,
+                        GeoTagStoreList.class);
 
+                startActivity(intent);
+
+                GeoTagActivity.this.finish();
 
             } catch (Exception ex) {
 
 
                 ex.printStackTrace();
+                Intent intent = new Intent(
+                        GeoTagActivity.this,
+                        GeoTagStoreList.class);
+
+                startActivity(intent);
+
+                GeoTagActivity.this.finish();
             }
 
 
@@ -843,11 +856,29 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb
             catch (SocketException ex) {
 
                 ex.printStackTrace();
+
+                Intent intent = new Intent(
+                        GeoTagActivity.this,
+                        GeoTagStoreList.class);
+
+                startActivity(intent);
+
+                GeoTagActivity.this.finish();
+
             }
 
             catch (Exception ex) {
                 ex.printStackTrace();
 
+
+                Intent intent = new Intent(
+                        GeoTagActivity.this,
+                        GeoTagStoreList.class);
+
+                startActivity(intent);
+
+                GeoTagActivity.this.finish();
+
             }
 
             return "";
@@ -883,22 +914,37 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb
 
 
 
-                AlertMessage message = new AlertMessage(
+               /* AlertMessage message = new AlertMessage(
                         GeoTagActivity.this, getResources().getString(R.string.uploadeddata)
                         + result, getResources().getString(R.string.success), null);
-                message.showMessage();
+                message.showMessage();*/
 
+                Intent intent = new Intent(
+                        GeoTagActivity.this,
+                        GeoTagStoreList.class);
+
+                startActivity(intent);
+
+                GeoTagActivity.this.finish();
+
+            Toast.makeText(getApplicationContext(),getResources().getString(R.string.success),Toast.LENGTH_LONG).show();
 
             }
             else if(!result.equals(CommonString.KEY_SUCCESS))
             {
 
-                AlertMessage message = new AlertMessage(
+               /* AlertMessage message = new AlertMessage(
                         GeoTagActivity.this, AlertMessage.MESSAGE_DATA_NOT
                         + result, getResources().getString(R.string.failure), null);
-                message.showMessage();
+                message.showMessage();*/
+                Toast.makeText(getApplicationContext(),getResources().getString(R.string.failure),Toast.LENGTH_LONG).show();
+                Intent intent = new Intent(
+                        GeoTagActivity.this,
+                        GeoTagStoreList.class);
 
+                startActivity(intent);
 
+                GeoTagActivity.this.finish();
             }
 
 

GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java

@@ -435,7 +435,7 @@ public class NonWorkingReason extends AppCompatActivity implements
                         alert.show();
 
                     } else {
-                        Toast.makeText(getApplicationContext(), R.string.title_activity_select_dropdown,
+                        Toast.makeText(getApplicationContext(), R.string.pleaseenterRemarks,
                                 Toast.LENGTH_SHORT).show();
                     }
                 } else {

GSKMTOrange/src/main/java/cpm/com/gskmtorange/messgae/AlertMessage.java

@@ -58,7 +58,6 @@ public class AlertMessage {
          }
 
 
-
     }
 
     public void ShowAlert1(String str) {

GSKMTOrange/src/main/res/layout/nonworking.xml

@@ -92,7 +92,7 @@
             android:layout_above="@+id/reasontxt"
 
             android:paddingLeft="10dp"
-            android:text="Remark"
+            android:text="@string/Remark"
             android:textColor="@color/colorPrimary"
             android:textSize="18sp"
             android:textStyle="bold" />
@@ -120,7 +120,7 @@
             android:layout_height="40sp"
             android:layout_centerInParent="true"
             android:background="@color/colorPrimary"
-            android:text="SAVE"
+            android:text="@string/save"
             android:textColor="#ffffff"
             android:textSize="17sp" />
     </RelativeLayout>

GSKMTOrange/src/main/res/values-tr/string.xml

@@ -184,9 +184,19 @@
     <string name="uploadeddata">Veriler Paylaşılıyor ,</string>
     <string name="DataNot">Veriler Paylaşılmadı ,</string>
     <string name="delete">Sil</string>
-    <string name="adddatatoclick">Click Yes To Add Data</string>
+    <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="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="Remark">Remark</string>
+    <string name="pleaseenterRemarks">Please fill Remark</string>
+
+
     <!--Gagan start new code 2-->
     <string name="stock_facing_planogram_dialog_title">Örnek Fotoğraf</string>
     <string name="title_activity_settings">Ayarlar</string>

GSKMTOrange/src/main/res/values/strings.xml

@@ -50,7 +50,7 @@
     <string name="select_language">Please select language</string>
     <string name="title_activity_select_language">Select Language</string>
 
-    <string name="title_activity_store_list_geotag">Store List</string>
+    <string name="title_activity_store_list">Store List</string>
 
     <string name="title_activity_store_geotag">Geo Tag</string>
 
@@ -216,6 +216,8 @@
     <string name="DataNot"> Data Not Uploaded ,</string>
     <string name="displayname">Display Name</string>
     <string name="adddatatoclick">Click Yes To Add Data</string>
+    <string name="Remark">Remark</string>
+    <string name="pleaseenterRemarks">Please fill Remark</string>
 
     <string name="title_activity_service">Service</string>