diff --git a/app/build.gradle b/app/build.gradle index 6b98ff7..41cc980 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -34,15 +34,19 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.0.2' implementation 'androidx.constraintlayout:constraintlayout:1.1.3' implementation 'androidx.recyclerview:recyclerview:1.1.0' + implementation files('libs\\App_Demo_API.jar') + implementation files('libs\\DeviceAPIver20150204.jar') +// implementation files('libs\\jxl.jar') + implementation files('libs\\logutil-1.5.1.1.jar') + implementation files('libs\\reader(1).jar') + implementation files('libs\\UHF67_v3.6.jar') + implementation files('libs\\ModuleAPI_J.jar') + testImplementation 'junit:junit:4.12' androidTestImplementation 'androidx.test.ext:junit:1.1.0' androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' implementation 'com.jakewharton:butterknife:10.2.0' annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.0' -// implementation files('libs\\uhf_r_v1.0.jar') - implementation files('libs\\uhfr_v1.8.jar') - implementation files('libs\\ModuleAPI_J.jar') - implementation files('libs\\jxl.jar') implementation 'org.litepal.guolindev:core:3.2.3' implementation 'com.google.android.material:material:1.2.1' } diff --git a/app/libs/App_Demo_API.jar b/app/libs/App_Demo_API.jar new file mode 100644 index 0000000..86e2275 Binary files /dev/null and b/app/libs/App_Demo_API.jar differ diff --git a/app/libs/DeviceAPIver20150204.jar b/app/libs/DeviceAPIver20150204.jar new file mode 100644 index 0000000..defdeb1 Binary files /dev/null and b/app/libs/DeviceAPIver20150204.jar differ diff --git a/app/libs/ModuleAPI_J.jar b/app/libs/ModuleAPI_J.jar index b231d74..81c554f 100644 Binary files a/app/libs/ModuleAPI_J.jar and b/app/libs/ModuleAPI_J.jar differ diff --git a/app/libs/UHF67_v3.6.jar b/app/libs/UHF67_v3.6.jar new file mode 100644 index 0000000..d88dc29 Binary files /dev/null and b/app/libs/UHF67_v3.6.jar differ diff --git a/app/libs/jxl.jar b/app/libs/jxl.jar deleted file mode 100644 index daf1158..0000000 Binary files a/app/libs/jxl.jar and /dev/null differ diff --git a/app/libs/logutil-1.5.1.1.jar b/app/libs/logutil-1.5.1.1.jar new file mode 100644 index 0000000..59b3c16 Binary files /dev/null and b/app/libs/logutil-1.5.1.1.jar differ diff --git a/app/libs/reader(1).jar b/app/libs/reader(1).jar new file mode 100644 index 0000000..8179d15 Binary files /dev/null and b/app/libs/reader(1).jar differ diff --git a/app/libs/uhfr_v1.8.jar b/app/libs/uhfr_v1.8.jar deleted file mode 100644 index 44c1a70..0000000 Binary files a/app/libs/uhfr_v1.8.jar and /dev/null differ diff --git a/app/release/双箭 25年.apk b/app/release/双箭 新.apk similarity index 54% rename from app/release/双箭 25年.apk rename to app/release/双箭 新.apk index bd3b187..b294139 100644 Binary files a/app/release/双箭 25年.apk and b/app/release/双箭 新.apk differ diff --git a/app/src/main/java/com/example/hightschool/BaseActivity.java b/app/src/main/java/com/example/hightschool/BaseActivity.java index 498af87..ec5728d 100644 --- a/app/src/main/java/com/example/hightschool/BaseActivity.java +++ b/app/src/main/java/com/example/hightschool/BaseActivity.java @@ -1,16 +1,13 @@ package com.example.hightschool; -import androidx.appcompat.app.AppCompatActivity; - -import android.app.ProgressDialog; import android.media.MediaPlayer; import android.os.Bundle; -import android.view.Window; + +import androidx.appcompat.app.AppCompatActivity; import com.handheld.uhfr.UHFRManager; import java.util.Arrays; -import java.util.Collections; import java.util.List; import cn.pda.serialport.Tools; @@ -60,14 +57,7 @@ public class BaseActivity extends AppCompatActivity { } - @Override - protected void onDestroy() { - super.onDestroy(); -// if (uhfrManager!=null){ -// uhfrManager.close(); -// uhfrManager=null; -// } - } + diff --git a/app/src/main/java/com/example/hightschool/MainActivity.java b/app/src/main/java/com/example/hightschool/MainActivity.java index 725b7e7..bcfd1e3 100644 --- a/app/src/main/java/com/example/hightschool/MainActivity.java +++ b/app/src/main/java/com/example/hightschool/MainActivity.java @@ -6,35 +6,50 @@ import android.view.View; import androidx.appcompat.app.AppCompatActivity; +import com.handheld.uhfr.UHFRManager; + import butterknife.ButterKnife; import butterknife.OnClick; public class MainActivity extends AppCompatActivity { + private UHFRManager instance; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); ButterKnife.bind(this); + + instance = UHFRManager.getInstance(); + MyApp.setUhfrManager(instance); } - @OnClick({R.id.radioButton1, R.id.radioButton2,R.id.radioButton3}) + @OnClick({R.id.radioButton1, R.id.radioButton2, R.id.radioButton3}) public void onViewClicked(View view) { - Intent intent=null; + Intent intent = null; switch (view.getId()) { case R.id.radioButton1: - intent=new Intent(this, WriteActivity.class); + intent = new Intent(this, WriteActivity.class); break; case R.id.radioButton2: - intent=new Intent(this, ReedActivity.class); + intent = new Intent(this, ReedActivity.class); break; - case R.id.radioButton3: - intent=new Intent(this, InfoActivity.class); + case R.id.radioButton3: + intent = new Intent(this, InfoActivity.class); break; } - if (intent!=null) + if (intent != null) this.startActivity(intent); } + + @Override + protected void onDestroy() { + super.onDestroy(); + if (instance != null) { + instance.close(); + instance = null; + } + } } diff --git a/app/src/main/java/com/example/hightschool/MyApp.java b/app/src/main/java/com/example/hightschool/MyApp.java index 87ede69..a411492 100644 --- a/app/src/main/java/com/example/hightschool/MyApp.java +++ b/app/src/main/java/com/example/hightschool/MyApp.java @@ -20,13 +20,16 @@ public class MyApp extends Application { return uhfrManager; } + public static void setUhfrManager(UHFRManager uhfrManager) { + MyApp.uhfrManager = uhfrManager; + } + @Override public void onCreate() { super.onCreate(); - LitePal.initialize(this); - uhfrManager = UHFRManager.getInstance(); - uhfrManager.setPower(30, 30); + // uhfrManager = UHFRManager.getInstance(); + // uhfrManager.setPower(30, 30); SharedPreferencesUtils.init(getApplicationContext(), "myapp"); } diff --git a/app/src/main/java/com/example/hightschool/ReedActivity.java b/app/src/main/java/com/example/hightschool/ReedActivity.java index 9e4bbf4..e28b5de 100644 --- a/app/src/main/java/com/example/hightschool/ReedActivity.java +++ b/app/src/main/java/com/example/hightschool/ReedActivity.java @@ -62,9 +62,6 @@ public class ReedActivity extends BaseActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_reed); ButterKnife.bind(this); -// -// int[] i=uhfrManager.getPower(); -// Log.e("TAG", "onCreate:" + i[0]+"\n"+i[1]); } @Override @@ -81,9 +78,9 @@ public class ReedActivity extends BaseActivity { private void reedepc() { byte[] readBytes = new byte[14]; - if (uhfrManager == null) { - uhfrManager = MyApp.getUhfrManager(); - } + // if (uhfrManager == null) { + // uhfrManager = MyApp.getUhfrManager(); + // } Reader.READER_ERR reader_err = uhfrManager.getTagData(1, 2, 7, readBytes, accessBytes, (short) 1000); Log.e("TAG", "san_epc:" + reader_err); if (reader_err.toString().equals("MT_OK_ERR")) { @@ -136,7 +133,7 @@ public class ReedActivity extends BaseActivity { reedMonth.setText(Integer.parseInt(epc.substring(2, 3), 16) + ""); reedJitai.setText(epc.substring(3, 5)); reedDaiqiang.setText(dqs.get(Integer.parseInt(epc.substring(5, 7)) - 1)); - reedDaikuan.setText(dks.get(Integer.parseInt(epc.substring(7, 9))-1)); + reedDaikuan.setText(dks.get(Integer.parseInt(epc.substring(7, 9)) - 1)); reedShangjiaohoudu.setText(hds.get(Integer.parseInt(epc.substring(9, 11)) - 1)); reedXiajiaohoudu.setText(hds.get(Integer.parseInt(epc.substring(12, 14)) - 1)); reedGaijiaojibie.setText(jbs.get(Integer.parseInt(epc.substring(14, 16)) - 1)); @@ -144,9 +141,9 @@ public class ReedActivity extends BaseActivity { reedRfidshunxu.setText(epc.substring(18, 20)); reedJiange1.setText(epc.substring(20, 22)); reedJiange2.setText(epc.substring(22, 24)); - int data2426 = Integer.parseInt(epc.substring(24, 26))-1; + int data2426 = Integer.parseInt(epc.substring(24, 26)) - 1; reedSccj.setText(stringList1.get(data2426)); - int data2628 = Integer.parseInt(epc.substring(26, 28))-1; + int data2628 = Integer.parseInt(epc.substring(26, 28)) - 1; reedAzdd.setText(stringList2.get(data2628)); } catch (Exception e) { diff --git a/app/src/main/java/com/example/hightschool/test/uhf_r_v1.0.jar b/app/src/main/java/com/example/hightschool/test/uhf_r_v1.0.jar deleted file mode 100644 index 633acd0..0000000 Binary files a/app/src/main/java/com/example/hightschool/test/uhf_r_v1.0.jar and /dev/null differ diff --git a/app/src/main/jniLibs/arm64-v8a/libModuleAPIJni.so b/app/src/main/jniLibs/arm64-v8a/libModuleAPIJni.so index 4072ad2..9d41f26 100644 Binary files a/app/src/main/jniLibs/arm64-v8a/libModuleAPIJni.so and b/app/src/main/jniLibs/arm64-v8a/libModuleAPIJni.so differ diff --git a/app/src/main/jniLibs/arm64-v8a/libjni_rfid_driver.so b/app/src/main/jniLibs/arm64-v8a/libjni_rfid_driver.so new file mode 100644 index 0000000..6d66476 Binary files /dev/null and b/app/src/main/jniLibs/arm64-v8a/libjni_rfid_driver.so differ diff --git a/app/src/main/jniLibs/arm64-v8a/libserial_port.so b/app/src/main/jniLibs/arm64-v8a/libserial_port.so new file mode 100644 index 0000000..bbd2cce Binary files /dev/null and b/app/src/main/jniLibs/arm64-v8a/libserial_port.so differ diff --git a/app/src/main/jniLibs/armeabi-v7a/libModuleAPIJni.so b/app/src/main/jniLibs/armeabi-v7a/libModuleAPIJni.so index 7e07755..2a5bb73 100644 Binary files a/app/src/main/jniLibs/armeabi-v7a/libModuleAPIJni.so and b/app/src/main/jniLibs/armeabi-v7a/libModuleAPIJni.so differ diff --git a/app/src/main/jniLibs/armeabi-v7a/libSerialPort.so b/app/src/main/jniLibs/armeabi-v7a/libSerialPort.so index d7eb1f9..dc3c956 100644 Binary files a/app/src/main/jniLibs/armeabi-v7a/libSerialPort.so and b/app/src/main/jniLibs/armeabi-v7a/libSerialPort.so differ diff --git a/app/src/main/jniLibs/armeabi-v7a/libdevapi.so b/app/src/main/jniLibs/armeabi-v7a/libdevapi.so index 4ce4fc6..8a0ba8a 100644 Binary files a/app/src/main/jniLibs/armeabi-v7a/libdevapi.so and b/app/src/main/jniLibs/armeabi-v7a/libdevapi.so differ diff --git a/app/src/main/jniLibs/armeabi-v7a/libirdaSerialPort.so b/app/src/main/jniLibs/armeabi-v7a/libirdaSerialPort.so index d1c5202..b8a8974 100644 Binary files a/app/src/main/jniLibs/armeabi-v7a/libirdaSerialPort.so and b/app/src/main/jniLibs/armeabi-v7a/libirdaSerialPort.so differ diff --git a/app/src/main/jniLibs/armeabi-v7a/libjni_rfid_driver.so b/app/src/main/jniLibs/armeabi-v7a/libjni_rfid_driver.so new file mode 100644 index 0000000..4438c32 Binary files /dev/null and b/app/src/main/jniLibs/armeabi-v7a/libjni_rfid_driver.so differ diff --git a/app/src/main/jniLibs/armeabi-v7a/libserial_port.so b/app/src/main/jniLibs/armeabi-v7a/libserial_port.so new file mode 100644 index 0000000..f240561 Binary files /dev/null and b/app/src/main/jniLibs/armeabi-v7a/libserial_port.so differ diff --git a/app/src/main/jniLibs/armeabi/libModuleAPIJni.so b/app/src/main/jniLibs/armeabi/libModuleAPIJni.so index e837b9d..2a5bb73 100644 Binary files a/app/src/main/jniLibs/armeabi/libModuleAPIJni.so and b/app/src/main/jniLibs/armeabi/libModuleAPIJni.so differ diff --git a/app/src/main/jniLibs/armeabi/libdevapi.so b/app/src/main/jniLibs/armeabi/libdevapi.so index 4ce4fc6..5b7e0c7 100644 Binary files a/app/src/main/jniLibs/armeabi/libdevapi.so and b/app/src/main/jniLibs/armeabi/libdevapi.so differ diff --git a/app/src/main/jniLibs/armeabi/libjni_rfid_driver.so b/app/src/main/jniLibs/armeabi/libjni_rfid_driver.so new file mode 100644 index 0000000..4438c32 Binary files /dev/null and b/app/src/main/jniLibs/armeabi/libjni_rfid_driver.so differ diff --git a/app/src/main/jniLibs/armeabi/libserial_port.so b/app/src/main/jniLibs/armeabi/libserial_port.so new file mode 100644 index 0000000..f240561 Binary files /dev/null and b/app/src/main/jniLibs/armeabi/libserial_port.so differ diff --git a/app/src/main/res/layout/dialog_layout.xml b/app/src/main/res/layout/dialog_layout.xml index ee947b8..6fd5120 100644 --- a/app/src/main/res/layout/dialog_layout.xml +++ b/app/src/main/res/layout/dialog_layout.xml @@ -1,7 +1,7 @@ diff --git a/app/src/main/res/layout/dialog_layout1.xml b/app/src/main/res/layout/dialog_layout1.xml index 4e31e32..b417dd4 100644 --- a/app/src/main/res/layout/dialog_layout1.xml +++ b/app/src/main/res/layout/dialog_layout1.xml @@ -1,7 +1,7 @@