million/QTagger_Android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

업로드 서버 연결 안될 때 알림 추가

Browse Source
This commit is contained in:
DESKTOP-1A3P75F\lee
2022-10-31 09:22:21 +09:00
parent ceb1d64307
commit 0eae7b5870
12 changed files with 73 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenCV/build/intermediates/cxx/Debug/a3l26472/meta/arm64-v8a/generate_cxx_metadata_1199_timing.txt Normal file
View File

@@ -0,0 +1,2 @@
# C/C++ build system timings

2
OpenCV/build/intermediates/cxx/Debug/a3l26472/meta/arm64-v8a/generate_cxx_metadata_228_timing.txt Normal file
View File

@@ -0,0 +1,2 @@
# C/C++ build system timings

2
OpenCV/build/intermediates/cxx/Debug/a3l26472/meta/arm64-v8a/generate_cxx_metadata_572_timing.txt Normal file
View File

@@ -0,0 +1,2 @@
# C/C++ build system timings

2
OpenCV/build/intermediates/cxx/Debug/a3l26472/meta/arm64-v8a/generate_cxx_metadata_854_timing.txt Normal file
View File

@@ -0,0 +1,2 @@
# C/C++ build system timings

6
OpenCV/build/intermediates/cxx/Debug/a3l26472/meta/arm64-v8a/metadata_generation_record.json
View File

@@ -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
}
]

2
OpenCV/build/intermediates/cxx/abi_configuration_311k5o12.log
View File

@@ -11,6 +11,6 @@
"fieldsDescending": {}
},
"memoizedSize": -1,
"memoizedHashCode": -930956772
"memoizedHashCode": 874439679
}
]

5
OpenCV/build/intermediates/cxx/create_cxx_tasks_1043_timing.txt Normal file
View File

@@ -0,0 +1,5 @@
# C/C++ build system timings
create_cxx_tasks
create-initial-cxx-model 23ms
create_cxx_tasks completed in 24ms

9
OpenCV/build/intermediates/cxx/create_cxx_tasks_30_timing.txt
View File

@@ -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

5
OpenCV/build/intermediates/cxx/create_cxx_tasks_417_timing.txt Normal file
View File

@@ -0,0 +1,5 @@
# C/C++ build system timings
create_cxx_tasks
create-initial-cxx-model 34ms
create_cxx_tasks completed in 35ms

5
OpenCV/build/intermediates/cxx/create_cxx_tasks_700_timing.txt
View File

@@ -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

12
OpenCV/build/intermediates/cxx/ndk_locator_record_g55441w3.log
View File

@@ -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
}
]

37
app/src/main/java/com/qtagger/Activity/SyncUploadActivity.java
View File

@@ -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<String> whiteList)
private boolean uploadData(TestEnum testEnum ,List<String> whiteList)
{
if(testEnum == TestEnum.선택안함)
return;
return true;
String testEnumLabel = testEnum.label();
String id = "";
@@ -225,9 +246,10 @@ public class SyncUploadActivity extends AppCompatActivity {
});
Map<String, Object> 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<String,Object> requestDataSet(String pkgNo,String id,String testEnumLabel)