diff --git a/app/build.gradle b/app/build.gradle index 7d92b71..0ab8ac1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -76,6 +76,8 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) api project(':common') implementation dependencie.support_v4 + implementation("com.github.547394:SerialPortManager:1.0.10") + implementation 'com.android.support.constraint:constraint-layout:2.0.4' annotationProcessor dependencie.butterknife_compiler //v7包和v4包 api dependencie.appcompat_v7 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 6be6edc..9213c26 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,15 +1,25 @@ - + + + + + + + + + + + @@ -28,8 +38,14 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/jda/app/main/view/activity/DemoActivity.java b/app/src/main/java/com/jda/app/main/view/activity/DemoActivity.java new file mode 100644 index 0000000..be8962e --- /dev/null +++ b/app/src/main/java/com/jda/app/main/view/activity/DemoActivity.java @@ -0,0 +1,65 @@ +package com.jda.app.main.view.activity; +import com.jda.app.main.R; + +import com.jda.app.main.utils.PoundManager; +import android.graphics.Color; +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; +import android.view.KeyEvent; +import android.widget.TextView; +public class DemoActivity extends AppCompatActivity { + TextView tv_hint; + TextView tv_num; + TextView tv_ic_card; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_pound_machine); + initView(); + initListener(); + } + + private void initListener() { + PoundManager.getInstance().setPoundStatusListener(new PoundManager.PoundStatusListener() { + @Override + public void onTick(double lastValidWeightNum, PoundManager.PoundStatus status) { + runOnUiThread(new Runnable() { + @Override + public void run() { + tv_num.setText(String.valueOf(lastValidWeightNum)); + tv_hint.setText(status.getStatusStr()); + tv_num.setTextColor(status == PoundManager.PoundStatus.STABLE ? Color.rgb(0, 255, 0) : Color.rgb(255, 0, 0)); + tv_hint.setTextColor(status == PoundManager.PoundStatus.STABLE ? Color.rgb(0, 255, 0) : Color.rgb(255, 0, 0)); + } + }); + } + }).init(); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + PoundManager.getInstance().onDestroy(); + } + + StringBuilder temStringBuilder = new StringBuilder(); + + @Override + public boolean onKeyDown(int keyCode, KeyEvent event) { + if (keyCode == KeyEvent.KEYCODE_ENTER) { + tv_ic_card.setText("用户信息："+temStringBuilder.toString()); + temStringBuilder = new StringBuilder(); + return true; + } + temStringBuilder.append(event.getKeyCode()); + return false; + } + + private void initView() { + tv_hint = findViewById(R.id.tv_hint); + tv_num = findViewById(R.id.tv_num); + tv_ic_card = findViewById(R.id.tv_ic_card); + } + +} diff --git a/app/src/main/java/com/jda/app/main/view/activity/LoginActivity.java b/app/src/main/java/com/jda/app/main/view/activity/LoginActivity.java index c1b6255..fba978c 100644 --- a/app/src/main/java/com/jda/app/main/view/activity/LoginActivity.java +++ b/app/src/main/java/com/jda/app/main/view/activity/LoginActivity.java @@ -7,11 +7,11 @@ import com.jda.app.main.contract.ILoginContract; import com.jda.app.main.model.bean.UserInfoBean; import com.jda.app.main.presenter.LoginPresenter; +import android.content.Intent; import android.os.Bundle; -import android.view.KeyEvent; import android.view.View; import android.widget.Button; -import android.widget.EditText; +import android.widget.TextView; import butterknife.BindView; @@ -23,11 +23,10 @@ import butterknife.BindView; @CreatePresenterAnnotation(LoginPresenter.class) public class LoginActivity extends JdaMvpActivity implements ILoginContract.View { - @BindView(R.id.et_card_num) - EditText et_card_num; - @BindView(R.id.bt_check_env) - Button bt_check_env; - + @BindView(R.id.bt_check_rs232) + Button bt_check_rs232; + @BindView(R.id.bt_check_card) + Button bt_check_card; @Override public int setLayoutId() { @@ -36,18 +35,21 @@ public class LoginActivity extends JdaMvpActivity * Description: */ -public class NfcManageActivity extends JdaSimpleActivity { +public class NfcTestActivity extends JdaSimpleActivity { @BindView(R.id.et_card_num) EditText et_card_num; String strCardNum; @@ -54,10 +53,10 @@ public class NfcManageActivity extends JdaSimpleActivity { // 获取nfc适配器，判断设备是否支持NFC功能 nfcAdapter = NfcAdapter.getDefaultAdapter(this); if (nfcAdapter == null) { - ToastUtil.showShort(NfcManageActivity.this, "当前设备不支持NFC功能"); + ToastUtil.showShort(NfcTestActivity.this, "当前设备不支持NFC功能"); return; } else if (!nfcAdapter.isEnabled()) { - ToastUtil.showShort(NfcManageActivity.this, "NFC功能未打开，请先开启后重试！"); + ToastUtil.showShort(NfcTestActivity.this, "NFC功能未打开，请先开启后重试！"); return; } pendingIntent = PendingIntent.getActivity(this, 0, new Intent(this, diff --git a/app/src/main/java/com/jda/app/main/view/activity/PrinterTestActivity.java b/app/src/main/java/com/jda/app/main/view/activity/PrinterTestActivity.java new file mode 100644 index 0000000..4a7e0f4 --- /dev/null +++ b/app/src/main/java/com/jda/app/main/view/activity/PrinterTestActivity.java @@ -0,0 +1,83 @@ +package com.jda.app.main.view.activity; + +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; +import android.util.Log; +import android.view.View; +import android.widget.Button; +import com.jda.app.main.R; +import com.jda.app.main.utils.PrinterManager; +import java.util.LinkedHashMap; +import java.util.Map; + +public class PrinterTestActivity extends AppCompatActivity { + Button bt; + PrinterManager printerManager; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_test_print); + initView(); + intListener(); + } + + @Override + protected void onResume() { + super.onResume(); + printerManager.registerListener(this); + } + + @Override + protected void onPause() { + super.onPause(); + printerManager.unregisterListener(this); + } + + private void initView() { + bt = findViewById(R.id.bt); + } + + private void intListener() { + printerManager = PrinterManager.getInstance(); + printerManager.setPrinterStatusListener(new PrinterManager.PrinterStatusListener() { + @Override + public void onStatusChange(PrinterManager.PrinterStatus status) { + + } + }); + printerManager.open(this); + + + bt.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + + Map map = new LinkedHashMap<>(); + map.put("磅单号", "202101210002"); + map.put("人员编号", "1020210231"); + map.put("供货人", "老王"); + map.put("车牌", "粤A34HH4"); + map.put("进场日期", "2021-1-30"); + map.put("出厂日期", "2021-1-31"); + map.put("产品类型", "黄纸皮"); + map.put("毛重(KG)", "140.0"); + map.put("皮重(KG)", "70.0"); + map.put("净重(KG)", "70.0"); + map.put("扣重(KG)", "0.0"); + map.put("扣点", "0.0"); + map.put("单价(元/KG)", "1.8"); + map.put("金额(元)", "26.0"); + if (printerManager.getPrinterStatus() == PrinterManager.PrinterStatus.CONNECTED) { + boolean result = printerManager.printData("千鸟互联钟落潭工厂", map); + if (result) { + Log.v("wztest", "打印成功"); + } else { + Log.v("wztest", "打印失败"); + } + } + } + }); + } + +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index c8e5c76..724b72d 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -1,128 +1,46 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -