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

Merge pull request #28 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GG_Login_checkout_geotag

Browse Source 
Gg login checkout geotag
This commit is contained in:
YadavendraSinghYaduvanshi
2017-02-27 14:18:27 +05:30
committed by GitHub
parent a6b35dffdf a6dbcef607
commit 659f3a53d5
6 changed files with 113 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java
+30 -3
View File
@@ -430,18 +430,45 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb
stopLocationUpdates();
}
public String getCurrentTime() {
/*public String getCurrentTime() {
Calendar m_cal = Calendar.getInstance();
SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss:mmm");
String cdate = formatter.format(m_cal.getTime());
/* String intime = m_cal.get(Calendar.HOUR_OF_DAY) + ":"
+ m_cal.get(Calendar.MINUTE) + ":" + m_cal.get(Calendar.SECOND);*/
*//* String intime = m_cal.get(Calendar.HOUR_OF_DAY) + ":"
+ m_cal.get(Calendar.MINUTE) + ":" + m_cal.get(Calendar.SECOND);*//*
return cdate;
}*/
private static String arabicToenglish(String number) {
char[] chars = new char[number.length()];
for (int i = 0; i < number.length(); i++) {
char ch = number.charAt(i);
if (ch >= 0x0660 && ch <= 0x0669)
ch -= 0x0660 - '0';
else if (ch >= 0x06f0 && ch <= 0x06F9)
ch -= 0x06f0 - '0';
chars[i] = ch;
}
return new String(chars);
}
public String getCurrentTime() {
Calendar m_cal = Calendar.getInstance();
SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss:mmm");
String cdate = formatter.format(m_cal.getTime());
if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) {
cdate = arabicToenglish(cdate);
}
return cdate;
}
protected void startCameraActivity() {
GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java
+26 -5
View File
@@ -127,7 +127,7 @@ public class LoginActivity extends AppCompatActivity {
e.printStackTrace();
}
tv_version.setText("Version/Versiyon - " + app_ver);
tv_version.setText("Version/Versiyon - " + app_ver+"T");
preferences = PreferenceManager.getDefaultSharedPreferences(this);
editor = preferences.edit();
@@ -673,19 +673,40 @@ public class LoginActivity extends AppCompatActivity {
alert.show();
}
public String getCurrentTime() {
/*public String getCurrentTime() {
Calendar m_cal = Calendar.getInstance();
SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss");
String intime = formatter.format(m_cal.getTime());
/* String intime = m_cal.get(Calendar.HOUR_OF_DAY) + ":"
+ m_cal.get(Calendar.MINUTE) + ":" + m_cal.get(Calendar.SECOND);*/
return intime;
}*/
private static String arabicToenglish(String number) {
char[] chars = new char[number.length()];
for (int i = 0; i < number.length(); i++) {
char ch = number.charAt(i);
if (ch >= 0x0660 && ch <= 0x0669)
ch -= 0x0660 - '0';
else if (ch >= 0x06f0 && ch <= 0x06F9)
ch -= 0x06f0 - '0';
chars[i] = ch;
}
return new String(chars);
}
public String getCurrentTime() {
Calendar m_cal = Calendar.getInstance();
SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss");
String cdate = formatter.format(m_cal.getTime());
if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) {
cdate = arabicToenglish(cdate);
}
return cdate;
}
private static boolean updateResources(Context context, String language) {
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CheckoutActivity.java
+26 -2
View File
@@ -354,14 +354,38 @@ public class CheckoutActivity extends AppCompatActivity {
return true;
}
/*public String getCurrentTime() {
Calendar m_cal = Calendar.getInstance();
SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss:mmm");
String cdate = formatter.format(m_cal.getTime());
return cdate;
}*/
private static String arabicToenglish(String number) {
char[] chars = new char[number.length()];
for (int i = 0; i < number.length(); i++) {
char ch = number.charAt(i);
if (ch >= 0x0660 && ch <= 0x0669)
ch -= 0x0660 - '0';
else if (ch >= 0x06f0 && ch <= 0x06F9)
ch -= 0x06f0 - '0';
chars[i] = ch;
}
return new String(chars);
}
public String getCurrentTime() {
Calendar m_cal = Calendar.getInstance();
SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss:mmm");
String cdate = formatter.format(m_cal.getTime());
/* String intime = m_cal.get(Calendar.HOUR_OF_DAY) + ":"
+ m_cal.get(Calendar.MINUTE) + ":" + m_cal.get(Calendar.SECOND);*/
if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) {
cdate = arabicToenglish(cdate);
}
return cdate;
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StockFacing_PlanogramTrackerActivity.java
-1
View File
@@ -320,7 +320,6 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity {
AlertDialog alert = builder.create();
alert.show();
}
}
});
GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java
+28 -3
View File
@@ -1124,12 +1124,37 @@ public class Stock_FacingActivity extends AppCompatActivity {
super.onActivityResult(requestCode, resultCode, data);
}
public String getCurrentTime() {
/*public String getCurrentTime() {
Calendar m_cal = Calendar.getInstance();
SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss");
String cdate = formatter.format(m_cal.getTime());
/* String intime = m_cal.get(Calendar.HOUR_OF_DAY) + ":"
+ m_cal.get(Calendar.MINUTE) + ":" + m_cal.get(Calendar.SECOND);*/
return cdate;
}*/
private static String arabicToenglish(String number) {
char[] chars = new char[number.length()];
for (int i = 0; i < number.length(); i++) {
char ch = number.charAt(i);
if (ch >= 0x0660 && ch <= 0x0669)
ch -= 0x0660 - '0';
else if (ch >= 0x06f0 && ch <= 0x06F9)
ch -= 0x06f0 - '0';
chars[i] = ch;
}
return new String(chars);
}
public String getCurrentTime() {
Calendar m_cal = Calendar.getInstance();
SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss");
String cdate = formatter.format(m_cal.getTime());
if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) {
cdate = arabicToenglish(cdate);
}
return cdate;
}
GSKMTOrange/src/main/res/layout/activity_geo_tag.xml
+3 -5
View File
@@ -27,11 +27,10 @@
android:id="@+id/fab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_gravity="bottom|right"
android:layout_margin="@dimen/fab_margin"
app:srcCompat="@drawable/save_icon"
app:backgroundTint="@color/colorAccent"
/>
app:srcCompat="@drawable/save_icon" />
<android.support.design.widget.FloatingActionButton
android:id="@+id/camrabtn"
@@ -40,7 +39,6 @@
android:layout_gravity="bottom|left"
android:layout_margin="@dimen/fab_margin"
android:src="@mipmap/camera_orange"
app:backgroundTint="@color/colorAccent"
/>
app:backgroundTint="@color/colorAccent" />
</android.support.design.widget.CoordinatorLayout>