diff --git a/examples/example_bestshot/example/app/src/main/java/ru/visionlab/constant/Url.java b/examples/example_bestshot/example/app/src/main/java/ru/visionlab/constant/Url.java new file mode 100644 index 0000000..dfd7439 --- /dev/null +++ b/examples/example_bestshot/example/app/src/main/java/ru/visionlab/constant/Url.java @@ -0,0 +1,6 @@ +package ru.visionlab.constant; + +public class Url { + + public static final String Base_url= "https://reqres.in/api/"; +} diff --git a/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/api/CallApiService.java b/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/api/CallApiService.java new file mode 100644 index 0000000..275805e --- /dev/null +++ b/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/api/CallApiService.java @@ -0,0 +1,19 @@ +package ru.visionlab.femdemo.api; + +import retrofit2.Retrofit; +import retrofit2.converter.gson.GsonConverterFactory; + +public class CallApiService { + private static Retrofit retrofit = null; + + public static JsonPlaceHolderApi getClient(){ + + if(retrofit == null){ + retrofit = new Retrofit.Builder() + .baseUrl("https://jsonplaceholder.typicode.com/") + .addConverterFactory(GsonConverterFactory.create()) + .build(); + } + return retrofit.create(JsonPlaceHolderApi.class); + } +} diff --git a/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/api/JsonPlaceHolderApi.java b/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/api/JsonPlaceHolderApi.java index be3045e..967942c 100644 --- a/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/api/JsonPlaceHolderApi.java +++ b/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/api/JsonPlaceHolderApi.java @@ -7,10 +7,16 @@ import retrofit2.http.FieldMap; import retrofit2.http.FormUrlEncoded; import retrofit2.http.POST; import ru.visionlab.femdemo.models.RegistrationNew; +import ru.visionlab.femdemo.models.Users; public interface JsonPlaceHolderApi { @FormUrlEncoded @POST("posts") - Call createpost(@FieldMap Map fields); + Call createpost(RegistrationNew registrationNew); + //Call createpost(@FieldMap Map fields); + + @FormUrlEncoded + @POST("posts") + Call login(Users users); } diff --git a/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/login/LoginActivityNew.java b/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/login/LoginActivityNew.java index fda4370..b2b8a95 100644 --- a/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/login/LoginActivityNew.java +++ b/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/login/LoginActivityNew.java @@ -4,14 +4,25 @@ import androidx.appcompat.app.AppCompatActivity; import android.content.Intent; import android.os.Bundle; +import android.util.Log; import android.view.View; import android.widget.Button; import android.widget.EditText; import android.widget.ImageButton; import android.widget.Toast; +import retrofit2.Call; +import retrofit2.Callback; +import retrofit2.Response; +import retrofit2.Retrofit; +import retrofit2.converter.gson.GsonConverterFactory; +import ru.visionlab.constant.Url; import ru.visionlab.femdemo.CheckInActivity; import ru.visionlab.femdemo.R; +import ru.visionlab.femdemo.api.CallApiService; +import ru.visionlab.femdemo.api.JsonPlaceHolderApi; +import ru.visionlab.femdemo.models.RegistrationNew; +import ru.visionlab.femdemo.models.Users; import ru.visionlab.femdemo.register.RegisterActivityNew; public class LoginActivityNew extends AppCompatActivity { @@ -25,6 +36,10 @@ public class LoginActivityNew extends AppCompatActivity { boolean isAllFieldsChecked = false; + JsonPlaceHolderApi jsonPlaceHolderApi; + + String tenancyName =""; + @Override protected void onCreate(Bundle savedInstanceState) { @@ -33,9 +48,11 @@ public class LoginActivityNew extends AppCompatActivity { edt_empId = findViewById(R.id.edt_empId); edt_pass = findViewById(R.id.edt_pass); + createRetrofit(); empId = edt_empId.getText().toString().trim(); pass = edt_pass.getText().toString().trim(); + tenancyName = "tenancyName"; System.out.println("value of emp and pass " + empId + " " + pass); @@ -64,6 +81,15 @@ public class LoginActivityNew extends AppCompatActivity { }); + } + + public void createRetrofit(){ + Retrofit retrofit=new Retrofit.Builder() + .baseUrl(Url.Base_url) + .addConverterFactory(GsonConverterFactory.create()) + .build(); + + jsonPlaceHolderApi=retrofit.create(JsonPlaceHolderApi.class); } @@ -80,4 +106,34 @@ public class LoginActivityNew extends AppCompatActivity { // after all validation return true. return true; } + + public void saveInfo(){ + /*Map fields=new HashMap<>(); + fields.put("companyId",edt_comp.getText().toString()); + fields.put("employeeId",edt_emp.getText().toString()); + fields.put("otp",edt_otp.getText().toString());*/ + + Users users = new Users(empId,pass,tenancyName); + CallApiService.getClient().login(users); + Call call=jsonPlaceHolderApi.login(users); + call.enqueue(new Callback() { + @Override + public void onResponse(Call call, Response response) { + if(response.isSuccessful()) + { + Log.e("code=", String.valueOf(response.code())); + Toast.makeText(LoginActivityNew.this, "Info Added successfully", Toast.LENGTH_SHORT).show(); +// + + } + + } + + @Override + public void onFailure(Call call, Throwable t) { + Toast.makeText(LoginActivityNew.this, ""+t.getMessage(), Toast.LENGTH_SHORT).show(); + Log.e("error=",t.getMessage().toString()); + } + }); + } } \ No newline at end of file diff --git a/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/models/Users.java b/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/models/Users.java new file mode 100644 index 0000000..0e65e7e --- /dev/null +++ b/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/models/Users.java @@ -0,0 +1,38 @@ +package ru.visionlab.femdemo.models; + +public class Users { + + private String employee_id; + private String password; + private String tenancyName; + + public Users(String employee_id, String password, String tenancyName) { + this.employee_id = employee_id; + this.password = password; + this.tenancyName = tenancyName; + } + + public String getEmployee_id() { + return employee_id; + } + + public void setEmployee_id(String employee_id) { + this.employee_id = employee_id; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public String getTenancyName() { + return tenancyName; + } + + public void setTenancyName(String tenancyName) { + this.tenancyName = tenancyName; + } +} diff --git a/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/register/RegisterActivityNew.java b/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/register/RegisterActivityNew.java index c90d973..52a193c 100644 --- a/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/register/RegisterActivityNew.java +++ b/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/register/RegisterActivityNew.java @@ -21,6 +21,7 @@ import retrofit2.Retrofit; import retrofit2.converter.gson.GsonConverterFactory; import ru.visionlab.femdemo.CheckInActivity; import ru.visionlab.femdemo.R; +import ru.visionlab.femdemo.api.CallApiService; import ru.visionlab.femdemo.api.JsonPlaceHolderApi; import ru.visionlab.femdemo.login.LoginActivity; import ru.visionlab.femdemo.login.LoginActivityNew; @@ -46,13 +47,9 @@ public class RegisterActivityNew extends AppCompatActivity { edt_comp = findViewById(R.id.edt_comp); edt_emp = findViewById(R.id.edt_emp); edt_otp = findViewById(R.id.edt_otp); + createRetrofit(); - Retrofit retrofit=new Retrofit.Builder() - .baseUrl("https://jsonplaceholder.typicode.com/") - .addConverterFactory(GsonConverterFactory.create()) - .build(); - jsonPlaceHolderApi=retrofit.create(JsonPlaceHolderApi.class); verifynproceed = findViewById(R.id.verifynproceed); verifynproceed.setOnClickListener(new View.OnClickListener() { @@ -60,8 +57,8 @@ public class RegisterActivityNew extends AppCompatActivity { public void onClick(View view) { isAllFieldsChecked = CheckAllFields(); if(isAllFieldsChecked) { - Intent intent = new Intent(RegisterActivityNew.this, SavePhotoActivity.class); - startActivity(intent); + /*Intent intent = new Intent(RegisterActivityNew.this, SavePhotoActivity.class); + startActivity(intent);*/ //saveInfo(); } } @@ -76,6 +73,15 @@ public class RegisterActivityNew extends AppCompatActivity { } }); } + public void createRetrofit(){ + Retrofit retrofit=new Retrofit.Builder() + .baseUrl("https://jsonplaceholder.typicode.com/") + .addConverterFactory(GsonConverterFactory.create()) + .build(); + + jsonPlaceHolderApi=retrofit.create(JsonPlaceHolderApi.class); + } + private boolean CheckAllFields() { if (edt_comp.length() == 0) { @@ -97,19 +103,21 @@ public class RegisterActivityNew extends AppCompatActivity { } public void saveInfo(){ - Map fields=new HashMap<>(); + /*Map fields=new HashMap<>(); fields.put("companyId",edt_comp.getText().toString()); fields.put("employeeId",edt_emp.getText().toString()); - fields.put("otp",edt_otp.getText().toString()); + fields.put("otp",edt_otp.getText().toString());*/ - Call call=jsonPlaceHolderApi.createpost(fields); + RegistrationNew registrationNew = new RegistrationNew(edt_comp.getText().toString(),edt_emp.getText().toString(),edt_otp.getText().toString()); + CallApiService.getClient().createpost(registrationNew); + Call call=jsonPlaceHolderApi.createpost(registrationNew); call.enqueue(new Callback() { @Override public void onResponse(Call call, Response response) { if(response.isSuccessful()) { Log.e("code=", String.valueOf(response.code())); - Toast.makeText(RegisterActivityNew.this, "Info Added succesfully", Toast.LENGTH_SHORT).show(); + Toast.makeText(RegisterActivityNew.this, "Info Added successfully", Toast.LENGTH_SHORT).show(); // Intent intent=new Intent(AddBook.this,Home.class); // startActivity(intent);