initial commit

parent 988f2930
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<bytecodeTargetLevel target="17" />
</component>
</project>
\ No newline at end of file
...@@ -4,17 +4,16 @@ ...@@ -4,17 +4,16 @@
<component name="GradleSettings"> <component name="GradleSettings">
<option name="linkedExternalProjectsSettings"> <option name="linkedExternalProjectsSettings">
<GradleProjectSettings> <GradleProjectSettings>
<option name="testRunner" value="PLATFORM" /> <option name="testRunner" value="GRADLE" />
<option name="distributionType" value="DEFAULT_WRAPPED" /> <option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" /> <option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleJvm" value="JDK" /> <option name="gradleJvm" value="jbr-17" />
<option name="modules"> <option name="modules">
<set> <set>
<option value="$PROJECT_DIR$" /> <option value="$PROJECT_DIR$" />
<option value="$PROJECT_DIR$/app" /> <option value="$PROJECT_DIR$/app" />
</set> </set>
</option> </option>
<option name="resolveModulePerSourceSet" value="false" />
</GradleProjectSettings> </GradleProjectSettings>
</option> </option>
</component> </component>
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" /> <configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" />
</configurations> </configurations>
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="ProjectType"> <component name="ProjectType">
......
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RunConfigurationProducerService">
<option name="ignoredProducers">
<set>
<option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
<option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
<option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
</set>
</option>
</component>
</project>
\ No newline at end of file
...@@ -3,12 +3,17 @@ ...@@ -3,12 +3,17 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
package="w.soulofpluto.posstock"> package="w.soulofpluto.posstock">
<uses-permission android:name="android.permission.BLUETOOTH"
android:maxSdkVersion="30"/>
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN"
android:maxSdkVersion="30"/>
<uses-permission android:name="android.permission.BLUETOOTH_ADVERTISE" />
<uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
<uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.BLUETOOTH"/>
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION"/> <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION"/>
......
...@@ -15,10 +15,10 @@ import retrofit2.http.Path; ...@@ -15,10 +15,10 @@ import retrofit2.http.Path;
* Created by Ramesh on 05/09/20. * Created by Ramesh on 05/09/20.
*/ */
public interface ApiService{ public interface ApiService {
/*String BASE_URL = "https://aeebe1.emporter.eu/pos_actions/"; /*String BASE_URL = "https://aeebe1.emporter.eu/pos_actions/";
String Token = "41f34d7009db337f6213be52f7151108"; String Token = "41f34d7009db337f6213be52f7151108";
String StoreId = "980"; String StoreId = "980";
@Headers({"Pos-Access-Token:" + Token,"Pos-User-Access-Store-Id:"+StoreId, "Accept: application/json","Content-Type:multipart/form-data"}) @Headers({"Pos-Access-Token:" + Token,"Pos-User-Access-Store-Id:"+StoreId, "Accept: application/json","Content-Type:multipart/form-data"})
@Multipart @Multipart
@POST("uploadBarcodeImages") @POST("uploadBarcodeImages")
...@@ -27,11 +27,11 @@ import retrofit2.http.Path; ...@@ -27,11 +27,11 @@ import retrofit2.http.Path;
@Headers({"Content-type: application/json"}) @Headers({"Content-type: application/json"})
@POST("/login/doLogin") @POST("/login/doLogin")
Call<String> Login(@Body RequestBody body); Call<String> Login(@Body RequestBody body);
@POST("/Tfs/getInfoWithTfsNumber") @POST("/Tfs/getInfoWithTfsNumber")
Call<Response> getInfoTfsNumber(@HeaderMap Map<String, String> headers, @Body RequestBody responseBody); Call<Response> getInfoTfsNumber(@HeaderMap Map<String, String> headers, @Body RequestBody responseBody);
@GET("/login/getStoresMappedToUser/{id}") @GET("/login/getStoresMappedToUser/{id}")
Call<Response> getStoreId(@Path("id") String id); Call<Response> getStoreId(@Path("id") String id);
} }
...@@ -4,15 +4,17 @@ package w.soulofpluto.posstock; ...@@ -4,15 +4,17 @@ package w.soulofpluto.posstock;
Create by Ramesh Babu Create by Ramesh Babu
*/ */
public class public class Barcode {
Barcode { private String barcode;
String barcode, empId; private String empId;
int qty; private int qty;
public Barcode(String Barcode, int Qty, String empId){ public Barcode(String Barcode, int Qty, String empId){
this.barcode = Barcode; this.barcode = Barcode;
this.qty = Qty; this.qty = Qty;
this.empId = empId; this.empId = empId;
} }
public String getBarcode() { public String getBarcode() {
return barcode; return barcode;
} }
......
...@@ -35,7 +35,7 @@ public class CreateResponse { ...@@ -35,7 +35,7 @@ public class CreateResponse {
private String transactionStartTime; private String transactionStartTime;
@SerializedName("transaction_start_microtime") @SerializedName("transaction_start_microtime")
@Expose @Expose
private Long transactionStartMicrotime; private Long transactionStartMicroTime;
public Integer getSuccess() { public Integer getSuccess() {
return success; return success;
...@@ -101,16 +101,14 @@ public class CreateResponse { ...@@ -101,16 +101,14 @@ public class CreateResponse {
this.transactionStartTime = transactionStartTime; this.transactionStartTime = transactionStartTime;
} }
public Long getTransactionStartMicrotime() { public Long getTransactionStartMicroTime() {
return transactionStartMicrotime; return transactionStartMicroTime;
} }
public void setTransactionStartMicrotime(Long transactionStartMicrotime) { public void setTransactionStartMicroTime(Long transactionStartMicroTime) {
this.transactionStartMicrotime = transactionStartMicrotime; this.transactionStartMicroTime = transactionStartMicroTime;
} }
public class Datum { public class Datum {
@SerializedName("barcode") @SerializedName("barcode")
@Expose @Expose
...@@ -283,7 +281,5 @@ public class CreateResponse { ...@@ -283,7 +281,5 @@ public class CreateResponse {
public void setColorCode(String colorCode) { public void setColorCode(String colorCode) {
this.colorCode = colorCode; this.colorCode = colorCode;
} }
} }
} }
\ No newline at end of file
package w.soulofpluto.posstock; package w.soulofpluto.posstock;
import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.text.Html; import android.text.Html;
import android.util.Log;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.widget.Button; import android.widget.Button;
import android.widget.TextView; import android.widget.TextView;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar; import androidx.appcompat.widget.Toolbar;
import com.squareup.okhttp.Callback; import com.squareup.okhttp.Callback;
...@@ -23,121 +20,124 @@ import org.json.JSONObject; ...@@ -23,121 +20,124 @@ import org.json.JSONObject;
import java.io.IOException; import java.io.IOException;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
/* /*
Create by Ramesh Babu Create by Ramesh Babu
*/ */
//9985099555
public class DashBoardActivity extends AppCompatActivity implements View.OnClickListener { public class DashBoardActivity extends AppCompatActivity implements View.OnClickListener {
Toolbar dashboard_toolbar; Toolbar dashboard_toolbar;
Button stock_audit,rack_qty,searchBy_Barcode, transfer; Button stock_audit, rack_qty, searchBy_Barcode, transfer;
TextView version; TextView version;
PreferenceManager preferenceManager; PreferenceManager preferenceManager;
@Override @Override
protected void onCreate(Bundle savedInstanceState){ protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_dashboard); setContentView(R.layout.activity_dashboard);
stock_audit = findViewById(R.id.stock_audit); stock_audit = findViewById(R.id.stock_audit);
rack_qty = findViewById(R.id.rack_qty); rack_qty = findViewById(R.id.rack_qty);
searchBy_Barcode = findViewById(R.id.searchby_barcode); searchBy_Barcode = findViewById(R.id.searchby_barcode);
dashboard_toolbar = findViewById(R.id.dashboard_toolbar); dashboard_toolbar = findViewById(R.id.dashboard_toolbar);
version = findViewById(R.id.version); version = findViewById(R.id.version);
transfer = findViewById(R.id.transfer); transfer = findViewById(R.id.transfer);
preferenceManager = new PreferenceManager(this); preferenceManager = new PreferenceManager(this);
setSupportActionBar(dashboard_toolbar); setSupportActionBar (dashboard_toolbar);
getSupportActionBar().setTitle(getResources().getString(R.string.dashboard)); getSupportActionBar().setTitle(getResources().getString(R.string.dashboard));
getSupportActionBar().setDisplayHomeAsUpEnabled(true); getSupportActionBar().setDisplayHomeAsUpEnabled(true);
stock_audit .setOnClickListener(this); stock_audit.setOnClickListener(this);
rack_qty .setOnClickListener(this); rack_qty.setOnClickListener (this);
searchBy_Barcode.setOnClickListener(this); searchBy_Barcode.setOnClickListener(this);
transfer .setOnClickListener(this); transfer.setOnClickListener (this);
version .setText(Html.fromHtml(Constants.Ver_Text +Constants.VERSION)); version.setText (Html.fromHtml(Constants.Ver_Text + Constants.VERSION));
} }
@Override @Override
public boolean onCreateOptionsMenu(Menu menu){ public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.menu, menu); getMenuInflater().inflate(R.menu.menu, menu);
return super.onCreateOptionsMenu(menu); return super.onCreateOptionsMenu(menu);
} }
@Override @Override
public boolean onOptionsItemSelected(@NonNull MenuItem item){ public boolean onOptionsItemSelected(@NonNull MenuItem item) {
switch(item.getItemId()){ switch (item.getItemId()) {
case R.id.dashboard_logout: case R.id.dashboard_logout:
if(Constants.isNetworkAvailable(DashBoardActivity.this)){ if (Constants.isNetworkAvailable(DashBoardActivity.this)) {
Logout(Constants.Logout+preferenceManager.getUserId()); Logout(Constants.Logout + preferenceManager.getUserId());
Constants.ProgressDialogShow(DashBoardActivity.this); Constants.ProgressDialogShow(DashBoardActivity.this);
}else{ } else {
Constants.getToast(DashBoardActivity.this,getResources().getString(R.string.connection)); Constants.getToast(DashBoardActivity.this, getResources().getString(R.string.connection));
} }
break; break;
case android.R.id.home: case android.R.id.home:
finish(); finish();
break; break;
} }
return super.onOptionsItemSelected(item); return super.onOptionsItemSelected(item);
} }
public void Logout(String Url){ public void Logout(String Url) {
final OkHttpClient client = new OkHttpClient(); final OkHttpClient client = new OkHttpClient();
client.setConnectTimeout(240, TimeUnit.SECONDS); client.setConnectTimeout(240, TimeUnit.SECONDS);
client.setReadTimeout(240, TimeUnit.SECONDS); client.setReadTimeout(240, TimeUnit.SECONDS);
client.setWriteTimeout(240, TimeUnit.SECONDS); client.setWriteTimeout(240, TimeUnit.SECONDS);
final Request request = new Request.Builder() final Request request = new Request.Builder()
.url(Url) .url(Url)
.get() .get()
.addHeader("Content-Type", "application/json") .addHeader("Content-Type", "application/json")
.build(); .build();
client.newCall(request).enqueue(new Callback(){ client.newCall(request).enqueue(new Callback() {
@Override @Override
public void onFailure(Request request, IOException e){ public void onFailure(Request request, IOException e) {
Constants.ProgressDialogDismiss(); Constants.ProgressDialogDismiss();
} }
@Override @Override
public void onResponse(Response response) throws IOException{ public void onResponse(Response response) throws IOException {
Constants.ProgressDialogDismiss(); Constants.ProgressDialogDismiss();
if(response.isSuccessful()){ if(response.isSuccessful()) {
String res = response.body().string(); String res = response.body().string();
try{ try {
JSONObject jsonObject = new JSONObject(res); JSONObject jsonObject = new JSONObject(res);
if(jsonObject.has("success")){ if (jsonObject.has("success")) {
if(jsonObject.getInt("success") == 1){ if (jsonObject.getInt("success") == 1) {
}else if(jsonObject.getInt("success") == 3){ } else if (jsonObject.getInt("success") == 3) {
preferenceManager.setUserId(""); preferenceManager.setUserId("");
preferenceManager.setLogged(false); preferenceManager.setLogged(false);
preferenceManager.setCustToken(""); preferenceManager.setCustToken("");
preferenceManager.setStoreId(""); preferenceManager.setStoreId("");
Login.logout(DashBoardActivity.this); Login.logout(DashBoardActivity.this);
Constants.getToast(DashBoardActivity.this,jsonObject.getString("msg")); Constants.getToast(DashBoardActivity.this, jsonObject.getString("msg"));
}else{ } else {
Constants.getToast(DashBoardActivity.this,jsonObject.getString("msg")); Constants.getToast(DashBoardActivity.this, jsonObject.getString("msg"));
} }
} }
}catch(JSONException e){ } catch (JSONException e) {
e.printStackTrace(); e.printStackTrace();
}catch (NullPointerException np){ } catch (NullPointerException np) {
np.printStackTrace(); np.printStackTrace();
} }
} }
} }
}); });
} }
@Override @Override
public void onClick(View view){ public void onClick(View view) {
switch(view.getId()){ switch (view.getId()) {
case R.id.stock_audit: case R.id.stock_audit:
Intent in_main = new Intent(this, MainActivity.class); Intent in_main = new Intent(this, MainActivity.class);
this.startActivity(in_main); this.startActivity(in_main);
break; break;
case R.id.rack_qty: case R.id.rack_qty:
Intent in_rack = new Intent(this, RackWiseQty.class); Intent in_rack = new Intent(this, RackWiseQty.class);
this.startActivity(in_rack); this.startActivity(in_rack);
break; break;
case R.id.searchby_barcode: case R.id.searchby_barcode:
Intent in_search = new Intent(this, SearchByBarcode.class); Intent in_search = new Intent(this, SearchByBarcode.class);
this.startActivity(in_search); this.startActivity(in_search);
break; break;
} }
} }
} }
package w.soulofpluto.posstock; package w.soulofpluto.posstock;
/* /*
Create by Ramesh Babu Create by Ramesh Babu
*/ */
public interface DataInterface { public interface DataInterface {
void onDeliveryData(int code, String data, String Id); void onDeliveryData(int code, String data, String Id);
void onDeliveryFail(String fail); void onDeliveryFail(String fail);
void onDeliveryDataRemove(int code, String data); void onDeliveryDataRemove(int code, String data);
void onDeliveryFailRemove(String fail); void onDeliveryFailRemove(String fail);
void onLogoutData(int code, String data); void onLogoutData (int code, String data);
void onLogoutFail(String fail); void onLogoutFail (String fail);
void onFinalData(int code, String finalData); void onFinalData (int code, String finalData);
void onFinalFail(String finalFail); void onFinalFail (String finalFail);
void onCustomerName(int code,String name); void onCustomerName(int code,String name);
void onCustomerNameFail(String fail); void onCustomerNameFail (String fail);
} }
...@@ -3,15 +3,12 @@ package w.soulofpluto.posstock; ...@@ -3,15 +3,12 @@ package w.soulofpluto.posstock;
import android.content.Context; import android.content.Context;
import android.os.Handler; import android.os.Handler;
import android.os.Looper; import android.os.Looper;
import android.util.Log;
import com.squareup.okhttp.Callback; import com.squareup.okhttp.Callback;
import com.squareup.okhttp.MediaType;
import com.squareup.okhttp.OkHttpClient; import com.squareup.okhttp.OkHttpClient;
import com.squareup.okhttp.Request; import com.squareup.okhttp.Request;
import com.squareup.okhttp.RequestBody; import com.squareup.okhttp.RequestBody;
import java.io.IOException; import java.io.IOException;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
/* /*
...@@ -19,59 +16,59 @@ import java.util.concurrent.TimeUnit; ...@@ -19,59 +16,59 @@ import java.util.concurrent.TimeUnit;
*/ */
public class DataPresenter{ public class DataPresenter{
private Context context; private Context context;
private DataInterface dataInterface; private DataInterface dataInterface;
private String Response; private String Response;
private PreferenceManager preferenceManager; private PreferenceManager preferenceManager;
public DataPresenter(Context context,DataInterface dataInterface){ public DataPresenter(Context context,DataInterface dataInterface){
this.context = context; this .context = context;
this.dataInterface = dataInterface; this .dataInterface = dataInterface;
preferenceManager = new PreferenceManager(context); preferenceManager = new PreferenceManager(context);
} }
public void SendDeliverySlipNumber(String Url, RequestBody object, final String Id){ public void SendDeliverySlipNumber(String Url, RequestBody object, final String Id){
System.out.println("Url ====>"+Url); System .out.println("Url ====>"+Url);
System.out.println("Object ====>"+object); System .out.println("Object ====>"+object);
//RequestBody body = RequestBody.create(JSON, object); //RequestBody body = RequestBody.create(JSON, object);
final OkHttpClient client = new OkHttpClient(); final OkHttpClient client = new OkHttpClient();
client.setConnectTimeout(240, TimeUnit.SECONDS); client .setConnectTimeout(240, TimeUnit.SECONDS);
client.setReadTimeout(240,TimeUnit.SECONDS); client .setReadTimeout(240, TimeUnit.SECONDS);
client.setWriteTimeout(240,TimeUnit.SECONDS); client .setWriteTimeout(240, TimeUnit.SECONDS);
Request request = new Request.Builder() Request request = new Request.Builder()
.url(Url) .url(Url)
.post(object) .post(object)
.addHeader(Constants.Type, Constants.App_json) .addHeader(Constants.Type, Constants.App_json)
.addHeader(Constants.Access_Token,preferenceManager.getCustToken()) .addHeader(Constants.Access_Token, preferenceManager.getCustToken())
.addHeader(Constants.Access_StoreId, preferenceManager.getStoreId()) .addHeader(Constants.Access_StoreId, preferenceManager.getStoreId())
.build(); .build();
client.newCall(request).enqueue(new Callback(){ client .newCall(request).enqueue(new Callback(){
@Override @Override
public void onFailure(Request request, IOException e){ public void onFailure(Request request, IOException e){
//featureDataInterface.FeatureFailure(request.toString()); //featureDataInterface.FeatureFailure(request.toString());
dataInterface.onDeliveryFail(request.toString()); dataInterface.onDeliveryFail(request.toString());
System.out.println("Delivery Slip error" +e.getMessage()); System.out.println("Delivery Slip error" +e.getMessage());
} }
@Override @Override
public void onResponse(final com.squareup.okhttp.Response response) throws IOException{ public void onResponse(final com.squareup.okhttp.Response response) throws IOException{
try { try {
Response = response.body().string(); Response = response.body().string();
System.out.println("Delivery Slip" + Response); System.out.println("Delivery Slip" + Response);
Handler handler = new Handler(Looper.getMainLooper()); Handler handler = new Handler(Looper.getMainLooper());
handler.post(() -> dataInterface.onDeliveryData(response.code(),Response,Id)); handler.post(() -> dataInterface.onDeliveryData(response.code(),Response,Id));
}catch (NullPointerException np){ }catch (NullPointerException np){
np.printStackTrace(); np.printStackTrace();
}finally { }finally {
response.body().close(); response.body().close();
} }
} }
}); });
} }
public void SendDeliverySlipNumberRemove(String Url, RequestBody object){ public void SendDeliverySlipNumberRemove(String Url, RequestBody object){
System.out.println("Url ====>"+Url); //System.out.println("Url ====>"+Url);
System.out.println("Object ====>"+object); //System.out.println("Object ====>"+object);
final OkHttpClient client = new OkHttpClient(); final OkHttpClient client = new OkHttpClient();
client.setConnectTimeout(240, TimeUnit.SECONDS); client.setConnectTimeout(240, TimeUnit.SECONDS);
client.setReadTimeout(240,TimeUnit.SECONDS); client.setReadTimeout(240,TimeUnit.SECONDS);
...@@ -171,6 +168,7 @@ public class DataPresenter{ ...@@ -171,6 +168,7 @@ public class DataPresenter{
} }
}); });
} }
public void CustomerName(String Url,RequestBody object){ public void CustomerName(String Url,RequestBody object){
final OkHttpClient client = new OkHttpClient(); final OkHttpClient client = new OkHttpClient();
client.setConnectTimeout(2000, TimeUnit.SECONDS); client.setConnectTimeout(2000, TimeUnit.SECONDS);
...@@ -192,7 +190,7 @@ public class DataPresenter{ ...@@ -192,7 +190,7 @@ public class DataPresenter{
@Override @Override
public void onResponse(final com.squareup.okhttp.Response response) throws IOException{ public void onResponse(final com.squareup.okhttp.Response response) throws IOException{
Response = response.body().string(); Response = response.body().string();
System.out.println("Customer Response ====>" + Response); Log.e("Customer Response ====>" , Response);
Handler handler = new Handler(Looper.getMainLooper()); Handler handler = new Handler(Looper.getMainLooper());
handler.post(() -> dataInterface.onCustomerName(response.code(), Response)); handler.post(() -> dataInterface.onCustomerName(response.code(), Response));
} }
......
...@@ -20,30 +20,25 @@ import java.util.ArrayList; ...@@ -20,30 +20,25 @@ import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
public class DiscoveryActivity extends Activity implements View.OnClickListener, AdapterView.OnItemClickListener { public class DiscoveryActivity extends Activity implements View.OnClickListener, AdapterView.OnItemClickListener {
private Context mContext = null;
private Context mContext = null;
private ArrayList<HashMap<String, String>> mPrinterList = null; private ArrayList<HashMap<String, String>> mPrinterList = null;
private SimpleAdapter mPrinterListAdapter = null; private SimpleAdapter mPrinterListAdapter = null;
private FilterOption mFilterOption = null; private FilterOption mFilterOption = null;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_discovery); setContentView(R.layout.activity_discovery);
mContext = this;
mContext = this; Button button = findViewById(R.id.btnRestart);
mPrinterList = new ArrayList<>();
Button button = (Button)findViewById(R.id.btnRestart);
button.setOnClickListener(this); button.setOnClickListener(this);
mPrinterList = new ArrayList<>();
mPrinterListAdapter = new SimpleAdapter(this, mPrinterList, R.layout.list_at, mPrinterListAdapter = new SimpleAdapter(this, mPrinterList, R.layout.list_at,
new String[] { "PrinterName", "Target" }, new String[] { "PrinterName", "Target" },
new int[] { R.id.PrinterName, R.id.Target }); new int[] { R.id.PrinterName, R.id.Target });
ListView list = (ListView)findViewById(R.id.lstReceiveData); ListView list = findViewById(R.id.lstReceiveData);
list.setAdapter(mPrinterListAdapter); list.setAdapter(mPrinterListAdapter);
list.setOnItemClickListener(this); list.setOnItemClickListener(this);
mFilterOption = new FilterOption(); mFilterOption = new FilterOption();
mFilterOption.setDeviceType(Discovery.TYPE_PRINTER); mFilterOption.setDeviceType(Discovery.TYPE_PRINTER);
mFilterOption.setEpsonFilter(Discovery.FILTER_NAME); mFilterOption.setEpsonFilter(Discovery.FILTER_NAME);
...@@ -58,7 +53,6 @@ public class DiscoveryActivity extends Activity implements View.OnClickListener, ...@@ -58,7 +53,6 @@ public class DiscoveryActivity extends Activity implements View.OnClickListener,
@Override @Override
public void onDestroy() { public void onDestroy() {
super.onDestroy(); super.onDestroy();
while (true) { while (true) {
try { try {
Discovery.stop(); Discovery.stop();
...@@ -70,7 +64,6 @@ public class DiscoveryActivity extends Activity implements View.OnClickListener, ...@@ -70,7 +64,6 @@ public class DiscoveryActivity extends Activity implements View.OnClickListener,
} }
} }
} }
mFilterOption = null; mFilterOption = null;
} }
...@@ -81,11 +74,9 @@ public class DiscoveryActivity extends Activity implements View.OnClickListener, ...@@ -81,11 +74,9 @@ public class DiscoveryActivity extends Activity implements View.OnClickListener,
restartDiscovery(); restartDiscovery();
break; break;
default: default:
// Do nothing
break; break;
} }
} }
@Override @Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) { public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
Intent intent = new Intent(); Intent intent = new Intent();
......
...@@ -18,7 +18,6 @@ import android.widget.Spinner; ...@@ -18,7 +18,6 @@ import android.widget.Spinner;
import android.widget.Toast; import android.widget.Toast;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;
import com.squareup.okhttp.Callback; import com.squareup.okhttp.Callback;
import com.squareup.okhttp.OkHttpClient; import com.squareup.okhttp.OkHttpClient;
import com.squareup.okhttp.Request; import com.squareup.okhttp.Request;
...@@ -39,13 +38,13 @@ import static w.soulofpluto.posstock.Constants.JSON; ...@@ -39,13 +38,13 @@ import static w.soulofpluto.posstock.Constants.JSON;
public class Login extends AppCompatActivity implements View.OnClickListener, AdapterView.OnItemSelectedListener{ public class Login extends AppCompatActivity implements View.OnClickListener, AdapterView.OnItemSelectedListener{
private EditText userId, password; private EditText userId, password;
private Spinner storeId; private Spinner storeId;
private Button submit; private Button submit;
private ArrayList<Store> stores; private ArrayList<Store> stores;
private String Response; private String Response;
private int Store_Id; private int Store_Id;
private PreferenceManager preferenceManager; private PreferenceManager preferenceManager;
private String Store_Name; private String Store_Name;
public static void logout(Context context){ public static void logout(Context context){
Activity activity = (Activity) context; Activity activity = (Activity) context;
...@@ -180,12 +179,12 @@ public class Login extends AppCompatActivity implements View.OnClickListener, Ad ...@@ -180,12 +179,12 @@ public class Login extends AppCompatActivity implements View.OnClickListener, Ad
}catch(JSONException je){ }catch(JSONException je){
je.printStackTrace(); je.printStackTrace();
} }
RequestBody body = RequestBody.create(JSON, object.toString()); RequestBody body = RequestBody.create(JSON, object.toString());
final OkHttpClient client = new OkHttpClient(); final OkHttpClient client = new OkHttpClient();
client.setConnectTimeout(240, TimeUnit.SECONDS); client.setConnectTimeout(240, TimeUnit.SECONDS);
client.setReadTimeout(240, TimeUnit.SECONDS); client.setReadTimeout(240, TimeUnit.SECONDS);
client.setWriteTimeout(240, TimeUnit.SECONDS); client.setWriteTimeout(240, TimeUnit.SECONDS);
Request request = new Request.Builder() Request request = new Request.Builder()
.url(Constants.Login) .url(Constants.Login)
.post(body) .post(body)
.addHeader(Constants.Type, Constants.App_json) .addHeader(Constants.Type, Constants.App_json)
...@@ -243,6 +242,7 @@ public class Login extends AppCompatActivity implements View.OnClickListener, Ad ...@@ -243,6 +242,7 @@ public class Login extends AppCompatActivity implements View.OnClickListener, Ad
} }
}); });
} }
@Override @Override
public void onItemSelected(AdapterView<?> parent, View view, int position, long id){ public void onItemSelected(AdapterView<?> parent, View view, int position, long id){
switch (parent.getId()){ switch (parent.getId()){
...@@ -253,9 +253,11 @@ public class Login extends AppCompatActivity implements View.OnClickListener, Ad ...@@ -253,9 +253,11 @@ public class Login extends AppCompatActivity implements View.OnClickListener, Ad
break; break;
} }
} }
@Override @Override
public void onNothingSelected(AdapterView<?> parent) { public void onNothingSelected(AdapterView<?> parent) {
} }
@Override @Override
public void onBackPressed() { public void onBackPressed() {
super.onBackPressed(); super.onBackPressed();
......
...@@ -44,18 +44,17 @@ public class MainActivity extends AppCompatActivity { ...@@ -44,18 +44,17 @@ public class MainActivity extends AppCompatActivity {
setSupportActionBar(main_toolbar); setSupportActionBar(main_toolbar);
getSupportActionBar().setDisplayHomeAsUpEnabled(true); getSupportActionBar().setDisplayHomeAsUpEnabled(true);
getSupportActionBar().setTitle(getResources().getString(R.string.test)+ " UserId : " + preferenceManager.getUserId()); getSupportActionBar().setTitle(getResources().getString(R.string.test)+ " UserId : " + preferenceManager.getUserId());
} }
@Override @Override
protected void onStart(){ protected void onStart(){
if(Constants.isNetworkAvailable(MainActivity.this)){ if(Constants.isNetworkAvailable(MainActivity.this)){
FetchData(Constants.Dashboard); FetchData(Constants.Dashboard);
Constants.ProgressDialogShow(MainActivity.this); Constants.ProgressDialogShow(MainActivity.this);
}else{ }else{
Constants.getToast(MainActivity.this,getResources().getString(R.string.connection)); Constants.getToast(MainActivity.this,getResources().getString(R.string.connection));
} }
super.onStart(); super.onStart();
} }
public void Logout(String Url){ public void Logout(String Url){
...@@ -103,23 +102,23 @@ public class MainActivity extends AppCompatActivity { ...@@ -103,23 +102,23 @@ public class MainActivity extends AppCompatActivity {
@Override @Override
public boolean onCreateOptionsMenu(Menu menu){ public boolean onCreateOptionsMenu(Menu menu){
getMenuInflater().inflate(R.menu.menu,menu); getMenuInflater().inflate(R.menu.menu,menu);
return super.onCreateOptionsMenu(menu); return super.onCreateOptionsMenu(menu);
} }
@Override @Override
public boolean onOptionsItemSelected(MenuItem item){ public boolean onOptionsItemSelected(MenuItem item){
switch(item.getItemId()){ switch(item.getItemId()){
case android.R.id.home: case android.R.id.home:
finish(); finish();
break; break;
case R.id.dashboard_logout: case R.id.dashboard_logout:
if(Constants.isNetworkAvailable(MainActivity.this)){ if(Constants.isNetworkAvailable(MainActivity.this)){
Logout(Constants.Logout+preferenceManager.getUserId()); Logout(Constants.Logout+preferenceManager.getUserId());
Constants.ProgressDialogShow(MainActivity.this); Constants.ProgressDialogShow(MainActivity.this);
}else{ }else{
Constants.getToast(MainActivity.this,getResources().getString(R.string.connection)); Constants.getToast(MainActivity.this,getResources().getString(R.string.connection));
} }
break; break;
} }
return super.onOptionsItemSelected(item); return super.onOptionsItemSelected(item);
...@@ -130,15 +129,15 @@ public class MainActivity extends AppCompatActivity { ...@@ -130,15 +129,15 @@ public class MainActivity extends AppCompatActivity {
try{ try{
if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT){ if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT){
SimpleDateFormat currentDate = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat currentDate = new SimpleDateFormat("yyyy-MM-dd");
Date todayDate = new Date(); Date todayDate = new Date();
Date from = getDateWithOffset(-Constants.Value, new Date()); Date from = getDateWithOffset(-Constants.Value, new Date());
String fromDate = currentDate.format(from); String fromDate = currentDate.format(from);
String thisDate = currentDate.format(todayDate); String thisDate = currentDate.format(todayDate);
Log.e("Last date",fromDate); Log.e("Last date",fromDate);
object.put(getResources().getString(R.string.auditstatus),"In Progress"); object.put(getResources().getString(R.string.auditstatus),"In Progress");
object.put(getResources().getString(R.string.fromdate),fromDate); object.put(getResources().getString(R.string.fromdate), fromDate);
object.put(getResources().getString(R.string.todate),thisDate); object.put(getResources().getString(R.string.todate), thisDate);
object.put(getResources().getString(R.string.android_version),Constants.VERSION); object.put(getResources().getString(R.string.android_version), Constants.VERSION);
} }
}catch(JSONException e){ }catch(JSONException e){
e.printStackTrace(); e.printStackTrace();
...@@ -148,12 +147,12 @@ public class MainActivity extends AppCompatActivity { ...@@ -148,12 +147,12 @@ public class MainActivity extends AppCompatActivity {
client.setConnectTimeout(250, TimeUnit.SECONDS); client.setConnectTimeout(250, TimeUnit.SECONDS);
client.setReadTimeout(250, TimeUnit.SECONDS); client.setReadTimeout(250, TimeUnit.SECONDS);
client.setWriteTimeout(250, TimeUnit.SECONDS); client.setWriteTimeout(250, TimeUnit.SECONDS);
Request request = new Request.Builder() Request request = new Request.Builder()
.url(Url) .url(Url)
.post(body) .post(body)
.addHeader(Constants.Type, Constants.App_json) .addHeader(Constants.Type, Constants.App_json)
.addHeader(getResources().getString(R.string.accesstoken), preferenceManager.getCustToken()) .addHeader(getResources().getString(R.string.accesstoken), preferenceManager.getCustToken())
.addHeader(getResources().getString(R.string.storeidtoken),preferenceManager.getStoreId()) .addHeader(getResources().getString(R.string.storeidtoken), preferenceManager.getStoreId())
.build(); .build();
client.newCall(request).enqueue(new Callback(){ client.newCall(request).enqueue(new Callback(){
@Override @Override
......
...@@ -13,71 +13,70 @@ import androidx.recyclerview.widget.RecyclerView; ...@@ -13,71 +13,70 @@ import androidx.recyclerview.widget.RecyclerView;
import java.util.ArrayList; import java.util.ArrayList;
/* /*
Create by Ramesh Babu Create by Ramesh Babu
*/ */
public class MenuAdapter extends RecyclerView.Adapter<MenuAdapter.ViewHolder> { public class MenuAdapter extends RecyclerView.Adapter<MenuAdapter.ViewHolder> {
ArrayList<String> arrayList; ArrayList<String> arrayList;
Context context; Context context;
public MenuAdapter(Context context,ArrayList<String> arrayList) { public MenuAdapter(Context context, ArrayList<String> arrayList){
this.context = context; this.context = context;
this.arrayList = arrayList; this.arrayList = arrayList;
} }
@NonNull @NonNull
@Override @Override
public MenuAdapter.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { public MenuAdapter.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType){
LayoutInflater layoutInflater = LayoutInflater.from(parent.getContext()); LayoutInflater layoutInflater = LayoutInflater.from(parent.getContext());
View listItem = layoutInflater.inflate(R.layout.menulist_item, parent, false); View listItem = layoutInflater.inflate(R.layout.menulist_item, parent, false);
MenuAdapter.ViewHolder viewHolder = new MenuAdapter.ViewHolder(listItem); MenuAdapter.ViewHolder viewHolder = new MenuAdapter.ViewHolder(listItem);
return viewHolder; return viewHolder;
} }
@Override @Override
public void onBindViewHolder(@NonNull MenuAdapter.ViewHolder holder, final int position) { public void onBindViewHolder(@NonNull MenuAdapter.ViewHolder holder, final int position){
final String data = arrayList.get(position); final String data = arrayList.get(position);
holder.menu_name.setText(data); holder.menu_name.setText(data);
if(data.equalsIgnoreCase("Create Delivery Slip")){ if (data.equalsIgnoreCase("Create Delivery Slip")) {
holder.menu_image.setImageResource(R.drawable.ic_create_delivery_slip); holder.menu_image.setImageResource(R.drawable.ic_create_delivery_slip);
}else if(data.equalsIgnoreCase("Stock Audit")){ } else if (data.equalsIgnoreCase("Stock Audit")) {
holder.menu_image.setImageResource(R.drawable.ic_stock_audit); holder.menu_image.setImageResource(R.drawable.ic_stock_audit);
}else if(data.equalsIgnoreCase("Create Sale Bill")){ } else if (data.equalsIgnoreCase("Create Sale Bill")) {
holder.menu_image.setImageResource(R.drawable.ic_create_sale_bill); holder.menu_image.setImageResource(R.drawable.ic_create_sale_bill);
}else if(data.equalsIgnoreCase("Stock OutWord")){ } else if (data.equalsIgnoreCase("Stock OutWord")) {
holder.menu_image.setImageResource(R.drawable.ic_stock_out_word); holder.menu_image.setImageResource(R.drawable.ic_stock_out_word);
}else if(data.equalsIgnoreCase("Stock Transfer")){ } else if (data.equalsIgnoreCase("Stock Transfer")) {
holder.menu_image.setImageResource(R.drawable.ic_stock_out_word); holder.menu_image.setImageResource(R.drawable.ic_stock_out_word);
}else{ } else {
holder.menu_image.setImageResource(R.drawable.ic_stock_transfer); holder.menu_image.setImageResource(R.drawable.ic_stock_transfer);
} }
//45724.48 holder.layout.setOnClickListener(view -> {
holder.layout.setOnClickListener(view -> { if (data.equalsIgnoreCase("Stock Audit")) {
if (data.equalsIgnoreCase("Stock Audit")) { /*Intent intent = new Intent(context,DashBoardActivity.class);
/*Intent intent = new Intent(context,DashBoardActivity.class); context.startActivity(intent);*/
context.startActivity(intent);*/ return;
return; } else if (data.equalsIgnoreCase("Create Delivery Slip")) {
} else if(data.equalsIgnoreCase("Create Delivery Slip")) { /* Intent intent = new Intent(context, CreateDeliverySlip.class);
/*Intent intent = new Intent(context,CreateDeliverySlip.class); context.startActivity(intent);*/
context.startActivity(intent);*/ return;
return; } else if (data.equalsIgnoreCase("Create Sale Bill")) {
} else if(data.equalsIgnoreCase("Create Sale Bill")) { /*Intent intent = new Intent(context, CreateSaleBill.class);
/*Intent intent = new Intent(context,CreateSaleBill.class); context.startActivity(intent);*/
context.startActivity(intent);*/ return;
return; } else if (data.equalsIgnoreCase("Stock OutWord")) {
} else if(data.equalsIgnoreCase("Stock OutWord")) { Intent intent = new Intent(context, StockOutWordActivity.class);
Intent intent = new Intent(context, StockOutWordActivity.class); context.startActivity(intent);
context.startActivity(intent); return;
return; } else if (data.equalsIgnoreCase("Stock Transfer")) {
} else if(data.equalsIgnoreCase("Stock Transfer")){ Intent intent = new Intent(context, StockOutWordActivity.class);
Intent intent = new Intent(context, StockOutWordActivity.class); context.startActivity(intent);
context.startActivity(intent); return;
return; } else {
} else { Intent intent = new Intent(context, StockTransferActivity.class);
Intent intent = new Intent(context, StockTransferActivity.class); context.startActivity(intent);
context.startActivity(intent); return;
return; }
}
}); });
} }
...@@ -87,14 +86,14 @@ import java.util.ArrayList; ...@@ -87,14 +86,14 @@ import java.util.ArrayList;
} }
public class ViewHolder extends RecyclerView.ViewHolder { public class ViewHolder extends RecyclerView.ViewHolder {
public TextView menu_name; public TextView menu_name;
public ImageView menu_image; public ImageView menu_image;
public LinearLayout layout; public LinearLayout layout;
public ViewHolder(View itemView) { public ViewHolder(View itemView) {
super(itemView); super(itemView);
menu_name = itemView.findViewById(R.id.menu_name); menu_name = itemView.findViewById(R.id.menu_name);
menu_image = itemView.findViewById(R.id.menu_image); menu_image = itemView.findViewById(R.id.menu_image);
layout = itemView.findViewById(R.id.layout); layout = itemView.findViewById(R.id.layout);
} }
} }
} }
...@@ -4,7 +4,7 @@ package w.soulofpluto.posstock; ...@@ -4,7 +4,7 @@ package w.soulofpluto.posstock;
Create by Ramesh Babu Create by Ramesh Babu
*/ */
public class Model { public class Model {
private String delivery_slip_id; private String delivery_slip_id;
private int manual_discount; private int manual_discount;
...@@ -12,16 +12,19 @@ public class Model { ...@@ -12,16 +12,19 @@ public class Model {
this.delivery_slip_id = Id; this.delivery_slip_id = Id;
this.manual_discount = discount; this.manual_discount = discount;
} }
public String getDelivery_slip_id() { public String getDelivery_slip_id() {
return delivery_slip_id; return delivery_slip_id;
} }
public void setDelivery_slip_id(String delivery_slip_id) { public void setDelivery_slip_id(String delivery_slip_id) {
this.delivery_slip_id = delivery_slip_id; this.delivery_slip_id = delivery_slip_id;
} }
public int getManual_discount() { public int getManual_discount() {
return manual_discount; return manual_discount;
} }
public void setManual_discount(int manual_discount) { public void setManual_discount(int manual_discount) {
this.manual_discount = manual_discount; this.manual_discount = manual_discount;
} }
} }
...@@ -119,20 +119,20 @@ public class PlanDetails extends AppCompatActivity implements View.OnClickListen ...@@ -119,20 +119,20 @@ public class PlanDetails extends AppCompatActivity implements View.OnClickListen
} }
public void PiecesClicked(View view){ public void PiecesClicked(View view){
boolean checked = ((RadioButton) view).isChecked(); boolean checked = ((RadioButton) view).isChecked();
switch(view.getId()){ switch(view.getId()){
case R.id.pieces: case R.id.pieces:
if(checked){ if(checked){
status = true; status = true;
qty.setVisibility(View.INVISIBLE); qty.setVisibility(View.INVISIBLE);
dummy_qty.setVisibility(View.INVISIBLE); dummy_qty.setVisibility(View.INVISIBLE);
barcode.setText(""); barcode.setText("");
}else{ }else{
status = false; status = false;
qty.setVisibility(View.VISIBLE); qty.setVisibility(View.VISIBLE);
dummy_qty.setVisibility(View.VISIBLE); dummy_qty.setVisibility(View.VISIBLE);
} }
break; break;
} }
} }
...@@ -141,14 +141,14 @@ public class PlanDetails extends AppCompatActivity implements View.OnClickListen ...@@ -141,14 +141,14 @@ public class PlanDetails extends AppCompatActivity implements View.OnClickListen
switch (view.getId()){ switch (view.getId()){
case R.id.meters: case R.id.meters:
if(checked){ if(checked){
status = false; status = false;
qty.setVisibility(View.VISIBLE); qty.setVisibility(View.VISIBLE);
dummy_qty.setVisibility(View.VISIBLE); dummy_qty.setVisibility(View.VISIBLE);
barcode.setText(""); barcode.setText("");
}else{ }else{
status = true; status = true;
qty.setVisibility(View.INVISIBLE); qty.setVisibility(View.INVISIBLE);
dummy_qty.setVisibility(View.INVISIBLE); dummy_qty.setVisibility(View.INVISIBLE);
} }
break; break;
} }
...@@ -643,11 +643,11 @@ public class PlanDetails extends AppCompatActivity implements View.OnClickListen ...@@ -643,11 +643,11 @@ public class PlanDetails extends AppCompatActivity implements View.OnClickListen
if(obj.has(getResources().getString(R.string.success))){ if(obj.has(getResources().getString(R.string.success))){
if(obj.getInt(getResources().getString(R.string.success)) == 1 ){ if(obj.getInt(getResources().getString(R.string.success)) == 1 ){
JSONObject data = obj.getJSONObject(getResources().getString(R.string.data)); JSONObject data = obj.getJSONObject(getResources().getString(R.string.data));
preferenceManager.setUserId(data.getString(getResources().getString(R.string.empid))); preferenceManager.setUserId (data.getString(getResources().getString(R.string.empid)));
preferenceManager.setCustToken(data.getString(getResources().getString(R.string.usertoken))); preferenceManager.setCustToken(data.getString(getResources().getString(R.string.usertoken)));
preferenceManager.setStoreId(data.getString(getResources().getString(R.string.storeid))); preferenceManager.setStoreId(data.getString(getResources().getString(R.string.storeid)));
preferenceManager.setPrefix(data.getString(getResources().getString(R.string.prefix))); preferenceManager.setPrefix (data.getString(getResources().getString(R.string.prefix)));
preferenceManager.setLogged(true); preferenceManager.setLogged (true);
dialog.dismiss(); dialog.dismiss();
}else{ }else{
Toast.makeText(PlanDetails.this,obj.getString(getResources().getString(R.string.msg)), Toast.LENGTH_SHORT).show(); Toast.makeText(PlanDetails.this,obj.getString(getResources().getString(R.string.msg)), Toast.LENGTH_SHORT).show();
......
...@@ -15,7 +15,6 @@ import android.widget.ArrayAdapter; ...@@ -15,7 +15,6 @@ import android.widget.ArrayAdapter;
import android.widget.EditText; import android.widget.EditText;
import android.widget.Spinner; import android.widget.Spinner;
import android.widget.TextView; import android.widget.TextView;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
...@@ -35,9 +34,10 @@ import java.util.concurrent.TimeUnit; ...@@ -35,9 +34,10 @@ import java.util.concurrent.TimeUnit;
import static w.soulofpluto.posstock.Constants.JSON; import static w.soulofpluto.posstock.Constants.JSON;
import static w.soulofpluto.posstock.Constants.getDateWithOffset; import static w.soulofpluto.posstock.Constants.getDateWithOffset;
/* /*
Create by Ramesh Babu Create by Ramesh Babu
*/ */
public class SearchByBarcode extends AppCompatActivity implements AdapterView.OnItemSelectedListener { public class SearchByBarcode extends AppCompatActivity implements AdapterView.OnItemSelectedListener {
Toolbar searchbybarcode_toolbar; Toolbar searchbybarcode_toolbar;
Spinner searchbybarcode_spinner; Spinner searchbybarcode_spinner;
...@@ -87,7 +87,7 @@ import static w.soulofpluto.posstock.Constants.getDateWithOffset; ...@@ -87,7 +87,7 @@ import static w.soulofpluto.posstock.Constants.getDateWithOffset;
object.put(getResources().getString(R.string.android_version),Constants.VERSION); object.put(getResources().getString(R.string.android_version),Constants.VERSION);
} }
}catch(JSONException e){ }catch(JSONException e){
e.printStackTrace(); e.printStackTrace();
} }
Log.e("Search", object.toString()); Log.e("Search", object.toString());
RequestBody body = RequestBody.create(JSON, object.toString()); RequestBody body = RequestBody.create(JSON, object.toString());
......
...@@ -27,7 +27,10 @@ public class SplashActivity extends AppCompatActivity{ ...@@ -27,7 +27,10 @@ public class SplashActivity extends AppCompatActivity{
FirebaseApp.initializeApp(this); FirebaseApp.initializeApp(this);
FirebaseCrashlytics.getInstance().setCrashlyticsCollectionEnabled(true); FirebaseCrashlytics.getInstance().setCrashlyticsCollectionEnabled(true);
if(bluetoothAdapter!=null && bluetoothAdapter.isEnabled()){
runOnUiThread(() -> splashMethod());
/* if(bluetoothAdapter!=null && bluetoothAdapter.isEnabled()){
runOnUiThread(() -> splashMethod()); runOnUiThread(() -> splashMethod());
}else{ }else{
try{ try{
...@@ -35,7 +38,7 @@ public class SplashActivity extends AppCompatActivity{ ...@@ -35,7 +38,7 @@ public class SplashActivity extends AppCompatActivity{
}catch(Exception e){ }catch(Exception e){
e.printStackTrace(); e.printStackTrace();
} }
} }*/
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
} }
......
...@@ -19,7 +19,8 @@ import static w.soulofpluto.posstock.StockReceived.startData; ...@@ -19,7 +19,8 @@ import static w.soulofpluto.posstock.StockReceived.startData;
public class StockTransferActivity extends AppCompatActivity { public class StockTransferActivity extends AppCompatActivity {
EditText tfs_number; EditText tfs_number;
Toolbar StockTransfer_toolbar; Toolbar StockTransfer_toolbar;
@Override @Override
protected void onCreate(@Nullable Bundle savedInstanceState) { protected void onCreate(@Nullable Bundle savedInstanceState) {
setContentView(R.layout.activity_stock_transfer); setContentView(R.layout.activity_stock_transfer);
...@@ -63,6 +64,8 @@ public class StockTransferActivity extends AppCompatActivity { ...@@ -63,6 +64,8 @@ public class StockTransferActivity extends AppCompatActivity {
if (Constants.isNetworkAvailable(StockTransferActivity.this)) { if (Constants.isNetworkAvailable(StockTransferActivity.this)) {
startData(StockTransferActivity.this,val.toString().replace("\n","")); startData(StockTransferActivity.this,val.toString().replace("\n",""));
tfs_number.setText(""); tfs_number.setText("");
//tfs_number.requestFocus();
//return;
} }
} }
} else { } else {
......
...@@ -67,8 +67,8 @@ ...@@ -67,8 +67,8 @@
<string name="apply_promotion">apply_promotion_on_scan</string> <string name="apply_promotion">apply_promotion_on_scan</string>
<string name="qty_name">quantity</string> <string name="qty_name">quantity</string>
<string name="items">delivery_slip_items</string> <string name="items">delivery_slip_items</string>
<string name="stock_transfer">Stock Transfer</string> <string name="stock_transfer">Stock Recieved</string>
<string name="stock_out">Stock Out</string> <string name="stock_out">Stock Transfer</string>
<string name="stock_received">Stock Received</string> <string name="stock_received">Stock Received</string>
<string name="create_title">Create Delivery Slip</string> <string name="create_title">Create Delivery Slip</string>
<string name="resolve_promotions">Resolve Promotions</string> <string name="resolve_promotions">Resolve Promotions</string>
......
...@@ -5,7 +5,7 @@ buildscript { ...@@ -5,7 +5,7 @@ buildscript {
jcenter() jcenter()
} }
dependencies { dependencies {
classpath "com.android.tools.build:gradle:4.0.1" classpath "com.android.tools.build:gradle:7.2.1"
classpath 'com.google.gms:google-services:4.3.10' classpath 'com.google.gms:google-services:4.3.10'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.7.1' classpath 'com.google.firebase:firebase-crashlytics-gradle:2.7.1'
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
......
#Wed Jan 27 12:34:28 IST 2021 #Tue Oct 03 13:32:00 IST 2023
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
@rem
@rem Copyright 2015 the original author or authors.
@rem
@rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
@rem https://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@if "%DEBUG%" == "" @echo off @if "%DEBUG%" == "" @echo off
@rem ########################################################################## @rem ##########################################################################
@rem @rem
...@@ -13,15 +29,18 @@ if "%DIRNAME%" == "" set DIRNAME=. ...@@ -13,15 +29,18 @@ if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0 set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME% set APP_HOME=%DIRNAME%
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS= set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
@rem Find java.exe @rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1 %JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto init if "%ERRORLEVEL%" == "0" goto execute
echo. echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
...@@ -35,7 +54,7 @@ goto fail ...@@ -35,7 +54,7 @@ goto fail
set JAVA_HOME=%JAVA_HOME:"=% set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto init if exist "%JAVA_EXE%" goto execute
echo. echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
...@@ -45,28 +64,14 @@ echo location of your Java installation. ...@@ -45,28 +64,14 @@ echo location of your Java installation.
goto fail goto fail
:init
@rem Get command-line arguments, handling Windows variants
if not "%OS%" == "Windows_NT" goto win9xME_args
:win9xME_args
@rem Slurp the command line arguments.
set CMD_LINE_ARGS=
set _SKIP=2
:win9xME_args_slurp
if "x%~1" == "x" goto execute
set CMD_LINE_ARGS=%*
:execute :execute
@rem Setup the command line @rem Setup the command line
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle @rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
:end :end
@rem End local scope for the variables with windows NT shell @rem End local scope for the variables with windows NT shell
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment