From 57d8b404f17824358e0d3790418588de93cef6ad Mon Sep 17 00:00:00 2001 From: "DESKTOP-1A3P75F\\lee" Date: Tue, 13 Sep 2022 13:47:15 +0900 Subject: [PATCH] =?UTF-8?q?=E3=85=81=E3=85=81=E3=85=81=E3=85=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 3 + app/build.gradle | 3 - app/src/main/AndroidManifest.xml | 1 - .../java/com/qtagger/Activity/AccountAdd.java | 1 - .../com/qtagger/Activity/AccountList.java | 1 - .../com/qtagger/Activity/AccountModify.java | 1 - .../Activity/Search/BarcodeFragment.java | 43 +++++- .../qtagger/Activity/Search/RfidFragment.java | 87 +++++++++++++ .../java/com/qtagger/Database/DBHelper.java | 20 ++- .../java/com/qtagger/Database/ImageFile.java | 57 ++++++++ .../com/qtagger/util/ApplicationClass.java | 123 ------------------ app/src/main/res/layout/fragment_barcode.xml | 7 +- app/src/main/res/layout/fragment_rfid.xml | 14 +- 13 files changed, 215 insertions(+), 146 deletions(-) create mode 100644 app/src/main/java/com/qtagger/Database/ImageFile.java delete mode 100644 app/src/main/java/com/qtagger/util/ApplicationClass.java diff --git a/.idea/misc.xml b/.idea/misc.xml index 2d330d1..e2b36d7 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -120,6 +120,9 @@ + + + diff --git a/app/build.gradle b/app/build.gradle index af8af17..9b9c5ee 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -37,8 +37,6 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.5.0' implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' - implementation 'androidx.room:room-common:2.4.3' - implementation 'androidx.room:room-runtime:2.4.3' implementation 'com.github.bumptech.glide:glide:4.9.0' implementation 'com.ramotion.foldingcell:folding-cell:1.2.3' implementation files('C:\\lib\\jdbc\\ojdbc6.jar') @@ -46,6 +44,5 @@ dependencies { androidTestImplementation 'androidx.test.ext:junit:1.1.3' androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0' - annotationProcessor 'androidx.room:room-compiler:2.4.3' implementation fileTree(dir: 'C:\\lib\\libs-wsmr', include: ['*.aar', '*.jar'], exclude: []) } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 91e6e0e..0050050 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -22,7 +22,6 @@ selectFile(String PkgNo, String TestEnum, String Type){ + List resultData = new ArrayList(); + db = getWritableDatabase(); + Cursor cs = db.rawQuery("Select * From File Where PkgNo = '"+PkgNo+"' AND TestEnum = '"+TestEnum+"' AND Type = '"+Type+"'",null); + while (cs.moveToNext()){ + resultData.add(new ImageFile(cs.getString(0),cs.getString(1),cs.getString(2),cs.getString(3),cs.getString(4) )); + } + db.close(); + return resultData; + + } + diff --git a/app/src/main/java/com/qtagger/Database/ImageFile.java b/app/src/main/java/com/qtagger/Database/ImageFile.java new file mode 100644 index 0000000..104061d --- /dev/null +++ b/app/src/main/java/com/qtagger/Database/ImageFile.java @@ -0,0 +1,57 @@ +package com.qtagger.Database; + +public class ImageFile { + String PkgNo; + String TestEnum; + String Type; + String FilePath; + String FileName; + + public ImageFile(String pkgNo, String testEnum, String type, String filePath, String fileName) { + PkgNo = pkgNo; + TestEnum = testEnum; + Type = type; + FilePath = filePath; + FileName = fileName; + } + + public String getPkgNo() { + return PkgNo; + } + + public void setPkgNo(String pkgNo) { + PkgNo = pkgNo; + } + + public String getTestEnum() { + return TestEnum; + } + + public void setTestEnum(String testEnum) { + TestEnum = testEnum; + } + + public String getType() { + return Type; + } + + public void setType(String type) { + Type = type; + } + + public String getFilePath() { + return FilePath; + } + + public void setFilePath(String filePath) { + FilePath = filePath; + } + + public String getFileName() { + return FileName; + } + + public void setFileName(String fileName) { + FileName = fileName; + } +} diff --git a/app/src/main/java/com/qtagger/util/ApplicationClass.java b/app/src/main/java/com/qtagger/util/ApplicationClass.java deleted file mode 100644 index d9b1540..0000000 --- a/app/src/main/java/com/qtagger/util/ApplicationClass.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.qtagger.util; - -import android.app.Activity; -import android.app.Application; -import android.os.Bundle; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - -import com.wsmr.lib.dev.ATRfidManager; -import com.wsmr.lib.dev.ATRfidReader; -import com.wsmr.lib.dev.ATScanManager; -import com.wsmr.lib.dev.ATScanner; - -import io.realm.Realm; -import io.realm.RealmConfiguration; - -public class ApplicationClass extends Application implements Application.ActivityLifecycleCallbacks { - - private static boolean isBackground; - private static ATRfidReader mReader; - private static ATScanner mScanner; - - private static boolean asciiFlag = false; - - public static boolean getAsciiFlag() { - return asciiFlag; - } - - public static void setAsciiFlag(boolean asciiFlag) { - ApplicationClass.asciiFlag = asciiFlag; - } - - - - @Override - public void onCreate() { - super.onCreate(); - - isBackground = true; - mReader = ATRfidManager.getInstance(); - mScanner = ATScanManager.getInstance(); - - Realm.init(this); - - RealmConfiguration config = new RealmConfiguration.Builder() - .schemaVersion(0) - .build(); - - Realm.setDefaultConfiguration(config); - - // 앱이 foreground로 돌아오는 것을 감지(Activity LifeCycle 체크) - registerActivityLifecycleCallbacks(this); - - - } - - - - - - // 앱이 background일 때 감지 - @Override - public void onTrimMemory(int level) { - super.onTrimMemory(level); - if (level == TRIM_MEMORY_UI_HIDDEN) { - isBackground = true; - ATRfidManager.sleep(); - ATScanManager.sleep(); - } - } - - @Override - public void onActivityCreated(@NonNull Activity activity, @Nullable Bundle bundle) { - - } - - @Override - public void onActivityStarted(@NonNull Activity activity) { - - } - - @Override - public void onActivityResumed(@NonNull Activity activity) { - if (isBackground) { - isBackground = false; - ATRfidManager.wakeUp(); - ATScanManager.wakeUp(); - } - } - - @Override - public void onActivityPaused(@NonNull Activity activity) { - - } - - @Override - public void onActivityStopped(@NonNull Activity activity) { - - } - - @Override - public void onActivitySaveInstanceState(@NonNull Activity activity, @NonNull Bundle bundle) { - - } - - @Override - public void onActivityDestroyed(@NonNull Activity activity) { - - } - - public static ATRfidReader getmReader() { - return mReader; - } - - public static String getRfidVersion() { - return ATRfidManager.getVersion(); - } - - public static ATScanner getmScanner() { - return mScanner; - } -} \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_barcode.xml b/app/src/main/res/layout/fragment_barcode.xml index c08d28b..8608a31 100644 --- a/app/src/main/res/layout/fragment_barcode.xml +++ b/app/src/main/res/layout/fragment_barcode.xml @@ -50,12 +50,12 @@ + app:layout_constraintTop_toBottomOf="@+id/textView_BarcodeText" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_rfid.xml b/app/src/main/res/layout/fragment_rfid.xml index 0e475bd..39127bd 100644 --- a/app/src/main/res/layout/fragment_rfid.xml +++ b/app/src/main/res/layout/fragment_rfid.xml @@ -49,14 +49,15 @@ app:layout_constraintTop_toTopOf="parent" /> @@ -73,16 +74,16 @@ android:textSize="20sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/textView2" /> + app:layout_constraintTop_toBottomOf="@+id/textView_RfidPower" /> + app:layout_constraintTop_toBottomOf="@+id/textView_RfidText" /> \ No newline at end of file