From 0eae7b58708ed91879f1992e218b318aa69eef70 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1A3P75F\\lee" Date: Mon, 31 Oct 2022 09:22:21 +0900 Subject: [PATCH] =?UTF-8?q?=EC=97=85=EB=A1=9C=EB=93=9C=20=EC=84=9C?= =?UTF-8?q?=EB=B2=84=20=EC=97=B0=EA=B2=B0=20=EC=95=88=EB=90=A0=20=EB=95=8C?= =?UTF-8?q?=20=EC=95=8C=EB=A6=BC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../generate_cxx_metadata_1199_timing.txt | 2 + .../generate_cxx_metadata_228_timing.txt | 2 + .../generate_cxx_metadata_572_timing.txt | 2 + .../generate_cxx_metadata_854_timing.txt | 2 + .../arm64-v8a/metadata_generation_record.json | 6 +-- .../cxx/abi_configuration_311k5o12.log | 2 +- .../cxx/create_cxx_tasks_1043_timing.txt | 5 +++ .../cxx/create_cxx_tasks_30_timing.txt | 9 +++++ .../cxx/create_cxx_tasks_417_timing.txt | 5 +++ .../cxx/create_cxx_tasks_700_timing.txt | 5 +++ .../cxx/ndk_locator_record_g55441w3.log | 12 +++--- .../qtagger/Activity/SyncUploadActivity.java | 37 ++++++++++++++++--- 12 files changed, 73 insertions(+), 16 deletions(-) create mode 100644 OpenCV/build/intermediates/cxx/Debug/a3l26472/meta/arm64-v8a/generate_cxx_metadata_1199_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/a3l26472/meta/arm64-v8a/generate_cxx_metadata_228_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/a3l26472/meta/arm64-v8a/generate_cxx_metadata_572_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/a3l26472/meta/arm64-v8a/generate_cxx_metadata_854_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_1043_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_417_timing.txt diff --git a/OpenCV/build/intermediates/cxx/Debug/a3l26472/meta/arm64-v8a/generate_cxx_metadata_1199_timing.txt b/OpenCV/build/intermediates/cxx/Debug/a3l26472/meta/arm64-v8a/generate_cxx_metadata_1199_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/a3l26472/meta/arm64-v8a/generate_cxx_metadata_1199_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/a3l26472/meta/arm64-v8a/generate_cxx_metadata_228_timing.txt b/OpenCV/build/intermediates/cxx/Debug/a3l26472/meta/arm64-v8a/generate_cxx_metadata_228_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/a3l26472/meta/arm64-v8a/generate_cxx_metadata_228_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/a3l26472/meta/arm64-v8a/generate_cxx_metadata_572_timing.txt b/OpenCV/build/intermediates/cxx/Debug/a3l26472/meta/arm64-v8a/generate_cxx_metadata_572_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/a3l26472/meta/arm64-v8a/generate_cxx_metadata_572_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/a3l26472/meta/arm64-v8a/generate_cxx_metadata_854_timing.txt b/OpenCV/build/intermediates/cxx/Debug/a3l26472/meta/arm64-v8a/generate_cxx_metadata_854_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/a3l26472/meta/arm64-v8a/generate_cxx_metadata_854_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/a3l26472/meta/arm64-v8a/metadata_generation_record.json b/OpenCV/build/intermediates/cxx/Debug/a3l26472/meta/arm64-v8a/metadata_generation_record.json index e00f5f7..3fd1fd3 100644 --- a/OpenCV/build/intermediates/cxx/Debug/a3l26472/meta/arm64-v8a/metadata_generation_record.json +++ b/OpenCV/build/intermediates/cxx/Debug/a3l26472/meta/arm64-v8a/metadata_generation_record.json @@ -11,7 +11,7 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": 330029881 + "memoizedHashCode": 2135426332 }, { "level_": 0, @@ -25,7 +25,7 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": 1526617446 + "memoizedHashCode": -962953399 }, { "level_": 0, @@ -39,6 +39,6 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": 1432735960 + "memoizedHashCode": -1056834885 } ] \ No newline at end of file diff --git a/OpenCV/build/intermediates/cxx/abi_configuration_311k5o12.log b/OpenCV/build/intermediates/cxx/abi_configuration_311k5o12.log index a82dd37..dfd3c36 100644 --- a/OpenCV/build/intermediates/cxx/abi_configuration_311k5o12.log +++ b/OpenCV/build/intermediates/cxx/abi_configuration_311k5o12.log @@ -11,6 +11,6 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": -930956772 + "memoizedHashCode": 874439679 } ] \ No newline at end of file diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_1043_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1043_timing.txt new file mode 100644 index 0000000..2a8707c --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1043_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 23ms +create_cxx_tasks completed in 24ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_30_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_30_timing.txt index 1e50181..2cc578d 100644 --- a/OpenCV/build/intermediates/cxx/create_cxx_tasks_30_timing.txt +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_30_timing.txt @@ -393,3 +393,12 @@ create_cxx_tasks create-initial-cxx-model completed in 58ms create_cxx_tasks completed in 60ms +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model + [gap of 17ms] + create-X86_64-model 20ms + [gap of 20ms] + create-initial-cxx-model completed in 57ms +create_cxx_tasks completed in 58ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_417_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_417_timing.txt new file mode 100644 index 0000000..48ee642 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_417_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 34ms +create_cxx_tasks completed in 35ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_700_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_700_timing.txt index bfa88a8..d2cff8a 100644 --- a/OpenCV/build/intermediates/cxx/create_cxx_tasks_700_timing.txt +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_700_timing.txt @@ -13,3 +13,8 @@ create_cxx_tasks create-initial-cxx-model 25ms create_cxx_tasks completed in 26ms +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 21ms +create_cxx_tasks completed in 21ms + diff --git a/OpenCV/build/intermediates/cxx/ndk_locator_record_g55441w3.log b/OpenCV/build/intermediates/cxx/ndk_locator_record_g55441w3.log index 3f776eb..338a072 100644 --- a/OpenCV/build/intermediates/cxx/ndk_locator_record_g55441w3.log +++ b/OpenCV/build/intermediates/cxx/ndk_locator_record_g55441w3.log @@ -11,7 +11,7 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": -88922154 + "memoizedHashCode": 1716474297 }, { "level_": 0, @@ -25,7 +25,7 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": 703265949 + "memoizedHashCode": -1786304896 }, { "level_": 0, @@ -39,7 +39,7 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": 1407727142 + "memoizedHashCode": -1081843703 }, { "level_": 0, @@ -53,7 +53,7 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": -1024426084 + "memoizedHashCode": 780970367 }, { "level_": 0, @@ -67,7 +67,7 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": -747398236 + "memoizedHashCode": 1057998215 }, { "level_": 0, @@ -81,6 +81,6 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": -1581135447 + "memoizedHashCode": 224261004 } ] \ No newline at end of file diff --git a/app/src/main/java/com/qtagger/Activity/SyncUploadActivity.java b/app/src/main/java/com/qtagger/Activity/SyncUploadActivity.java index fe30bf1..28f1f83 100644 --- a/app/src/main/java/com/qtagger/Activity/SyncUploadActivity.java +++ b/app/src/main/java/com/qtagger/Activity/SyncUploadActivity.java @@ -2,7 +2,9 @@ package com.qtagger.Activity; import androidx.appcompat.app.AppCompatActivity; +import android.app.AlertDialog; import android.app.ProgressDialog; +import android.content.Context; import android.content.Intent; import android.graphics.Bitmap; import android.graphics.BitmapFactory; @@ -49,12 +51,13 @@ public class SyncUploadActivity extends AppCompatActivity { CheckableListViewAdapter adapter = new CheckableListViewAdapter(); SparseBooleanArray checkbool; ProgressDialog progressDialog; + Context context; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_sync_upload); - + context = this; Intent intent = getIntent(); syncTestEnum = TestEnum.getByLabel(intent.getStringExtra("TestEnumLabel")); ((TextView) findViewById(R.id.textViewTestType)).setText(syncTestEnum.getKey()); @@ -97,9 +100,27 @@ public class SyncUploadActivity extends AppCompatActivity { checkedList.add(adapterStr); } Thread downloadThread = new Thread(() ->{ - uploadData(syncTestEnum,checkedList); + boolean error = uploadData(syncTestEnum,checkedList); progressDialog.dismiss(); - finish(); + if(error) + { + runOnUiThread(new Runnable() { + @Override + public void run() { + AlertDialog.Builder builder = new AlertDialog.Builder(SyncUploadActivity.this); + builder.setTitle("실패").setMessage("데이터 전송에 실패했습니다.\n연결을 확인하세요."); + builder.setPositiveButton("OK", null); + AlertDialog alertDialog = builder.create(); + alertDialog.show(); + } + }); + } + else + { + finish(); + } + + }); downloadThread.start(); } @@ -203,10 +224,10 @@ public class SyncUploadActivity extends AppCompatActivity { }); } - private void uploadData(TestEnum testEnum ,List whiteList) + private boolean uploadData(TestEnum testEnum ,List whiteList) { if(testEnum == TestEnum.선택안함) - return; + return true; String testEnumLabel = testEnum.label(); String id = ""; @@ -225,9 +246,10 @@ public class SyncUploadActivity extends AppCompatActivity { }); Map data = requestDataSet(pkgNo, id, testEnumLabel); + JSONObject jsonObject = new JSONObject(data); try { - URL url = new URL("http://1.245.98.188:9097/api/qtagger/uploadQtaggerData");//dataManager.connectionString.getServerIp()+"/api/qtagger/uploadQtaggerData"); + URL url = new URL("http://"+dataManager.connectionString.getServerIp()+"/api/qtagger/uploadQtaggerData"); Log.d("URL Create", "성공"); String result = ""; HttpURLConnection conn = (HttpURLConnection) url.openConnection(); @@ -265,10 +287,13 @@ public class SyncUploadActivity extends AppCompatActivity { conn.disconnect(); } catch (IOException e) { e.printStackTrace(); + return true; } } + return false; + } public Map requestDataSet(String pkgNo,String id,String testEnumLabel)