Browse Source

删除不需要的类

plate
fyf 1 year ago
parent
commit
3e7e9b35f6
7 changed files with 4 additions and 65 deletions
  1. +1
    -0
      .idea/gradle.xml
  2. +0
    -6
      app/src/main/java/com/bpa/scalage/MainActivity.java
  3. +2
    -6
      app/src/main/java/com/bpa/scalage/MenuSelectionActivity.java
  4. +0
    -1
      app/src/main/java/com/bpa/scalage/control/FruitAdapter.java
  5. +0
    -1
      app/src/main/java/com/bpa/scalage/data/DataBus.java
  6. +0
    -50
      app/src/main/java/com/bpa/scalage/mode/Fruit.java
  7. +1
    -1
      app/src/main/java/com/bpa/scalage/pagefragment/SystemDebugFragment.java

+ 1
- 0
.idea/gradle.xml View File

@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="GradleMigrationSettings" migrationVersion="1" />
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>


+ 0
- 6
app/src/main/java/com/bpa/scalage/MainActivity.java View File

@@ -1,11 +1,8 @@
package com.bpa.scalage;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
import android.app.AlertDialog;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import android.preference.PreferenceManager;
import android.util.Log;
import android.view.View;
@@ -17,15 +14,12 @@ import android.widget.TextView;
import com.bpa.scalage.app.Main;
import com.bpa.scalage.config.ConfigName;
import com.bpa.scalage.config.MessageName;
import com.bpa.scalage.control.FruitAdapter;
import com.bpa.scalage.data.DataBus;
import com.bpa.scalage.helper.ByteHelper;
import com.bpa.scalage.helper.HttpUtils;
import com.bpa.scalage.helper.Json;
import com.bpa.scalage.message.MessageLooper;
import com.bpa.scalage.message.MessageManager;
import com.bpa.scalage.mode.Foods.FoodModel;
import com.bpa.scalage.mode.Fruit;
import com.bpa.scalage.mode.Usermode;
import com.bpa.scalage.helper.T;
import com.lztek.toolkit.SerialPort;


+ 2
- 6
app/src/main/java/com/bpa/scalage/MenuSelectionActivity.java View File

@@ -1,14 +1,10 @@
package com.bpa.scalage;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;

import android.app.Activity;
import android.app.AlertDialog;
import android.content.DialogInterface;
import android.content.Intent;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import android.view.View;
import android.widget.AdapterView;
import android.widget.EditText;
@@ -23,14 +19,12 @@ import com.bpa.scalage.control.CustomDialog;
import com.bpa.scalage.control.FruitAdapter;
import com.bpa.scalage.control.MyAdapter;
import com.bpa.scalage.data.DataBus;
import com.bpa.scalage.helper.HttpUtils;
import com.bpa.scalage.helper.Json;
import com.bpa.scalage.message.MessageLooper;
import com.bpa.scalage.message.MessageManager;
import com.bpa.scalage.mode.Food;
import com.bpa.scalage.mode.Foods.FoodTypes;
import com.bpa.scalage.mode.Foods.ReceiveModel;
import com.bpa.scalage.mode.Fruit;
import com.bpa.scalage.helper.T;
import java.util.ArrayList;
import java.util.List;
@@ -196,6 +190,8 @@ public class MenuSelectionActivity extends AppCompatActivity{
});
ItemClick(null,null,0,0);
}

title.setText(ConfigName.getInstance().Shop_Name);
}
});
}


+ 0
- 1
app/src/main/java/com/bpa/scalage/control/FruitAdapter.java View File

@@ -13,7 +13,6 @@ import androidx.annotation.Nullable;
import android.widget.Button;

import com.bpa.scalage.mode.Foods.FoodModel;
import com.bpa.scalage.mode.Fruit;
import com.bpa.scalage.MainActivity;
import com.bpa.scalage.R;
import com.bpa.scalage.data.DataBus;


+ 0
- 1
app/src/main/java/com/bpa/scalage/data/DataBus.java View File

@@ -4,7 +4,6 @@ import android.content.Context;

import com.bpa.scalage.mode.Foods.FoodModel;
import com.bpa.scalage.mode.Foods.FoodTypes;
import com.bpa.scalage.mode.Fruit;
import com.bpa.scalage.mode.Usermode;

import java.util.ArrayList;


+ 0
- 50
app/src/main/java/com/bpa/scalage/mode/Fruit.java View File

@@ -1,50 +0,0 @@
package com.bpa.scalage.mode;

/**
* 商品Model
*/
public class Fruit {
private boolean isAffiliate;
//商品id
private String id;
//商品图标
private int imageID;
private String imageUrl;
//商品名称
private String name;
//商品价格
private double price;
//商品最小计算单位 50g
private int unit;

public Boolean getIsAffiliate() {
return isAffiliate;
}

public String getID() {
return id;
}
public int getImageID() { return imageID; }
public String getimageUrl() { return imageUrl; }


public String getName() {
return name;
}
public double getPrice() {
return price;
}

public int getUnit() {
return unit;
}
public Fruit(String ID,int imageID, String name, double price,int unit,Boolean IsAffiliate,String imageUrl) {
this.id = ID;
this.imageID = imageID;
this.name = name;
this.price = price;
this.unit = unit;
this.isAffiliate=IsAffiliate;
this.imageUrl=imageUrl;
}
}

+ 1
- 1
app/src/main/java/com/bpa/scalage/pagefragment/SystemDebugFragment.java View File

@@ -215,7 +215,6 @@ public class SystemDebugFragment extends Fragment {
Integer.valueOf(Plate_Com_Port.getSelectedItem().toString()).intValue(),
Plate_Com_Format.getSelectedItem().toString())){
api.PC_OpenDevice(rFRead);
ReadCraK();
if(api.PC_OpenAnt_One(rFRead, (byte) 1))
{
mCartRunning=true;
@@ -230,6 +229,7 @@ public class SystemDebugFragment extends Fragment {
T.show(MainView.getContext(), "打开读卡Cart串口失败!");
SetcpMsIck();
}
ReadCraK();
}else
{
if(mCartRunning)


Loading…
Cancel
Save