|
@ -34,6 +34,7 @@ import com.android.volley.toolbox.Volley; |
|
|
import com.google.android.gms.location.FusedLocationProviderClient; |
|
|
import com.google.android.gms.location.FusedLocationProviderClient; |
|
|
import com.google.android.gms.tasks.OnSuccessListener; |
|
|
import com.google.android.gms.tasks.OnSuccessListener; |
|
|
|
|
|
|
|
|
|
|
|
import org.json.JSONArray; |
|
|
import org.json.JSONException; |
|
|
import org.json.JSONException; |
|
|
import org.json.JSONObject; |
|
|
import org.json.JSONObject; |
|
|
|
|
|
|
|
@ -41,6 +42,9 @@ import java.io.UnsupportedEncodingException; |
|
|
import java.util.HashMap; |
|
|
import java.util.HashMap; |
|
|
import java.util.Map; |
|
|
import java.util.Map; |
|
|
|
|
|
|
|
|
|
|
|
import javax.inject.Inject; |
|
|
|
|
|
|
|
|
|
|
|
import cn.pedant.SweetAlert.SweetAlertDialog; |
|
|
import retrofit2.Call; |
|
|
import retrofit2.Call; |
|
|
import retrofit2.Callback; |
|
|
import retrofit2.Callback; |
|
|
import retrofit2.Response; |
|
|
import retrofit2.Response; |
|
@ -57,11 +61,15 @@ import ru.visionlab.femdemo.models.RegistrationNew; |
|
|
import ru.visionlab.femdemo.models.Users; |
|
|
import ru.visionlab.femdemo.models.Users; |
|
|
import ru.visionlab.femdemo.register.RegisterActivity; |
|
|
import ru.visionlab.femdemo.register.RegisterActivity; |
|
|
import ru.visionlab.femdemo.register.RegisterActivityNew; |
|
|
import ru.visionlab.femdemo.register.RegisterActivityNew; |
|
|
|
|
|
import ru.visionlab.femdemo.settings.VLPreferences; |
|
|
|
|
|
|
|
|
public class LoginActivityNew extends AppCompatActivity { |
|
|
public class LoginActivityNew extends AppCompatActivity { |
|
|
|
|
|
|
|
|
public static final String MyPREFERENCES = "MyPrefs" ; |
|
|
public static final String MyPREFERENCES = "MyPrefs" ; |
|
|
public static final String ID = "id"; |
|
|
public static final String ID = "id"; |
|
|
|
|
|
@Inject |
|
|
|
|
|
VLPreferences preferences; |
|
|
|
|
|
SharedPreferences shared; |
|
|
|
|
|
|
|
|
Button btnSignin; |
|
|
Button btnSignin; |
|
|
|
|
|
|
|
@ -89,6 +97,8 @@ public class LoginActivityNew extends AppCompatActivity { |
|
|
super.onCreate(savedInstanceState); |
|
|
super.onCreate(savedInstanceState); |
|
|
setContentView(R.layout.activity_login_new); |
|
|
setContentView(R.layout.activity_login_new); |
|
|
|
|
|
|
|
|
|
|
|
shared = getApplication().getSharedPreferences("MyPrefs", Context.MODE_PRIVATE); |
|
|
|
|
|
|
|
|
edt_empId = findViewById(R.id.edt_empId); |
|
|
edt_empId = findViewById(R.id.edt_empId); |
|
|
edt_pass = findViewById(R.id.edt_pass); |
|
|
edt_pass = findViewById(R.id.edt_pass); |
|
|
|
|
|
|
|
@ -97,6 +107,7 @@ public class LoginActivityNew extends AppCompatActivity { |
|
|
SharedPreferences shared = getSharedPreferences("MyPrefs", MODE_PRIVATE); |
|
|
SharedPreferences shared = getSharedPreferences("MyPrefs", MODE_PRIVATE); |
|
|
String login = shared.getString("login", ""); |
|
|
String login = shared.getString("login", ""); |
|
|
String Descriptor = shared.getString("Descriptor", ""); |
|
|
String Descriptor = shared.getString("Descriptor", ""); |
|
|
|
|
|
String Employeeid = shared.getString("Employeeid", ""); |
|
|
|
|
|
|
|
|
System.out.println("value of login and Descriptor in login new " + login + " " + Descriptor); |
|
|
System.out.println("value of login and Descriptor in login new " + login + " " + Descriptor); |
|
|
|
|
|
|
|
@ -116,57 +127,54 @@ public class LoginActivityNew extends AppCompatActivity { |
|
|
System.out.println("value of emp and pass " + empId + " " + pass); |
|
|
System.out.println("value of emp and pass " + empId + " " + pass); |
|
|
|
|
|
|
|
|
btnSignin = findViewById(R.id.btnSignin); |
|
|
btnSignin = findViewById(R.id.btnSignin); |
|
|
|
|
|
|
|
|
if(!login.equals("")){ |
|
|
|
|
|
btnSignin.setOnClickListener(new View.OnClickListener() { |
|
|
|
|
|
|
|
|
btnSignin.setOnClickListener(new View.OnClickListener() { |
|
|
@Override |
|
|
@Override |
|
|
public void onClick(View view) { |
|
|
public void onClick(View view) { |
|
|
|
|
|
if(!Employeeid.equals("")){ |
|
|
|
|
|
|
|
|
/*if (ContextCompat.checkSelfPermission(LoginActivityNew.this, android.Manifest.permission.ACCESS_FINE_LOCATION) |
|
|
|
|
|
== PackageManager.PERMISSION_GRANTED) { |
|
|
|
|
|
// Permission granted, so request location updates |
|
|
|
|
|
requestLocationUpdates(); |
|
|
|
|
|
} else { |
|
|
|
|
|
// Permission not granted, request it |
|
|
|
|
|
ActivityCompat.requestPermissions(LoginActivityNew.this, |
|
|
|
|
|
new String[]{android.Manifest.permission.ACCESS_FINE_LOCATION}, |
|
|
|
|
|
LOCATION_PERMISSION_REQUEST_CODE); |
|
|
|
|
|
}*/ |
|
|
|
|
|
|
|
|
|
|
|
isAllFieldsChecked = CheckAllFields(); |
|
|
|
|
|
if(isAllFieldsChecked) { |
|
|
|
|
|
// login(); |
|
|
|
|
|
System.out.println("After login activity new "); |
|
|
|
|
|
/*Intent intent = new Intent(LoginActivityNew.this, RegisterActivity.class); |
|
|
|
|
|
intent.putExtra("FromLoginPage",true); |
|
|
|
|
|
startActivity(intent);*/ |
|
|
|
|
|
//login(); |
|
|
|
|
|
//loginVolley(); |
|
|
|
|
|
loginVolleyNil(); |
|
|
|
|
|
//loginRetro(); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
isAllFieldsChecked = CheckAllFields(); |
|
|
|
|
|
if(isAllFieldsChecked) { |
|
|
|
|
|
// login(); |
|
|
|
|
|
loginUserWithCredential(edt_empId.getText().toString(), edt_pass.getText().toString()); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
else { |
|
|
|
|
|
new SweetAlertDialog(LoginActivityNew.this, SweetAlertDialog.WARNING_TYPE) |
|
|
|
|
|
.setTitleText("Face not register") |
|
|
|
|
|
.setConfirmClickListener(new SweetAlertDialog.OnSweetClickListener() { |
|
|
|
|
|
@Override |
|
|
|
|
|
public void onClick(SweetAlertDialog sDialog) { |
|
|
|
|
|
sDialog.dismissWithAnimation(); |
|
|
|
|
|
} |
|
|
|
|
|
}).show(); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
}); |
|
|
}); |
|
|
} |
|
|
|
|
|
else{ |
|
|
|
|
|
Toast.makeText(LoginActivityNew.this,"Please register before logging in ",Toast.LENGTH_SHORT).show(); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
faceImage = findViewById(R.id.faceImage); |
|
|
|
|
|
|
|
|
|
|
|
if(!login.equals("")){ |
|
|
|
|
|
faceImage.setOnClickListener(new View.OnClickListener() { |
|
|
|
|
|
@Override |
|
|
|
|
|
public void onClick(View view) { |
|
|
|
|
|
|
|
|
faceImage = findViewById(R.id.faceImage); |
|
|
|
|
|
faceImage.setOnClickListener(new View.OnClickListener() { |
|
|
|
|
|
@Override |
|
|
|
|
|
public void onClick(View view) { |
|
|
|
|
|
if(!Employeeid.equals("")){ |
|
|
Intent intent = new Intent(LoginActivityNew.this, RegisterActivity.class); |
|
|
Intent intent = new Intent(LoginActivityNew.this, RegisterActivity.class); |
|
|
intent.putExtra("FromLoginPage",true); |
|
|
intent.putExtra("FromLoginPage",true); |
|
|
startActivity(intent); |
|
|
startActivity(intent); |
|
|
|
|
|
finish(); |
|
|
} |
|
|
} |
|
|
}); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
else { |
|
|
|
|
|
new SweetAlertDialog(LoginActivityNew.this, SweetAlertDialog.WARNING_TYPE) |
|
|
|
|
|
.setTitleText("Face not register") |
|
|
|
|
|
.setConfirmClickListener(new SweetAlertDialog.OnSweetClickListener() { |
|
|
|
|
|
@Override |
|
|
|
|
|
public void onClick(SweetAlertDialog sDialog) { |
|
|
|
|
|
sDialog.dismissWithAnimation(); |
|
|
|
|
|
} |
|
|
|
|
|
}).show(); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
back = findViewById(R.id.back); |
|
|
back = findViewById(R.id.back); |
|
|
back.setOnClickListener(new View.OnClickListener() { |
|
|
back.setOnClickListener(new View.OnClickListener() { |
|
@ -176,11 +184,7 @@ public class LoginActivityNew extends AppCompatActivity { |
|
|
startActivity(intent); |
|
|
startActivity(intent); |
|
|
} |
|
|
} |
|
|
}); |
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public void createRetrofit(){ |
|
|
|
|
|
|
|
|
} public void createRetrofit(){ |
|
|
Retrofit retrofit=new Retrofit.Builder() |
|
|
Retrofit retrofit=new Retrofit.Builder() |
|
|
.baseUrl(Url.Base_url) |
|
|
.baseUrl(Url.Base_url) |
|
|
.addConverterFactory(GsonConverterFactory.create()) |
|
|
.addConverterFactory(GsonConverterFactory.create()) |
|
@ -531,4 +535,73 @@ public class LoginActivityNew extends AppCompatActivity { |
|
|
}; |
|
|
}; |
|
|
Volley.newRequestQueue(LoginActivityNew.this).add(stringRequest); |
|
|
Volley.newRequestQueue(LoginActivityNew.this).add(stringRequest); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private void loginUserWithCredential(String username, String password) { |
|
|
|
|
|
|
|
|
|
|
|
String url= "http://43.242.212.92:7001/api/lgt/Login"; |
|
|
|
|
|
StringRequest stringRequest=new StringRequest(Request.Method.POST, url, new com.android.volley.Response.Listener<String>() { |
|
|
|
|
|
@Override |
|
|
|
|
|
public void onResponse(String response) { |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
try { |
|
|
|
|
|
JSONArray jsonArray=new JSONArray(response); |
|
|
|
|
|
Log.d("response",response); |
|
|
|
|
|
JSONObject jb1=jsonArray.getJSONObject(0); |
|
|
|
|
|
JSONObject jb2=jb1.getJSONObject("statusModel"); |
|
|
|
|
|
String _employeeid = jb1.getString("_employeeid"); |
|
|
|
|
|
String statuscode=jb2.getString("_statusCode"); |
|
|
|
|
|
System.out.println("_employeeid :" + _employeeid); |
|
|
|
|
|
Log.d("status",statuscode); |
|
|
|
|
|
Toast.makeText(LoginActivityNew.this, statuscode, Toast.LENGTH_SHORT).show(); |
|
|
|
|
|
|
|
|
|
|
|
if(statuscode.equals("200")) |
|
|
|
|
|
{ |
|
|
|
|
|
// preferences.setUsername(username); |
|
|
|
|
|
SharedPreferences.Editor editor = shared.edit(); |
|
|
|
|
|
editor.putString("RegisterUser",username); |
|
|
|
|
|
editor.putString("Employeeid",_employeeid); |
|
|
|
|
|
editor.commit(); |
|
|
|
|
|
|
|
|
|
|
|
Toast.makeText(LoginActivityNew.this, "Success Registration", Toast.LENGTH_SHORT).show(); |
|
|
|
|
|
Intent intent=new Intent(LoginActivityNew.this,RegisterActivity.class); |
|
|
|
|
|
startActivity(intent); |
|
|
|
|
|
finish(); |
|
|
|
|
|
} |
|
|
|
|
|
else |
|
|
|
|
|
{ |
|
|
|
|
|
// we have to show alert |
|
|
|
|
|
Toast.makeText(LoginActivityNew.this, "Username/password is not matching!", Toast.LENGTH_SHORT).show(); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
} catch (JSONException e) { |
|
|
|
|
|
Toast.makeText(LoginActivityNew.this, e.toString(), Toast.LENGTH_SHORT).show(); |
|
|
|
|
|
throw new RuntimeException(e); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
}, new com.android.volley.Response.ErrorListener() { |
|
|
|
|
|
@Override |
|
|
|
|
|
public void onErrorResponse(VolleyError error) { |
|
|
|
|
|
Log.d("error-=>",error.getMessage()); |
|
|
|
|
|
|
|
|
|
|
|
Toast.makeText(LoginActivityNew.this, "Faied", Toast.LENGTH_SHORT).show(); |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
}) |
|
|
|
|
|
{ |
|
|
|
|
|
@Override |
|
|
|
|
|
protected Map<String, String> getParams() throws AuthFailureError { |
|
|
|
|
|
HashMap<String,String> map=new HashMap<>(); |
|
|
|
|
|
map.put("username",username); |
|
|
|
|
|
map.put("password",password); |
|
|
|
|
|
map.put("imei",""); |
|
|
|
|
|
|
|
|
|
|
|
return map; |
|
|
|
|
|
} |
|
|
|
|
|
}; |
|
|
|
|
|
Volley.newRequestQueue(LoginActivityNew.this).add(stringRequest); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
} |
|
|
} |