diff --git a/.idea/misc.xml b/.idea/misc.xml index 4dbf4b1..bd5284e 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -43,11 +43,23 @@ + + + + + + + + + + + + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/build_model.json b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/build_model.json index dee0ffa..d63f535 100644 --- a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/build_model.json +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/build_model.json @@ -25,7 +25,10 @@ "variantName": "debug", "isDebuggableEnabled": true, "validAbiList": [ - "ARM64_V8A" + "ARMEABI_V7A", + "ARM64_V8A", + "X86", + "X86_64" ], "buildTargetSet": [ "opencv_jni_shared" @@ -125,7 +128,6 @@ "rootBuildGradleFolder": "D:\\QTagger\\a\\QTagger_Android10", "sdkFolder": "C:\\Users\\lee\\AppData\\Local\\Android\\Sdk", "isBuildOnlyTargetAbiEnabled": true, - "ideBuildTargetAbi": "arm64-v8a,armeabi-v7a,armeabi", "isCmakeBuildCohabitationEnabled": false, "isPrefabEnabled": false }, diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_14976_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_14976_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_14976_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_15339_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_15339_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_15339_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_15680_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_15680_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_15680_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_16024_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_16024_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_16024_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_16376_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_16376_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_16376_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_17302_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_17302_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_17302_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_17674_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_17674_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_17674_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_18000_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_18000_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_18000_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_18448_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_18448_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_18448_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_18871_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_18871_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_18871_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_19918_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_19918_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_19918_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_16024_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_16024_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_16024_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_19918_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_19918_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_19918_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_16024_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_16024_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_16024_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_16599_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_16599_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_16599_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_16876_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_16876_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_16876_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_18171_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_18171_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_18171_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_18448_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_18448_timing.txt new file mode 100644 index 0000000..ad5cad1 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_18448_timing.txt @@ -0,0 +1,4 @@ +# C/C++ build system timings + +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_19918_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_19918_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_19918_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_16024_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_16024_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_16024_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_19918_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_19918_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_19918_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_14830_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_14830_timing.txt new file mode 100644 index 0000000..e9c2a64 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_14830_timing.txt @@ -0,0 +1,6 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 16ms + [gap of 28ms] +create_cxx_tasks completed in 44ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_15188_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_15188_timing.txt new file mode 100644 index 0000000..dafe0c3 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_15188_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 15ms +create_cxx_tasks completed in 15ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_15523_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_15523_timing.txt new file mode 100644 index 0000000..a3122bf --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_15523_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 16ms +create_cxx_tasks completed in 17ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_15859_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_15859_timing.txt new file mode 100644 index 0000000..dafe0c3 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_15859_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 15ms +create_cxx_tasks completed in 15ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_16230_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_16230_timing.txt new file mode 100644 index 0000000..7ea5966 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_16230_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 14ms +create_cxx_tasks completed in 14ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_16599_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_16599_timing.txt new file mode 100644 index 0000000..96156c7 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_16599_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 18ms +create_cxx_tasks completed in 19ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_16876_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_16876_timing.txt new file mode 100644 index 0000000..96156c7 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_16876_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 18ms +create_cxx_tasks completed in 19ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_17153_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_17153_timing.txt new file mode 100644 index 0000000..d20b735 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_17153_timing.txt @@ -0,0 +1,10 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 15ms +create_cxx_tasks completed in 16ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 13ms +create_cxx_tasks completed in 14ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_17837_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_17837_timing.txt new file mode 100644 index 0000000..96156c7 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_17837_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 18ms +create_cxx_tasks completed in 19ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_18171_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_18171_timing.txt index 635b424..4abdd3a 100644 --- a/OpenCV/build/intermediates/cxx/create_cxx_tasks_18171_timing.txt +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_18171_timing.txt @@ -8,3 +8,8 @@ create_cxx_tasks create-initial-cxx-model 16ms create_cxx_tasks completed in 17ms +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 22ms +create_cxx_tasks completed in 23ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_18448_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_18448_timing.txt new file mode 100644 index 0000000..1316986 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_18448_timing.txt @@ -0,0 +1,20 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 15ms +create_cxx_tasks completed in 16ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 15ms +create_cxx_tasks completed in 16ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 16ms +create_cxx_tasks completed in 16ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 15ms +create_cxx_tasks completed in 15ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_19758_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_19758_timing.txt new file mode 100644 index 0000000..c6c4836 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_19758_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 15ms +create_cxx_tasks completed in 16ms + diff --git a/app/build.gradle b/app/build.gradle index 56ed878..6995fbe 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -46,8 +46,8 @@ dependencies { implementation 'androidx.constraintlayout:constraintlayout:2.1.4' 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') implementation project(path: ':OpenCV') + implementation files('libs\\ojdbc6.jar') testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.3' androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' diff --git a/app/libs/ojdbc6.jar b/app/libs/ojdbc6.jar new file mode 100644 index 0000000..b663cd2 Binary files /dev/null and b/app/libs/ojdbc6.jar differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b9c3a64..4a9e296 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -35,6 +35,9 @@ android:theme="@style/Theme.QTagger" android:usesCleartextTraffic="true" tools:targetApi="31"> + @@ -43,10 +46,7 @@ - - - @@ -96,9 +96,7 @@ android:exported="false" /> - - + android:exported="false"> diff --git a/app/src/main/java/com/qtagger/Activity/DbSettingActivity.java b/app/src/main/java/com/qtagger/Activity/DbSettingActivity.java new file mode 100644 index 0000000..1239db4 --- /dev/null +++ b/app/src/main/java/com/qtagger/Activity/DbSettingActivity.java @@ -0,0 +1,75 @@ +package com.qtagger.Activity; + +import androidx.appcompat.app.AppCompatActivity; + +import android.content.DialogInterface; +import android.os.Bundle; +import android.view.View; +import android.widget.EditText; + +import com.qtagger.R; +import com.qtagger.util.DataManager; + +public class DbSettingActivity extends AppCompatActivity { + DataManager dataManager = DataManager.getInstance(); + EditText edit_ip,edit_port,edit_sid; + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_db_setting); + + edit_ip = findViewById(R.id.edit_ip); + edit_port = findViewById(R.id.edit_port); + edit_sid = findViewById(R.id.edit_sid); + + edit_ip.setText(dataManager.connectionString.getHost()); + edit_port.setText(dataManager.connectionString.getPort()); + edit_sid.setText(dataManager.connectionString.getSid()); + + + findViewById(R.id.imageFilterButton_Back).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + findViewById(R.id.button_Cancel).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + + findViewById(R.id.button_OK).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + //빈공간 체크하고 + if(edit_ip.getText().toString().isEmpty() || + edit_port.getText().toString().isEmpty() || + edit_sid.getText().toString().isEmpty() ) + { + android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(DbSettingActivity.this); + builder.setTitle("알림").setMessage("데이터를 모두 입력해주세요."); + builder.setPositiveButton("확인", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + } + }); + android.app.AlertDialog alertDialog = builder.create(); + alertDialog.show(); + } + else + { + dataManager.connectionString.setHost(edit_ip.getText().toString()); + dataManager.connectionString.setPort(edit_port.getText().toString()); + dataManager.connectionString.setSid(edit_sid.getText().toString()); + finish(); + } + + } + }); + + + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/qtagger/Activity/MoreActivity.java b/app/src/main/java/com/qtagger/Activity/MoreActivity.java index 2ca9ce4..5ab3bef 100644 --- a/app/src/main/java/com/qtagger/Activity/MoreActivity.java +++ b/app/src/main/java/com/qtagger/Activity/MoreActivity.java @@ -14,6 +14,7 @@ import android.widget.Toast; import com.qtagger.Data.TestEnum; import com.qtagger.R; +import com.qtagger.test; import com.qtagger.util.DataManager; import com.qtagger.util.OracleQueryStr; @@ -44,6 +45,21 @@ public class MoreActivity extends AppCompatActivity { } }); + findViewById(R.id.Item_Setting).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent intent = new Intent(getApplicationContext(), DbSettingActivity.class); + startActivity(intent); + } + }); + + findViewById(R.id.Item_Upload).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + + } + }); + findViewById(R.id.Item_DBSync).setOnClickListener(new View.OnClickListener() { @RequiresApi(api = Build.VERSION_CODES.N) @Override @@ -86,82 +102,20 @@ public class MoreActivity extends AppCompatActivity { } }); + findViewById(R.id.Item_ExcelExport).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + //Excel 출력 + + + } + }); + TextView textViewId = findViewById(R.id.TextView_Id); TextView textViewName = findViewById(R.id.TextView_Name); textViewId.setText(dataManager.loginAccount.getAccountId()); textViewName.setText(dataManager.loginAccount.getAccountName()); - - - } - - @RequiresApi(api = Build.VERSION_CODES.N) - private void OracleGet(TestEnum testEnum){ - if(testEnum == TestEnum.선택안함) - return; - - Connection conn = null; - PreparedStatement psmt = null; - ResultSet rs = null; - - String url = "jdbc:oracle:thin:@1.245.98.188:1521:orcl"; - String id = "optima_admin"; - String pw = "optima_admin"; - try { - // 3. JDBC 드라이버 로딩 - Class.forName("oracle.jdbc.driver.OracleDriver"); - - // 4. 접속 - // - Connection 객체 생성 + 접속 작업. - conn = DriverManager.getConnection(url, id, pw); - - // 5. SQL - String sql = OracleQueryStr.GetEnumQuery(testEnum); - - psmt = conn.prepareStatement(sql); - rs = psmt.executeQuery(); - if(rs != null) { - - ResultSetMetaData rsmd = rs.getMetaData(); - int columnCount = rsmd.getColumnCount(); - List columnList = new ArrayList<>(); - String insertTitle = ""; - - for(int i=1; i<=columnCount; i++) { - String checkStr = rsmd.getColumnName(i); - if(!checkStr.equals("MAX_REVISION")) { - columnList.add(checkStr); - } - } - - insertTitle = "INSERT or REPLACE INTO "+testEnum.label()+" ("+String.join("," ,columnList) + ") VALUES("; - - while (rs.next()) { - - - List valueList = new ArrayList<>(); - for (String title: - columnList) { - String value = rs.getString(title); - if(value == null) { - valueList.add(rs.getString(title)); - } - else - { - valueList.add("'"+rs.getString(title)+"'"); - } - - } - String insertSql = insertTitle + String.join(",",valueList) + ")"; - dataManager.dbHelper.insertQuery(insertSql); - } - } - // 6. 접속종료 - conn.close(); - - } catch (Exception e) { - e.printStackTrace(); - } } } \ No newline at end of file diff --git a/app/src/main/java/com/qtagger/Activity/SyncActivity.java b/app/src/main/java/com/qtagger/Activity/SyncActivity.java index 159df30..f115a71 100644 --- a/app/src/main/java/com/qtagger/Activity/SyncActivity.java +++ b/app/src/main/java/com/qtagger/Activity/SyncActivity.java @@ -187,8 +187,26 @@ public class SyncActivity extends AppCompatActivity { return false; } }); + //전체 선택 + findViewById(R.id.button_allSelect).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + for (int i=0;i= intervalTime) { + super.onBackPressed(); + } else { + backPressedTime = tempTime; + Toast.makeText(this, "한번 더 누르시면 종료됩니다.", Toast.LENGTH_SHORT).show(); + } + + + } + } \ No newline at end of file diff --git a/app/src/main/java/com/qtagger/Data/OracleConnectionString.java b/app/src/main/java/com/qtagger/Data/OracleConnectionString.java new file mode 100644 index 0000000..88375c5 --- /dev/null +++ b/app/src/main/java/com/qtagger/Data/OracleConnectionString.java @@ -0,0 +1,69 @@ +package com.qtagger.Data; + +public class OracleConnectionString { + String host; + String port; + String sid; + String dbId; + String dbPw; + + public String getUrl(){ + return "jdbc:oracle:thin:@"+host + ":"+port+":" + sid; + } + + public OracleConnectionString() { + host = "1.245.98.188"; + port = "1521"; + sid = "orcl"; + dbId = "optima_admin"; + dbPw = "optima_admin"; + } + + public OracleConnectionString(String host, String port, String sid, String dbId, String dbPw) { + this.host = host; + this.port = port; + this.sid = sid; + this.dbId = dbId; + this.dbPw = dbPw; + } + + public String getHost() { + return host; + } + + public void setHost(String host) { + this.host = host; + } + + public String getPort() { + return port; + } + + public void setPort(String port) { + this.port = port; + } + + public String getSid() { + return sid; + } + + public void setSid(String sid) { + this.sid = sid; + } + + public String getDbId() { + return dbId; + } + + public void setDbId(String dbId) { + this.dbId = dbId; + } + + public String getDbPw() { + return dbPw; + } + + public void setDbPw(String dbPw) { + this.dbPw = dbPw; + } +} diff --git a/app/src/main/java/com/qtagger/MainActivity.java b/app/src/main/java/com/qtagger/MainActivity.java index a159286..9997f2e 100644 --- a/app/src/main/java/com/qtagger/MainActivity.java +++ b/app/src/main/java/com/qtagger/MainActivity.java @@ -23,6 +23,7 @@ import com.qtagger.Activity.AccountList; import com.qtagger.Activity.CameraActivity; import com.qtagger.Activity.NavigationActivity; import com.qtagger.Activity.TestSelectActivity; +import com.qtagger.Data.OracleConnectionString; import com.qtagger.Database.AccountData; import com.qtagger.Database.DBHelper; import com.qtagger.Database.NuclideData; @@ -58,6 +59,7 @@ public class MainActivity extends AppCompatActivity { CommonHelper.usbDevicePermission(this); CommonHelper.FolderClear(); dataManager.dbHelper = new DBHelper(getApplicationContext()); + dataManager.connectionString = new OracleConnectionString(); //테스트용도 나중에 삭제 findViewById(R.id.imageView).setOnClickListener(v -> { @@ -83,6 +85,7 @@ public class MainActivity extends AppCompatActivity { dataManager.loginAccount = accountList.get(selId-1); Intent intent = new Intent(getApplicationContext(), TestSelectActivity.class); startActivity(intent); + finish(); //Intent intent2 = new Intent(getApplicationContext(), NavigationActivity.class); //startActivity(intent2); } diff --git a/app/src/main/java/com/qtagger/util/CommonHelper.java b/app/src/main/java/com/qtagger/util/CommonHelper.java index eaf6e83..5a8a1ee 100644 --- a/app/src/main/java/com/qtagger/util/CommonHelper.java +++ b/app/src/main/java/com/qtagger/util/CommonHelper.java @@ -124,7 +124,7 @@ public class CommonHelper { else { UsbSerialDriver sDriver = usbDefaultProber.probeDevice(usbDevice); - ft232rPermission = usbManager.hasPermission(sDriver.getDevice()); + ft232rPermission = !usbManager.hasPermission(sDriver.getDevice()); } return ft232rPermission; diff --git a/app/src/main/java/com/qtagger/util/DataManager.java b/app/src/main/java/com/qtagger/util/DataManager.java index 3e435de..10985e8 100644 --- a/app/src/main/java/com/qtagger/util/DataManager.java +++ b/app/src/main/java/com/qtagger/util/DataManager.java @@ -5,6 +5,7 @@ import android.provider.MediaStore; import androidx.fragment.app.FragmentManager; +import com.qtagger.Data.OracleConnectionString; import com.qtagger.Data.TestEnum; import com.qtagger.Database.ACCEPT_TEST; import com.qtagger.Database.AccountData; @@ -30,6 +31,7 @@ public class DataManager { public DBHelper dbHelper; public ATRfidReader rfidReader; public ATScanner barcodeScanner; + public OracleConnectionString connectionString; public static TestEnum testEnum = TestEnum.선택안함; public static Intent cameraIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); diff --git a/app/src/main/res/drawable-v24/database_icon_32.png b/app/src/main/res/drawable-v24/database_icon_32.png new file mode 100644 index 0000000..e248e87 Binary files /dev/null and b/app/src/main/res/drawable-v24/database_icon_32.png differ diff --git a/app/src/main/res/drawable-v24/excel_icon_32.png b/app/src/main/res/drawable-v24/excel_icon_32.png new file mode 100644 index 0000000..5908317 Binary files /dev/null and b/app/src/main/res/drawable-v24/excel_icon_32.png differ diff --git a/app/src/main/res/drawable-v24/select_all_icon_32.png b/app/src/main/res/drawable-v24/select_all_icon_32.png new file mode 100644 index 0000000..62863a0 Binary files /dev/null and b/app/src/main/res/drawable-v24/select_all_icon_32.png differ diff --git a/app/src/main/res/drawable-v24/select_off_icon_32.png b/app/src/main/res/drawable-v24/select_off_icon_32.png new file mode 100644 index 0000000..acf7360 Binary files /dev/null and b/app/src/main/res/drawable-v24/select_off_icon_32.png differ diff --git a/app/src/main/res/drawable-v24/upload_32.png b/app/src/main/res/drawable-v24/upload_32.png new file mode 100644 index 0000000..6f1aae5 Binary files /dev/null and b/app/src/main/res/drawable-v24/upload_32.png differ diff --git a/app/src/main/res/drawable/database_setting_item_background.xml b/app/src/main/res/drawable/database_setting_item_background.xml new file mode 100644 index 0000000..15e4e2c --- /dev/null +++ b/app/src/main/res/drawable/database_setting_item_background.xml @@ -0,0 +1,17 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sync_low_button_background.xml b/app/src/main/res/drawable/sync_low_button_background.xml new file mode 100644 index 0000000..388e353 --- /dev/null +++ b/app/src/main/res/drawable/sync_low_button_background.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/upload_32.png b/app/src/main/res/drawable/upload_32.png deleted file mode 100644 index 7d1b854..0000000 Binary files a/app/src/main/res/drawable/upload_32.png and /dev/null differ diff --git a/app/src/main/res/layout/activity_db_setting.xml b/app/src/main/res/layout/activity_db_setting.xml new file mode 100644 index 0000000..ede502b --- /dev/null +++ b/app/src/main/res/layout/activity_db_setting.xml @@ -0,0 +1,173 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_more.xml b/app/src/main/res/layout/activity_more.xml index 39acbc9..9933eef 100644 --- a/app/src/main/res/layout/activity_more.xml +++ b/app/src/main/res/layout/activity_more.xml @@ -78,12 +78,24 @@ /> + - - - - - - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_sync.xml b/app/src/main/res/layout/activity_sync.xml index d5fbdf8..f0f04df 100644 --- a/app/src/main/res/layout/activity_sync.xml +++ b/app/src/main/res/layout/activity_sync.xml @@ -76,8 +76,42 @@ android:id="@+id/list_pkg" android:layout_width="match_parent" android:layout_height="match_parent" + android:layout_weight="1" android:choiceMode="multipleChoice" /> + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index b0c9a45..34d15fe 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -9,4 +9,5 @@ #FFFFFFFF #d84315 #82CAFF + #A5A5A5 \ No newline at end of file