完善打印机和地磅测试。wz

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

app/src/main/AndroidManifest.xml

@@ -1,15 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.jda.app.main">
-    <!-- 项目包名 -->
+
     <application
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
+        <activity android:name=".view.activity.PrinterTestActivity">
+            <intent-filter>
+                <action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.media.action.IMAGE_CAPTURE" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+        <activity android:name=".view.activity.DemoActivity"></activity>
         <activity
-            android:name=".view.activity.NfcManageActivity"
+            android:name=".view.activity.NfcTestActivity"
             android:launchMode="singleTop">
             <intent-filter>
                 <action android:name="android.nfc.action.TAG_DISCOVERED" />
@@ -28,8 +38,14 @@
             </intent-filter>
         </activity>
     </application>
+
+    <uses-feature android:name="android.hardware.usb.host" />
+
     <uses-feature
         android:name="android.hardware.nfc"
         android:required="true" />
+
     <uses-permission android:name="android.permission.NFC" />
+    <uses-permission android:name="android.permission.CAMERA" />
+
 </manifest>

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);
+    }
+
+}

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<ILoginContract.View, ILoginContract.Presenter> 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<ILoginContract.View, ILoginCon
 
     @Override
     protected void initView(Bundle savedInstanceState) {
-        et_card_num.setOnKeyListener(new View.OnKeyListener() {
+        bt_check_rs232.setOnClickListener(new View.OnClickListener() {
             @Override
-            public boolean onKey(View v, int keyCode, KeyEvent event) {
-                if(keyCode==KeyEvent.KEYCODE_ENTER){
-                    getMvpPresenter().getUserInfo(LoginActivity.this,et_card_num.getText().toString());
-                    return true;
-                }
-                return false;
+            public void onClick(View v) {
+                startActivity(new Intent(LoginActivity.this, DemoActivity.class));
+            }
+        });
+        bt_check_card.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                startActivity(new Intent(LoginActivity.this, PrinterTestActivity.class));
             }
         });
     }
 
+
     @Override
     protected void initData() {
     }

app/src/main/java/com/jda/app/main/view/activity/NfcManageActivity.java → app/src/main/java/com/jda/app/main/view/activity/NfcTestActivity.java

@@ -10,7 +10,6 @@ import android.nfc.tech.MifareClassic;
 import android.nfc.tech.Ndef;
 import android.nfc.tech.NfcA;
 import android.os.Bundle;
-import android.util.Log;
 import android.widget.EditText;
 
 import com.common.utils.ToastUtil;
@@ -26,7 +25,7 @@ import butterknife.BindView;
  * <p>
  * 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,

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<String, String> 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", "打印失败");
+                    }
+                }
+            }
+        });
+    }
+
+}

app/src/main/res/layout/activity_login.xml

@@ -1,128 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="#FFFFFF">
 
-    <ImageView
-        android:id="@+id/mImgExit"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:padding="@dimen/dp_15"
-        android:src="@drawable/ic_login_exit" />
-
-    <TextView
-        android:id="@+id/mTxtTitle"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_40"
-        android:layout_marginTop="@dimen/dp_30"
-        android:gravity="bottom"
-        android:paddingLeft="@dimen/dp_40"
-        android:text="登录"
-        android:textColor="@color/cl_333333"
-        android:textSize="24sp"
-        android:textStyle="bold" />
-
-
-    <RelativeLayout
-        android:id="@+id/mLayoutMobile"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_60"
-        android:layout_below="@+id/mTxtTitle"
-        android:layout_marginTop="@dimen/dp_10"
-        android:paddingLeft="@dimen/dp_40"
-        android:paddingRight="@dimen/dp_40">
-
-        <EditText
-            android:id="@+id/mEdtMobile"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_32"
-            android:layout_centerVertical="true"
-            android:layout_marginRight="@dimen/dp_20"
-            android:background="@drawable/shape_input_area_white_bottomline"
-            android:hint="请输入账号"
-            android:inputType="phone"
-            android:maxLength="11"
-            android:paddingLeft="@dimen/dp_8"
-            android:paddingRight="@dimen/dp_8"
-            android:textSize="@dimen/sp_16" />
-<!--        android:layout_toLeftOf="@+id/mBtnSmsCode"-->
-
-<!--        <com.jda.app.main.widget.CountDownButton-->
-<!--            android:id="@+id/mBtnSmsCode"-->
-<!--            android:layout_width="@dimen/dp_100"-->
-<!--            android:layout_height="@dimen/dp_32"-->
-<!--            android:layout_alignParentRight="true"-->
-<!--            android:layout_centerVertical="true"-->
-<!--            android:background="@drawable/bg_ffffff_666666_5"-->
-<!--            android:clickable="true"-->
-<!--            android:gravity="center"-->
-<!--            android:text="获取验证码"-->
-<!--            android:textColor="@color/cl_666666"-->
-<!--            android:textSize="@dimen/sp_14" />-->
-    </RelativeLayout>
-
-    <RelativeLayout
-        android:id="@+id/mLayoutSmscode"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/mLayoutMobile"
-        android:layout_marginTop="@dimen/sp_12"
-        android:focusable="true"
-        android:paddingLeft="@dimen/dp_40"
-        android:paddingRight="@dimen/dp_40">
-
-        <EditText
-            android:id="@+id/et_pwd"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_32"
-            android:layout_centerVertical="true"
-            android:layout_marginRight="@dimen/dp_20"
-            android:background="@drawable/shape_input_area_white_bottomline"
-            android:hint="请输入密码"
-            android:inputType="textPassword"
-            android:maxLength="11"
-            android:paddingLeft="@dimen/dp_8"
-            android:paddingRight="@dimen/dp_8"
-            android:textSize="@dimen/sp_16" />
-
-    </RelativeLayout>
-
-
-    <Button
-        android:id="@+id/mBtnLogin"
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_44"
-        android:layout_below="@id/mLayoutSmscode"
-        android:layout_centerHorizontal="true"
-        android:layout_marginLeft="@dimen/dp_32"
-        android:layout_marginRight="@dimen/dp_32"
-        android:layout_marginTop="@dimen/dp_48"
-        android:background="@drawable/shape_button_normal"
-        android:enabled="false"
-        android:text="登录"
-        android:textColor="@color/white"
-        android:textSize="@dimen/sp_18" />
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:orientation="vertical">
 
-    <LinearLayout
-        android:id="@+id/mLayoutProtocol"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/mBtnLogin"
-        android:layout_centerHorizontal="true"
-        android:layout_marginBottom="@dimen/dp_40"
-        android:layout_marginTop="@dimen/dp_20">
-        <Button
-            android:id="@+id/bt_check_env"
+        <LinearLayout
+            android:id="@+id/mLayoutProtocol"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:background="@color/transparent"
-            android:gravity="center"
-            android:text="设备检测"
-            android:textColor="@color/color_4476f0"
-            android:textSize="@dimen/sp_12" />
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="@dimen/dp_20"
+            android:layout_marginBottom="@dimen/dp_40"
+            android:orientation="vertical">
+
+            <Button
+                android:id="@+id/bt_check_rs232"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@color/transparent"
+                android:gravity="center"
+                android:text="串口和RFID卡测试"
+                android:textColor="@color/color_4476f0"
+                android:textSize="@dimen/sp_12" />
+
+            <Button
+                android:id="@+id/bt_check_card"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@color/transparent"
+                android:gravity="center"
+                android:text="打印机测试"
+                android:textColor="@color/color_4476f0"
+                android:textSize="@dimen/sp_12" />
+        </LinearLayout>
+
     </LinearLayout>
-</RelativeLayout>
+</ScrollView>

app/src/main/res/layout/activity_pound_machine.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+    <TextView
+        android:id="@+id/tv_num"
+        android:textSize="@dimen/dp_40"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:hint="0.0"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="@dimen/dp_20"/>
+    <TextView
+        android:id="@+id/tv_hint"
+        android:textSize="@dimen/dp_20"
+        android:layout_width="match_parent"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:layout_height="wrap_content"
+        android:padding="@dimen/dp_20"
+        android:hint="等待地磅"
+        android:textColor="@color/color_4476f0" />
+    <TextView
+        android:id="@+id/tv_ic_card"
+        android:textSize="@dimen/dp_20"
+        android:layout_width="match_parent"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:layout_height="wrap_content"
+        android:padding="@dimen/dp_20"
+        android:hint="用户信息"
+        android:textColor="@color/color_4476f0" />
+</LinearLayout>

app/src/main/res/layout/activity_test_print.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:orientation="vertical"
+    android:gravity="center"
+    android:layout_height="match_parent"
+    tools:context="com.jda.app.main.view.activity.PrinterTestActivity">
+    <Button
+        android:id="@+id/bt"
+        android:text="打印"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+</LinearLayout>

app/src/main/res/layout/item_pound_msg.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+    <TextView
+        android:id="@+id/tv_info"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+</LinearLayout>

config.gradle

@@ -94,7 +94,8 @@ ext {
             //进度条
             progress_manager         : '1.5.0',
             //微信Sdk
-            wechat_sdk               : 'wechat-sdk-android-without-mta:+'
+            wechat_sdk               : 'wechat-sdk-android-without-mta:+',
+
 
     ]