디자인 일부 적용
This commit is contained in:
DESKTOP-1A3P75F\lee
6
.idea/misc.xml
generated
6
.idea/misc.xml
generated
@@ -43,12 +43,15 @@
|
||||
<entry key="..\:/QTagger/a/QTagger_Android1/app/src/main/res/layout/fragment_select.xml" value="0.39739583333333334" />
|
||||
<entry key="..\:/QTagger/a/QTagger_Android1/app/src/main/res/layout/fragment_setting.xml" value="0.5536458333333333" />
|
||||
<entry key="..\:/QTagger/a/QTagger_Android1/app/src/main/res/layout/fragment_shot.xml" value="0.5" />
|
||||
<entry key="..\:/QTagger/a/QTagger_Android10/app/src/main/res/drawable/account_edit_background.xml" value="0.345" />
|
||||
<entry key="..\:/QTagger/a/QTagger_Android10/app/src/main/res/drawable/account_edit_focus_background.xml" value="0.345" />
|
||||
<entry key="..\:/QTagger/a/QTagger_Android10/app/src/main/res/drawable/bg_indicator_active.xml" value="0.4055" />
|
||||
<entry key="..\:/QTagger/a/QTagger_Android10/app/src/main/res/drawable/bg_indicator_inactive.xml" value="0.4055" />
|
||||
<entry key="..\:/QTagger/a/QTagger_Android10/app/src/main/res/drawable/btn_bg_ex.xml" value="0.316" />
|
||||
<entry key="..\:/QTagger/a/QTagger_Android10/app/src/main/res/drawable/button_camera_shot_background.xml" value="0.4055" />
|
||||
<entry key="..\:/QTagger/a/QTagger_Android10/app/src/main/res/drawable/button_list_background.xml" value="0.316" />
|
||||
<entry key="..\:/QTagger/a/QTagger_Android10/app/src/main/res/drawable/button_new_default_background.xml" value="0.315" />
|
||||
<entry key="..\:/QTagger/a/QTagger_Android10/app/src/main/res/drawable/button_new_default_disable_background.xml" value="0.315" />
|
||||
<entry key="..\:/QTagger/a/QTagger_Android10/app/src/main/res/drawable/button_normal_background.xml" value="0.4055" />
|
||||
<entry key="..\:/QTagger/a/QTagger_Android10/app/src/main/res/drawable/circle_check_foreground.xml" value="0.385" />
|
||||
<entry key="..\:/QTagger/a/QTagger_Android10/app/src/main/res/drawable/circle_foreground.xml" value="0.385" />
|
||||
@@ -63,6 +66,7 @@
|
||||
<entry key="..\:/QTagger/a/QTagger_Android10/app/src/main/res/drawable/seekbar_fill_background.xml" value="0.384" />
|
||||
<entry key="..\:/QTagger/a/QTagger_Android10/app/src/main/res/drawable/seekbar_thumb.xml" value="0.345" />
|
||||
<entry key="..\:/QTagger/a/QTagger_Android10/app/src/main/res/drawable/spinner_background.xml" value="0.4055" />
|
||||
<entry key="..\:/QTagger/a/QTagger_Android10/app/src/main/res/drawable/squrebutton_background.xml" value="0.316" />
|
||||
<entry key="..\:/QTagger/a/QTagger_Android10/app/src/main/res/drawable/sync_low_button_background.xml" value="0.4045" />
|
||||
<entry key="..\:/QTagger/a/QTagger_Android10/app/src/main/res/drawable/table_item_background.xml" value="0.384" />
|
||||
<entry key="..\:/QTagger/a/QTagger_Android10/app/src/main/res/drawable/tablelayout_background.xml" value="0.385" />
|
||||
@@ -71,7 +75,7 @@
|
||||
<entry key="..\:/QTagger/a/QTagger_Android10/app/src/main/res/layout/activity_camera.xml" value="0.31302083333333336" />
|
||||
<entry key="..\:/QTagger/a/QTagger_Android10/app/src/main/res/layout/activity_db_setting.xml" value="0.40625" />
|
||||
<entry key="..\:/QTagger/a/QTagger_Android10/app/src/main/res/layout/activity_layout_test.xml" value="0.31302083333333336" />
|
||||
<entry key="..\:/QTagger/a/QTagger_Android10/app/src/main/res/layout/activity_main.xml" value="0.40625" />
|
||||
<entry key="..\:/QTagger/a/QTagger_Android10/app/src/main/res/layout/activity_main.xml" value="0.33" />
|
||||
<entry key="..\:/QTagger/a/QTagger_Android10/app/src/main/res/layout/activity_more.xml" value="0.40625" />
|
||||
<entry key="..\:/QTagger/a/QTagger_Android10/app/src/main/res/layout/activity_permission_checker.xml" value="0.3848958333333333" />
|
||||
<entry key="..\:/QTagger/a/QTagger_Android10/app/src/main/res/layout/activity_search.xml" value="0.3848958333333333" />
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
# C/C++ build system timings
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
# C/C++ build system timings
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
# C/C++ build system timings
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
# C/C++ build system timings
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
# C/C++ build system timings
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
# C/C++ build system timings
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
# C/C++ build system timings
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
# C/C++ build system timings
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
# C/C++ build system timings
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
# C/C++ build system timings
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
# C/C++ build system timings
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
# C/C++ build system timings
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
# C/C++ build system timings
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
# C/C++ build system timings
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
# C/C++ build system timings
|
||||
generate_cxx_metadata 14ms
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
# C/C++ build system timings
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
# C/C++ build system timings
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
# C/C++ build system timings
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
# C/C++ build system timings
|
||||
|
||||
@@ -1,2 +1,4 @@
|
||||
# C/C++ build system timings
|
||||
|
||||
# C/C++ build system timings
|
||||
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
# C/C++ build system timings
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
# C/C++ build system timings
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
# C/C++ build system timings
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
# C/C++ build system timings
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
# C/C++ build system timings
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
# C/C++ build system timings
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
# C/C++ build system timings
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
# C/C++ build system timings
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
# C/C++ build system timings
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
# C/C++ build system timings
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
# C/C++ build system timings
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
# C/C++ build system timings
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
# C/C++ build system timings
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
# C/C++ build system timings
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
# C/C++ build system timings
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
# C/C++ build system timings
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
# C/C++ build system timings
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
# C/C++ build system timings
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
# C/C++ build system timings
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
# C/C++ build system timings
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
# C/C++ build system timings
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
# C/C++ build system timings
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
# C/C++ build system timings
|
||||
|
||||
@@ -1,2 +1,4 @@
|
||||
# C/C++ build system timings
|
||||
|
||||
# C/C++ build system timings
|
||||
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
# C/C++ build system timings
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
# C/C++ build system timings
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
# C/C++ build system timings
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
"fieldsDescending": {}
|
||||
},
|
||||
"memoizedSize": -1,
|
||||
"memoizedHashCode": -780626890
|
||||
"memoizedHashCode": -1973867061
|
||||
},
|
||||
{
|
||||
"level_": 0,
|
||||
@@ -25,7 +25,7 @@
|
||||
"fieldsDescending": {}
|
||||
},
|
||||
"memoizedSize": -1,
|
||||
"memoizedHashCode": -417137208
|
||||
"memoizedHashCode": -1610377379
|
||||
},
|
||||
{
|
||||
"level_": 0,
|
||||
@@ -39,6 +39,6 @@
|
||||
"fieldsDescending": {}
|
||||
},
|
||||
"memoizedSize": -1,
|
||||
"memoizedHashCode": 322079189
|
||||
"memoizedHashCode": -871160982
|
||||
}
|
||||
]
|
||||
@@ -11,6 +11,6 @@
|
||||
"fieldsDescending": {}
|
||||
},
|
||||
"memoizedSize": -1,
|
||||
"memoizedHashCode": -2000428813
|
||||
"memoizedHashCode": 1101298312
|
||||
}
|
||||
]
|
||||
@@ -0,0 +1,10 @@
|
||||
# C/C++ build system timings
|
||||
create_cxx_tasks
|
||||
create-initial-cxx-model 19ms
|
||||
create_cxx_tasks completed in 20ms
|
||||
|
||||
# C/C++ build system timings
|
||||
create_cxx_tasks
|
||||
create-initial-cxx-model 17ms
|
||||
create_cxx_tasks completed in 18ms
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
# C/C++ build system timings
|
||||
create_cxx_tasks
|
||||
create-initial-cxx-model 26ms
|
||||
create_cxx_tasks completed in 27ms
|
||||
|
||||
# C/C++ build system timings
|
||||
create_cxx_tasks
|
||||
create-initial-cxx-model 21ms
|
||||
create_cxx_tasks completed in 22ms
|
||||
|
||||
# C/C++ build system timings
|
||||
create_cxx_tasks
|
||||
create-initial-cxx-model 26ms
|
||||
create_cxx_tasks completed in 26ms
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
# C/C++ build system timings
|
||||
create_cxx_tasks
|
||||
create-initial-cxx-model 14ms
|
||||
create_cxx_tasks completed in 14ms
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
# C/C++ build system timings
|
||||
create_cxx_tasks
|
||||
create-initial-cxx-model 14ms
|
||||
create_cxx_tasks completed in 15ms
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
# C/C++ build system timings
|
||||
create_cxx_tasks
|
||||
create-initial-cxx-model 15ms
|
||||
create_cxx_tasks completed in 15ms
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
# C/C++ build system timings
|
||||
create_cxx_tasks
|
||||
create-initial-cxx-model 15ms
|
||||
create_cxx_tasks completed in 16ms
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
# C/C++ build system timings
|
||||
create_cxx_tasks
|
||||
create-initial-cxx-model 15ms
|
||||
create_cxx_tasks completed in 16ms
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
# C/C++ build system timings
|
||||
create_cxx_tasks
|
||||
create-initial-cxx-model 20ms
|
||||
create_cxx_tasks completed in 20ms
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
# C/C++ build system timings
|
||||
create_cxx_tasks
|
||||
create-initial-cxx-model 15ms
|
||||
create_cxx_tasks completed in 16ms
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
# C/C++ build system timings
|
||||
create_cxx_tasks
|
||||
create-initial-cxx-model 16ms
|
||||
create_cxx_tasks completed in 16ms
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
# C/C++ build system timings
|
||||
create_cxx_tasks
|
||||
create-initial-cxx-model 15ms
|
||||
create_cxx_tasks completed in 16ms
|
||||
|
||||
@@ -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 16ms
|
||||
create_cxx_tasks completed in 17ms
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
# C/C++ build system timings
|
||||
create_cxx_tasks
|
||||
create-initial-cxx-model 15ms
|
||||
create_cxx_tasks completed in 15ms
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
# C/C++ build system timings
|
||||
create_cxx_tasks
|
||||
create-initial-cxx-model 18ms
|
||||
create_cxx_tasks completed in 18ms
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
# C/C++ build system timings
|
||||
create_cxx_tasks
|
||||
create-initial-cxx-model 14ms
|
||||
create_cxx_tasks completed in 14ms
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
# C/C++ build system timings
|
||||
create_cxx_tasks
|
||||
create-initial-cxx-model 19ms
|
||||
create_cxx_tasks completed in 20ms
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
# C/C++ build system timings
|
||||
create_cxx_tasks
|
||||
create-initial-cxx-model 19ms
|
||||
create_cxx_tasks completed in 20ms
|
||||
|
||||
# C/C++ build system timings
|
||||
create_cxx_tasks
|
||||
create-initial-cxx-model 17ms
|
||||
create_cxx_tasks completed in 17ms
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
# C/C++ build system timings
|
||||
create_cxx_tasks
|
||||
create-initial-cxx-model 18ms
|
||||
create_cxx_tasks completed in 18ms
|
||||
|
||||
@@ -186,3 +186,19 @@ create_cxx_tasks
|
||||
create-initial-cxx-model completed in 55ms
|
||||
create_cxx_tasks completed in 57ms
|
||||
|
||||
# C/C++ build system timings
|
||||
create_cxx_tasks
|
||||
create-initial-cxx-model
|
||||
[gap of 24ms]
|
||||
create-ARMEABI_V7A-model 25ms
|
||||
create-initial-cxx-model completed in 57ms
|
||||
create_cxx_tasks completed in 58ms
|
||||
|
||||
# C/C++ build system timings
|
||||
create_cxx_tasks
|
||||
create-initial-cxx-model
|
||||
create-module-model 11ms
|
||||
[gap of 36ms]
|
||||
create-initial-cxx-model completed in 47ms
|
||||
create_cxx_tasks completed in 48ms
|
||||
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
# C/C++ build system timings
|
||||
create_cxx_tasks
|
||||
create-initial-cxx-model 20ms
|
||||
create_cxx_tasks completed in 21ms
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
# C/C++ build system timings
|
||||
create_cxx_tasks
|
||||
create-initial-cxx-model 18ms
|
||||
create_cxx_tasks completed in 18ms
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
# C/C++ build system timings
|
||||
create_cxx_tasks
|
||||
create-initial-cxx-model 16ms
|
||||
create_cxx_tasks completed in 17ms
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
# C/C++ build system timings
|
||||
create_cxx_tasks
|
||||
create-initial-cxx-model 17ms
|
||||
create_cxx_tasks completed in 17ms
|
||||
|
||||
# C/C++ build system timings
|
||||
create_cxx_tasks
|
||||
create-initial-cxx-model 17ms
|
||||
create_cxx_tasks completed in 18ms
|
||||
|
||||
# C/C++ build system timings
|
||||
create_cxx_tasks
|
||||
create-initial-cxx-model 17ms
|
||||
create_cxx_tasks completed in 19ms
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
# C/C++ build system timings
|
||||
create_cxx_tasks
|
||||
create-initial-cxx-model 27ms
|
||||
create_cxx_tasks completed in 28ms
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
# C/C++ build system timings
|
||||
create_cxx_tasks
|
||||
create-initial-cxx-model 19ms
|
||||
create_cxx_tasks completed in 19ms
|
||||
|
||||
# C/C++ build system timings
|
||||
create_cxx_tasks
|
||||
create-initial-cxx-model 20ms
|
||||
create_cxx_tasks completed in 21ms
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
# C/C++ build system timings
|
||||
create_cxx_tasks
|
||||
create-initial-cxx-model 17ms
|
||||
create_cxx_tasks completed in 19ms
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
# C/C++ build system timings
|
||||
create_cxx_tasks
|
||||
create-initial-cxx-model 19ms
|
||||
create_cxx_tasks completed in 19ms
|
||||
|
||||
@@ -3,3 +3,8 @@ create_cxx_tasks
|
||||
create-initial-cxx-model 17ms
|
||||
create_cxx_tasks completed in 17ms
|
||||
|
||||
# C/C++ build system timings
|
||||
create_cxx_tasks
|
||||
create-initial-cxx-model 19ms
|
||||
create_cxx_tasks completed in 19ms
|
||||
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
# C/C++ build system timings
|
||||
create_cxx_tasks
|
||||
create-initial-cxx-model 17ms
|
||||
create_cxx_tasks completed in 18ms
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
# C/C++ build system timings
|
||||
create_cxx_tasks
|
||||
create-initial-cxx-model 20ms
|
||||
create_cxx_tasks completed in 21ms
|
||||
|
||||
@@ -6,3 +6,8 @@ create_cxx_tasks
|
||||
create-initial-cxx-model completed in 31ms
|
||||
create_cxx_tasks completed in 31ms
|
||||
|
||||
# C/C++ build system timings
|
||||
create_cxx_tasks
|
||||
create-initial-cxx-model 25ms
|
||||
create_cxx_tasks completed in 26ms
|
||||
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
# C/C++ build system timings
|
||||
create_cxx_tasks
|
||||
create-initial-cxx-model 17ms
|
||||
create_cxx_tasks completed in 17ms
|
||||
|
||||
# C/C++ build system timings
|
||||
create_cxx_tasks
|
||||
create-initial-cxx-model 16ms
|
||||
create_cxx_tasks completed in 17ms
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
# C/C++ build system timings
|
||||
create_cxx_tasks
|
||||
create-initial-cxx-model 20ms
|
||||
create_cxx_tasks completed in 21ms
|
||||
|
||||
# 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 14ms
|
||||
create_cxx_tasks completed in 15ms
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
# C/C++ build system timings
|
||||
create_cxx_tasks
|
||||
create-initial-cxx-model 15ms
|
||||
create_cxx_tasks completed in 16ms
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
# C/C++ build system timings
|
||||
create_cxx_tasks
|
||||
create-initial-cxx-model 16ms
|
||||
create_cxx_tasks completed in 17ms
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
"fieldsDescending": {}
|
||||
},
|
||||
"memoizedSize": -1,
|
||||
"memoizedHashCode": -1158394195
|
||||
"memoizedHashCode": 1943332930
|
||||
},
|
||||
{
|
||||
"level_": 0,
|
||||
@@ -25,7 +25,7 @@
|
||||
"fieldsDescending": {}
|
||||
},
|
||||
"memoizedSize": -1,
|
||||
"memoizedHashCode": -366206092
|
||||
"memoizedHashCode": -1559446263
|
||||
},
|
||||
{
|
||||
"level_": 0,
|
||||
@@ -39,7 +39,7 @@
|
||||
"fieldsDescending": {}
|
||||
},
|
||||
"memoizedSize": -1,
|
||||
"memoizedHashCode": 338255101
|
||||
"memoizedHashCode": -854985070
|
||||
},
|
||||
{
|
||||
"level_": 0,
|
||||
@@ -53,7 +53,7 @@
|
||||
"fieldsDescending": {}
|
||||
},
|
||||
"memoizedSize": -1,
|
||||
"memoizedHashCode": -2093898125
|
||||
"memoizedHashCode": 1007829000
|
||||
},
|
||||
{
|
||||
"level_": 0,
|
||||
@@ -67,7 +67,7 @@
|
||||
"fieldsDescending": {}
|
||||
},
|
||||
"memoizedSize": -1,
|
||||
"memoizedHashCode": -1816870277
|
||||
"memoizedHashCode": 1284856848
|
||||
},
|
||||
{
|
||||
"level_": 0,
|
||||
@@ -81,6 +81,6 @@
|
||||
"fieldsDescending": {}
|
||||
},
|
||||
"memoizedSize": -1,
|
||||
"memoizedHashCode": 1644359808
|
||||
"memoizedHashCode": 451119637
|
||||
}
|
||||
]
|
||||
@@ -2,7 +2,9 @@ package com.qtagger.Activity;
|
||||
|
||||
import androidx.appcompat.app.AppCompatActivity;
|
||||
import androidx.constraintlayout.utils.widget.ImageFilterButton;
|
||||
import androidx.core.content.ContextCompat;
|
||||
|
||||
import android.graphics.Color;
|
||||
import android.os.Bundle;
|
||||
import android.view.View;
|
||||
import android.widget.EditText;
|
||||
@@ -27,6 +29,48 @@ public class AccountAdd extends AppCompatActivity {
|
||||
editAccountDapt = (EditText) findViewById(R.id.textView_AccountDapt);
|
||||
backBtn = (ImageFilterButton) findViewById(R.id.imageFilterButton_Back);
|
||||
|
||||
editAccountId.setOnFocusChangeListener(new View.OnFocusChangeListener() {
|
||||
@Override
|
||||
public void onFocusChange(View v, boolean hasFocus) {
|
||||
|
||||
if(hasFocus)
|
||||
{
|
||||
editAccountId.setBackgroundResource(R.drawable.account_edit_focus_background);
|
||||
}
|
||||
else{
|
||||
editAccountId.setBackgroundResource(R.drawable.account_edit_background);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
editAccountName.setOnFocusChangeListener(new View.OnFocusChangeListener() {
|
||||
@Override
|
||||
public void onFocusChange(View v, boolean hasFocus) {
|
||||
|
||||
if(hasFocus)
|
||||
{
|
||||
editAccountName.setBackgroundResource(R.drawable.account_edit_focus_background);
|
||||
}
|
||||
else{
|
||||
editAccountName.setBackgroundResource(R.drawable.account_edit_background);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
editAccountDapt.setOnFocusChangeListener(new View.OnFocusChangeListener() {
|
||||
@Override
|
||||
public void onFocusChange(View v, boolean hasFocus) {
|
||||
|
||||
if(hasFocus)
|
||||
{
|
||||
editAccountDapt.setBackgroundResource(R.drawable.account_edit_focus_background);
|
||||
}
|
||||
else{
|
||||
editAccountDapt.setBackgroundResource(R.drawable.account_edit_background);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
|
||||
findViewById(R.id.button_save).setOnClickListener(new View.OnClickListener() {
|
||||
|
||||
@@ -118,8 +118,6 @@ public class BarcodeFragment extends Fragment {
|
||||
barcodeReadData();
|
||||
else
|
||||
openDialogChecker = false;
|
||||
|
||||
|
||||
}
|
||||
|
||||
private void showCustomDialog() {
|
||||
@@ -193,6 +191,9 @@ public class BarcodeFragment extends Fragment {
|
||||
dataManager.selPkg = searchPkg;
|
||||
((SearchActivity) getActivity()).callTestActivity();
|
||||
} else {
|
||||
|
||||
//방폐물 추가가
|
||||
/*
|
||||
new AlertDialog.Builder(context).setTitle("해당 방폐물을 추가하시겠습니까?").setPositiveButton("확인", new DialogInterface.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(DialogInterface dialog, int which) {
|
||||
@@ -200,7 +201,7 @@ public class BarcodeFragment extends Fragment {
|
||||
|
||||
}
|
||||
}).setNegativeButton("취소", null).show();
|
||||
|
||||
*/
|
||||
|
||||
}
|
||||
} else {
|
||||
|
||||
@@ -16,6 +16,7 @@ import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.Button;
|
||||
import android.widget.ImageView;
|
||||
import android.widget.SeekBar;
|
||||
import android.widget.TextView;
|
||||
import android.widget.Toast;
|
||||
@@ -46,8 +47,9 @@ public class RfidFragment extends Fragment {
|
||||
DataManager dataManager = DataManager.getInstance();
|
||||
private String rfidStr = "";
|
||||
private Context context;
|
||||
Button button_RfidReader;
|
||||
ImageView button_RfidReader;
|
||||
View thumbView;
|
||||
SeekBar seekBar;
|
||||
// TODO: Rename parameter arguments, choose names that match
|
||||
// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
|
||||
private static final String ARG_PARAM1 = "param1";
|
||||
@@ -94,61 +96,34 @@ public class RfidFragment extends Fragment {
|
||||
Bundle savedInstanceState) {
|
||||
View view = inflater.inflate(R.layout.fragment_rfid, container, false);
|
||||
context = container.getContext();
|
||||
TextView textViewPower = view.findViewById(R.id.textView_RfidPower);
|
||||
TextView textViewRfidText = view.findViewById(R.id.textView_RfidText);
|
||||
SeekBar seekBar = view.findViewById(R.id.seekbar_reader_type);
|
||||
seekBar = view.findViewById(R.id.seekbar_reader_type);
|
||||
button_RfidReader = view.findViewById(R.id.button_RfidReader);
|
||||
thumbView =inflater.inflate(R.layout.layout_seekbar_thumb, null, false);
|
||||
try {
|
||||
ApplicationClass.rfidSetOperationTime();
|
||||
int power = rfidReader.getPower();
|
||||
|
||||
if(power == -1){
|
||||
sleep(500);
|
||||
rfidReader.setPower(100);
|
||||
power = rfidReader.getPower();
|
||||
}
|
||||
seekBar.setProgress(power);
|
||||
textViewPower.setText("강도 : " + power);
|
||||
if(rfidReader.getAction() != ActionState.Stop)
|
||||
{
|
||||
rfidReader.stop();
|
||||
rfidReader.removeEventListener();
|
||||
thumbView = inflater.inflate(R.layout.layout_seekbar_thumb, null, false);
|
||||
ApplicationClass.rfidSetOperationTime();
|
||||
|
||||
|
||||
rfidReader.setEventListener(new RfidReaderEventListener() {
|
||||
@Override
|
||||
public void onReaderStateChanged(ATRfidReader atRfidReader, ConnectionState connectionState) {
|
||||
Log.d("상태 변경", connectionState + "");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onReaderActionChanged(ATRfidReader atRfidReader, ActionState actionState) {
|
||||
Log.d("태그 변경", actionState + "");
|
||||
}
|
||||
|
||||
rfidReader.setEventListener(new RfidReaderEventListener() {
|
||||
@Override
|
||||
public void onReaderStateChanged(ATRfidReader atRfidReader, ConnectionState connectionState) {
|
||||
Log.d("상태 변경",connectionState+"");
|
||||
}
|
||||
@Override
|
||||
public void onReaderReadTag(ATRfidReader atRfidReader, String s, float v, float v1) {
|
||||
rfidStr = s;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onReaderActionChanged(ATRfidReader atRfidReader, ActionState actionState) {
|
||||
Log.d("태그 변경",actionState+"");
|
||||
}
|
||||
@Override
|
||||
public void onReaderResult(ATRfidReader atRfidReader, ResultCode resultCode, ActionState actionState, String s, String s1, float v, float v1) {
|
||||
|
||||
@Override
|
||||
public void onReaderReadTag(ATRfidReader atRfidReader, String s, float v, float v1) {
|
||||
rfidStr = s;
|
||||
textViewRfidText.setText(s);
|
||||
}
|
||||
@Override
|
||||
public void onReaderResult(ATRfidReader atRfidReader, ResultCode resultCode, ActionState actionState, String s, String s1, float v, float v1) {
|
||||
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
} catch (ATRfidReaderException e) {
|
||||
e.printStackTrace();
|
||||
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
//연결이 안된상황
|
||||
ex.printStackTrace();
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
button_RfidReader.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
@@ -173,7 +148,6 @@ public class RfidFragment extends Fragment {
|
||||
try {
|
||||
seekBar.setThumb(getThumb(progress));
|
||||
rfidReader.setPower(progress);
|
||||
textViewPower.setText("강도 : " + rfidReader.getPower());
|
||||
|
||||
} catch (ATRfidReaderException e) {
|
||||
e.printStackTrace();
|
||||
@@ -191,7 +165,7 @@ public class RfidFragment extends Fragment {
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
/*
|
||||
view.findViewById(R.id.button_Ok).setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
@@ -219,7 +193,7 @@ public class RfidFragment extends Fragment {
|
||||
Toast.makeText(context, "RFID를 인식해주세요.", Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
}
|
||||
});
|
||||
});*/
|
||||
// Inflate the layout for this fragment
|
||||
return view;
|
||||
}
|
||||
@@ -234,6 +208,28 @@ public class RfidFragment extends Fragment {
|
||||
thumbView.draw(canvas);
|
||||
|
||||
return new BitmapDrawable(getResources(), bitmap);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onStart() {
|
||||
super.onStart();
|
||||
|
||||
int power = 0;
|
||||
try {
|
||||
power = rfidReader.getPower();
|
||||
if(power == -1){
|
||||
sleep(500);
|
||||
rfidReader.setPower(100);
|
||||
power = rfidReader.getPower();
|
||||
}
|
||||
seekBar.setProgress(power);
|
||||
} catch (ATRfidReaderException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -1,71 +1,123 @@
|
||||
package com.qtagger.Activity;
|
||||
|
||||
import androidx.appcompat.app.AppCompatActivity;
|
||||
import androidx.drawerlayout.widget.DrawerLayout;
|
||||
import androidx.fragment.app.Fragment;
|
||||
|
||||
import android.content.Intent;
|
||||
import android.graphics.Typeface;
|
||||
import android.os.Bundle;
|
||||
import android.view.KeyEvent;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.TextView;
|
||||
|
||||
import com.google.android.material.navigation.NavigationView;
|
||||
import com.google.android.material.tabs.TabLayout;
|
||||
import com.qtagger.Activity.Search.BarcodeFragment;
|
||||
import com.qtagger.Activity.Search.ListFragment;
|
||||
import com.qtagger.Activity.Search.RfidFragment;
|
||||
import com.qtagger.CustomPalette.CommonNavigationView;
|
||||
import com.qtagger.R;
|
||||
import com.qtagger.util.DataManager;
|
||||
|
||||
public class SearchActivity extends AppCompatActivity {
|
||||
DrawerLayout drawerLayout;
|
||||
NavigationView navigationView;
|
||||
Fragment rfidFragment, barcodeFragment, listFragment;
|
||||
TabLayout tabs;
|
||||
boolean skipCheck;
|
||||
DataManager dataManager = DataManager.getInstance();
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.activity_search);
|
||||
Intent intent = getIntent();
|
||||
skipCheck = intent.getBooleanExtra("boolean",true);
|
||||
skipCheck = intent.getBooleanExtra("boolean", true);
|
||||
|
||||
drawerLayout = (DrawerLayout) findViewById(R.id.drawerLayout);
|
||||
navigationView = (NavigationView) findViewById(R.id.navigationView);
|
||||
|
||||
|
||||
rfidFragment = new RfidFragment();
|
||||
barcodeFragment = new BarcodeFragment();
|
||||
listFragment = new ListFragment();
|
||||
|
||||
getSupportFragmentManager().beginTransaction().add(R.id.frame,barcodeFragment).commit();
|
||||
if(dataManager.searchTabPosition == -1)
|
||||
getSupportFragmentManager().beginTransaction().add(R.id.frame, barcodeFragment).commit();
|
||||
if (dataManager.searchTabPosition == -1)
|
||||
dataManager.searchTabPosition = 0;
|
||||
tabs = (TabLayout) findViewById(R.id.tabs);
|
||||
|
||||
for (int i = 0; i < tabs.getTabCount(); i++) {
|
||||
|
||||
TabLayout.Tab tab = tabs.getTabAt(i);
|
||||
if (tab != null) {
|
||||
|
||||
TextView tabTextView = new TextView(this);
|
||||
tab.setCustomView(tabTextView);
|
||||
|
||||
tabTextView.getLayoutParams().width = ViewGroup.LayoutParams.WRAP_CONTENT;
|
||||
tabTextView.getLayoutParams().height = ViewGroup.LayoutParams.WRAP_CONTENT;
|
||||
tabTextView.setText(tab.getText());
|
||||
}
|
||||
}
|
||||
|
||||
findViewById(R.id.imageFilterButton_Setting).setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
Intent intent = new Intent(getApplicationContext(), MoreActivity.class);
|
||||
startActivity(intent);
|
||||
//Intent intent = new Intent(getApplicationContext(), MoreActivity.class);
|
||||
//startActivity(intent);
|
||||
drawerLayout.openDrawer(navigationView,true);
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
tabs.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
|
||||
@Override
|
||||
public void onTabSelected(TabLayout.Tab tab) {
|
||||
|
||||
ViewGroup vg = (ViewGroup) tabs.getChildAt(0);
|
||||
ViewGroup vgTab = (ViewGroup) vg.getChildAt(tab.getPosition());
|
||||
int tabChildsCount = vgTab.getChildCount();
|
||||
for (int i = 0; i < tabChildsCount; i++) {
|
||||
View tabViewChild = vgTab.getChildAt(i);
|
||||
if (tabViewChild instanceof TextView) {
|
||||
((TextView) tabViewChild).setTextSize(16);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
int position = tab.getPosition();
|
||||
dataManager.searchTabPosition = position;
|
||||
|
||||
Fragment selected = null;
|
||||
if(position == 0){
|
||||
if (position == 0) {
|
||||
selected = barcodeFragment;
|
||||
}else if (position == 1){
|
||||
} else if (position == 1) {
|
||||
selected = rfidFragment;
|
||||
}else if (position == 2){
|
||||
} else if (position == 2) {
|
||||
selected = listFragment;
|
||||
}
|
||||
if(selected != null) {
|
||||
if (selected != null) {
|
||||
getSupportFragmentManager().beginTransaction().replace(R.id.frame, selected).commit();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onTabUnselected(TabLayout.Tab tab) {
|
||||
ViewGroup vg = (ViewGroup) tabs.getChildAt(0);
|
||||
ViewGroup vgTab = (ViewGroup) vg.getChildAt(tab.getPosition());
|
||||
int tabChildsCount = vgTab.getChildCount();
|
||||
for (int i = 0; i < tabChildsCount; i++) {
|
||||
View tabViewChild = vgTab.getChildAt(i);
|
||||
if (tabViewChild instanceof TextView) {
|
||||
((TextView) tabViewChild).setTextSize(14);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -82,9 +134,10 @@ public class SearchActivity extends AppCompatActivity {
|
||||
}
|
||||
});
|
||||
|
||||
CommonNavigationView.setDefaultViewEvent(this);
|
||||
}
|
||||
|
||||
public void callTestActivity(){
|
||||
public void callTestActivity() {
|
||||
|
||||
//데이터 초기화, 없으면 null
|
||||
String pkgNo = dataManager.selPkg.getPKG_NO();
|
||||
@@ -93,7 +146,7 @@ public class SearchActivity extends AppCompatActivity {
|
||||
dataManager.selACCEPT_TEST = dataManager.dbHelper.getACCEPT_TEST(pkgNo);
|
||||
dataManager.selPREPAR_TEST = dataManager.dbHelper.getPREPAR_TEST(pkgNo);
|
||||
|
||||
if(skipCheck) {
|
||||
if (skipCheck) {
|
||||
Intent intent = new Intent(getApplicationContext(), TestActivity.class);
|
||||
startActivity(intent);
|
||||
}
|
||||
@@ -103,8 +156,30 @@ public class SearchActivity extends AppCompatActivity {
|
||||
@Override
|
||||
protected void onStart() {
|
||||
super.onStart();
|
||||
if(dataManager.searchTabPosition != -1)
|
||||
{
|
||||
ViewGroup vg = (ViewGroup) tabs.getChildAt(0);
|
||||
for (int i = 0; i < tabs.getTabCount(); i++) {
|
||||
TabLayout.Tab tab = tabs.getTabAt(i);
|
||||
if (tab != null) {
|
||||
ViewGroup vgTab = (ViewGroup) vg.getChildAt(i);
|
||||
int tabChildsCount = vgTab.getChildCount();
|
||||
for (int j = 0; j < tabChildsCount; j++) {
|
||||
View tabViewChild = vgTab.getChildAt(j);
|
||||
if (tabViewChild instanceof TextView) {
|
||||
if(i==0)
|
||||
{
|
||||
((TextView) tabViewChild).setTextSize(16);
|
||||
}
|
||||
else{
|
||||
((TextView) tabViewChild).setTextSize(14);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
if (dataManager.searchTabPosition != -1) {
|
||||
tabs.getTabAt(dataManager.searchTabPosition).select();
|
||||
}
|
||||
}
|
||||
@@ -113,16 +188,14 @@ public class SearchActivity extends AppCompatActivity {
|
||||
public boolean onKeyUp(int keyCode, KeyEvent event) {
|
||||
if (keyCode == 138) {
|
||||
//키 입력시
|
||||
if(dataManager.searchTabPosition == 0)
|
||||
{
|
||||
((BarcodeFragment)barcodeFragment).KeyUpEvent();
|
||||
}
|
||||
else if(dataManager.searchTabPosition == 1)
|
||||
{
|
||||
if (dataManager.searchTabPosition == 0) {
|
||||
((BarcodeFragment) barcodeFragment).KeyUpEvent();
|
||||
} else if (dataManager.searchTabPosition == 1) {
|
||||
//rfidFragment
|
||||
}
|
||||
}
|
||||
|
||||
return super.onKeyUp(keyCode, event);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -18,6 +18,7 @@ import android.text.SpannableStringBuilder;
|
||||
import android.text.style.ForegroundColorSpan;
|
||||
import android.util.Log;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.TextView;
|
||||
import com.google.android.material.tabs.TabLayout;
|
||||
import com.hoho.android.usbserial.driver.UsbSerialDriver;
|
||||
@@ -42,16 +43,11 @@ import com.qtagger.util.TextUtil;
|
||||
|
||||
public class TestActivity extends AppCompatActivity {
|
||||
|
||||
|
||||
|
||||
|
||||
Fragment surfaceFragment, m1Fragment, weightFragment, fillFragment, pictureFragment, infoFragment;
|
||||
TextView textViewRadiation,textView_TestEnum,textView_TestEnum2;
|
||||
TextView textViewRadiation;
|
||||
TabLayout tabs;
|
||||
DataManager dataManager = DataManager.getInstance();
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
@@ -64,8 +60,6 @@ public class TestActivity extends AppCompatActivity {
|
||||
pictureFragment = new PhotographFragment();
|
||||
infoFragment = new InfoFragment();
|
||||
textViewRadiation = findViewById(R.id.textViewRadiation);
|
||||
textView_TestEnum = findViewById(R.id.textView_TestEnum);
|
||||
textView_TestEnum2 = findViewById(R.id.textView_TestEnum2);
|
||||
|
||||
findViewById(R.id.imageFilterButton_Back).setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
@@ -74,10 +68,6 @@ public class TestActivity extends AppCompatActivity {
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
textViewRadiation.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
@@ -100,10 +90,34 @@ public class TestActivity extends AppCompatActivity {
|
||||
getSupportFragmentManager().beginTransaction().add(R.id.frame,surfaceFragment).commit();
|
||||
|
||||
tabs = (TabLayout) findViewById(R.id.tabs);
|
||||
for (int i = 0; i < tabs.getTabCount(); i++) {
|
||||
|
||||
TabLayout.Tab tab = tabs.getTabAt(i);
|
||||
if (tab != null) {
|
||||
|
||||
TextView tabTextView = new TextView(this);
|
||||
tab.setCustomView(tabTextView);
|
||||
tabTextView.getLayoutParams().width = ViewGroup.LayoutParams.WRAP_CONTENT;
|
||||
tabTextView.getLayoutParams().height = ViewGroup.LayoutParams.WRAP_CONTENT;
|
||||
tabTextView.setText(tab.getText());
|
||||
}
|
||||
}
|
||||
|
||||
tabs.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
|
||||
@Override
|
||||
public void onTabSelected(TabLayout.Tab tab) {
|
||||
int position = tab.getPosition();
|
||||
|
||||
ViewGroup vg = (ViewGroup) tabs.getChildAt(0);
|
||||
ViewGroup vgTab = (ViewGroup) vg.getChildAt(tab.getPosition());
|
||||
int tabChildsCount = vgTab.getChildCount();
|
||||
for (int i = 0; i < tabChildsCount; i++) {
|
||||
View tabViewChild = vgTab.getChildAt(i);
|
||||
if (tabViewChild instanceof TextView) {
|
||||
((TextView) tabViewChild).setTextSize(16);
|
||||
}
|
||||
}
|
||||
|
||||
Fragment selected = null;
|
||||
dataManager.testTabPosition = position;
|
||||
if(position == 0){
|
||||
@@ -132,7 +146,15 @@ public class TestActivity extends AppCompatActivity {
|
||||
|
||||
@Override
|
||||
public void onTabUnselected(TabLayout.Tab tab) {
|
||||
|
||||
ViewGroup vg = (ViewGroup) tabs.getChildAt(0);
|
||||
ViewGroup vgTab = (ViewGroup) vg.getChildAt(tab.getPosition());
|
||||
int tabChildsCount = vgTab.getChildCount();
|
||||
for (int i = 0; i < tabChildsCount; i++) {
|
||||
View tabViewChild = vgTab.getChildAt(i);
|
||||
if (tabViewChild instanceof TextView) {
|
||||
((TextView) tabViewChild).setTextSize(14);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -149,6 +171,28 @@ public class TestActivity extends AppCompatActivity {
|
||||
protected void onStart() {
|
||||
super.onStart();
|
||||
|
||||
ViewGroup vg = (ViewGroup) tabs.getChildAt(0);
|
||||
for (int i = 0; i < tabs.getTabCount(); i++) {
|
||||
TabLayout.Tab tab = tabs.getTabAt(i);
|
||||
if (tab != null) {
|
||||
ViewGroup vgTab = (ViewGroup) vg.getChildAt(i);
|
||||
int tabChildsCount = vgTab.getChildCount();
|
||||
for (int j = 0; j < tabChildsCount; j++) {
|
||||
View tabViewChild = vgTab.getChildAt(j);
|
||||
if (tabViewChild instanceof TextView) {
|
||||
if(i==0)
|
||||
{
|
||||
((TextView) tabViewChild).setTextSize(16);
|
||||
}
|
||||
else{
|
||||
((TextView) tabViewChild).setTextSize(14);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if(dataManager.testEnum != TestEnum.선택안함)
|
||||
{
|
||||
if(dataManager.selPkg != null)
|
||||
@@ -156,39 +200,11 @@ public class TestActivity extends AppCompatActivity {
|
||||
textViewRadiation.setText(dataManager.selPkg.getPKG_NO());
|
||||
}
|
||||
}
|
||||
//textView_TestEnum
|
||||
|
||||
if(dataManager.testEnum == TestEnum.발생지특성규명)
|
||||
{
|
||||
textView_TestEnum.setVisibility(View.VISIBLE);
|
||||
textView_TestEnum2.setVisibility(View.GONE);
|
||||
}
|
||||
else if(dataManager.testEnum != TestEnum.선택안함)
|
||||
{
|
||||
textView_TestEnum.setVisibility(View.INVISIBLE);
|
||||
textView_TestEnum2.setVisibility(View.VISIBLE);
|
||||
|
||||
if(dataManager.testEnum == TestEnum.처분검사)
|
||||
{
|
||||
textView_TestEnum2.setText("처분검사");
|
||||
}
|
||||
else if(dataManager.testEnum == TestEnum.인수검사)
|
||||
{
|
||||
textView_TestEnum2.setText("인수검사");
|
||||
}
|
||||
else if(dataManager.testEnum == TestEnum.예비검사)
|
||||
{
|
||||
textView_TestEnum2.setText("예비검사");
|
||||
}
|
||||
}
|
||||
if(dataManager.testTabPosition != -1)
|
||||
{
|
||||
tabs.getTabAt(dataManager.testTabPosition).select();
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -20,6 +20,7 @@ import androidx.core.content.ContextCompat;
|
||||
import androidx.drawerlayout.widget.DrawerLayout;
|
||||
|
||||
import com.google.android.material.navigation.NavigationView;
|
||||
import com.qtagger.CustomPalette.CommonNavigationView;
|
||||
import com.qtagger.Data.TestEnum;
|
||||
import com.qtagger.Database.PKG;
|
||||
import com.qtagger.R;
|
||||
@@ -111,13 +112,14 @@ public class TestSelectActivity extends AppCompatActivity {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
drawerLayout.openDrawer(navigationView,true);
|
||||
|
||||
/*
|
||||
Intent intent = new Intent(getApplicationContext(), MoreActivity.class);
|
||||
startActivity(intent);*/
|
||||
}
|
||||
});
|
||||
|
||||
CommonNavigationView.setDefaultViewEvent(this);
|
||||
|
||||
}
|
||||
|
||||
//권한 점검 및 실행
|
||||
|
||||
@@ -6,26 +6,52 @@ import android.content.Context;
|
||||
import android.content.DialogInterface;
|
||||
import android.content.Intent;
|
||||
import android.view.View;
|
||||
import android.widget.TextView;
|
||||
|
||||
import androidx.core.view.GravityCompat;
|
||||
import androidx.drawerlayout.widget.DrawerLayout;
|
||||
|
||||
import com.google.android.material.navigation.NavigationView;
|
||||
import com.qtagger.Activity.AccountAdd;
|
||||
import com.qtagger.Activity.AccountModify;
|
||||
import com.qtagger.Activity.DbSettingActivity;
|
||||
import com.qtagger.Activity.MoreActivity;
|
||||
import com.qtagger.Activity.SyncActivity;
|
||||
import com.qtagger.Data.TestEnum;
|
||||
import com.qtagger.Database.AccountData;
|
||||
import com.qtagger.R;
|
||||
import com.qtagger.util.DataManager;
|
||||
|
||||
public class CommonNavigationView {
|
||||
|
||||
public static DataManager dataManager = DataManager.getInstance();
|
||||
public static void setDefaultViewEvent(Activity activity)
|
||||
{
|
||||
|
||||
//textview_id
|
||||
AccountData account = dataManager.loginAccount;
|
||||
TextView textId = activity.findViewById(R.id.textview_id);
|
||||
TextView textDapt = activity.findViewById(R.id.textview_dapt);
|
||||
TextView textName = activity.findViewById(R.id.textview_name);
|
||||
|
||||
if(account == null)
|
||||
{
|
||||
textId.setText("");
|
||||
textDapt.setText("");
|
||||
textName.setText("");
|
||||
}
|
||||
else
|
||||
{
|
||||
textId.setText(account.getAccountId());
|
||||
textDapt.setText(account.getAccountDapt());
|
||||
textName.setText(account.getAccountName());
|
||||
}
|
||||
|
||||
|
||||
activity.findViewById(R.id.button_serverInfo).setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
|
||||
Intent intent = new Intent(activity.getApplicationContext(), DbSettingActivity.class);
|
||||
activity.startActivity(intent);
|
||||
}
|
||||
});
|
||||
activity.findViewById(R.id.button_Upload).setOnClickListener(new View.OnClickListener() {
|
||||
@@ -68,12 +94,31 @@ public class CommonNavigationView {
|
||||
activity.findViewById(R.id.button_AccountAdd).setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
|
||||
Intent intent = new Intent(activity.getApplicationContext(), AccountAdd.class);
|
||||
activity.startActivity(intent);
|
||||
}
|
||||
});
|
||||
activity.findViewById(R.id.button_AccountModify).setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
if(dataManager.loginAccount == null)
|
||||
{
|
||||
//알림 줄것
|
||||
}
|
||||
else
|
||||
{
|
||||
Intent intent = new Intent(activity.getApplicationContext(), AccountModify.class);
|
||||
intent.putExtra("Id",dataManager.loginAccount.getId());
|
||||
activity.startActivity(intent);
|
||||
}
|
||||
}
|
||||
});
|
||||
activity.findViewById(R.id.button_small_close).setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
DrawerLayout drawerLayout = (DrawerLayout) activity.findViewById(R.id.drawerLayout);
|
||||
NavigationView navigationView = (NavigationView) activity.findViewById(R.id.navigationView);
|
||||
drawerLayout.closeDrawer(navigationView,true);
|
||||
|
||||
}
|
||||
});
|
||||
|
||||
@@ -5,11 +5,13 @@ import android.content.Intent;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.database.sqlite.SQLiteDatabase;
|
||||
import android.database.sqlite.SQLiteOpenHelper;
|
||||
import android.graphics.Color;
|
||||
import android.net.ConnectivityManager;
|
||||
import android.net.NetworkInfo;
|
||||
import android.os.Build;
|
||||
import android.os.Bundle;
|
||||
import android.view.View;
|
||||
import android.widget.AdapterView;
|
||||
import android.widget.ArrayAdapter;
|
||||
import android.widget.Button;
|
||||
import android.widget.ImageView;
|
||||
@@ -18,6 +20,7 @@ import android.widget.Toast;
|
||||
|
||||
import androidx.annotation.RequiresApi;
|
||||
import androidx.appcompat.app.AppCompatActivity;
|
||||
import androidx.core.content.ContextCompat;
|
||||
import androidx.drawerlayout.widget.DrawerLayout;
|
||||
|
||||
import com.google.android.material.navigation.NavigationView;
|
||||
@@ -27,6 +30,7 @@ import com.qtagger.Activity.CameraActivity;
|
||||
import com.qtagger.Activity.LayoutTestActivity;
|
||||
import com.qtagger.Activity.NavigationActivity;
|
||||
import com.qtagger.Activity.TestSelectActivity;
|
||||
import com.qtagger.CustomPalette.CommonNavigationView;
|
||||
import com.qtagger.Data.OracleConnectionString;
|
||||
import com.qtagger.Database.AccountData;
|
||||
import com.qtagger.Database.DBHelper;
|
||||
@@ -44,11 +48,13 @@ import java.nio.file.Files;
|
||||
import java.util.List;
|
||||
|
||||
public class MainActivity extends AppCompatActivity {
|
||||
Context context;
|
||||
private Spinner mSpinner;
|
||||
private Button btnLogin;
|
||||
private DataManager dataManager= DataManager.getInstance();
|
||||
private List<AccountData> accountList;
|
||||
private ImageView imageview_navTab;
|
||||
Button button_login;
|
||||
DrawerLayout drawerLayout;
|
||||
NavigationView navigationView;
|
||||
|
||||
@@ -62,6 +68,7 @@ public class MainActivity extends AppCompatActivity {
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.activity_main);
|
||||
context = this;
|
||||
mSpinner = findViewById(R.id.spinner_account);
|
||||
CommonHelper.usbDevicePermission(this);
|
||||
CommonHelper.FolderClear();
|
||||
@@ -70,6 +77,7 @@ public class MainActivity extends AppCompatActivity {
|
||||
drawerLayout = (DrawerLayout) findViewById(R.id.drawerLayout);
|
||||
navigationView = (NavigationView) findViewById(R.id.navigationView);
|
||||
imageview_navTab = findViewById(R.id.imageview_navTab);
|
||||
button_login = findViewById(R.id.button_login);
|
||||
|
||||
imageview_navTab.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
@@ -92,8 +100,30 @@ public class MainActivity extends AppCompatActivity {
|
||||
|
||||
});
|
||||
|
||||
mSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
|
||||
@Override
|
||||
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
|
||||
if(position == 0)
|
||||
{
|
||||
button_login.setBackgroundResource(R.drawable.button_new_default_disable_background);
|
||||
button_login.setTextColor(ContextCompat.getColor(context,R.color.defaultDisableTextColor));
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
button_login.setBackgroundResource(R.drawable.button_new_default_background);
|
||||
button_login.setTextColor(Color.WHITE);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onNothingSelected(AdapterView<?> parent) {
|
||||
|
||||
}
|
||||
});
|
||||
|
||||
//로그인
|
||||
findViewById(R.id.button_login).setOnClickListener(new View.OnClickListener() {
|
||||
button_login.setOnClickListener(new View.OnClickListener() {
|
||||
@RequiresApi(api = Build.VERSION_CODES.N)
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
@@ -109,13 +139,13 @@ 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);
|
||||
//finish();
|
||||
}
|
||||
}
|
||||
});
|
||||
CommonNavigationView.setDefaultViewEvent(this);
|
||||
|
||||
/*
|
||||
//계정 추가
|
||||
findViewById(R.id.text_accountInsert).setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
@@ -133,7 +163,7 @@ public class MainActivity extends AppCompatActivity {
|
||||
Intent intent = new Intent(getApplicationContext(), AccountList.class);
|
||||
startActivity(intent);
|
||||
}
|
||||
});
|
||||
});*/
|
||||
|
||||
if(getConnectStatus())//온라인 모드
|
||||
{
|
||||
@@ -152,6 +182,7 @@ public class MainActivity extends AppCompatActivity {
|
||||
ArrayAdapter<String> aa_items = new ArrayAdapter<String>(this, androidx.appcompat.R.layout.support_simple_spinner_dropdown_item);
|
||||
aa_items.add("사용자를 선택해주세요");
|
||||
|
||||
dataManager.loginAccount = null;
|
||||
|
||||
//초기 데이터 세팅
|
||||
accountList = dataManager.dbHelper.getAllAccount();
|
||||
@@ -160,6 +191,7 @@ public class MainActivity extends AppCompatActivity {
|
||||
}
|
||||
|
||||
mSpinner.setAdapter(aa_items);
|
||||
button_login.setBackgroundResource(R.drawable.button_new_default_disable_background);
|
||||
|
||||
|
||||
}
|
||||
|
||||
BIN
app/src/main/res/drawable-v24/btn_close.png
Normal file
BIN
app/src/main/res/drawable-v24/btn_close.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.1 KiB |
BIN
app/src/main/res/drawable-v24/btn_close_white.png
Normal file
BIN
app/src/main/res/drawable-v24/btn_close_white.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.0 KiB |
BIN
app/src/main/res/drawable-v24/btn_list_del.png
Normal file
BIN
app/src/main/res/drawable-v24/btn_list_del.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.0 KiB |
BIN
app/src/main/res/drawable-v24/btn_retake.png
Normal file
BIN
app/src/main/res/drawable-v24/btn_retake.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.7 KiB |
BIN
app/src/main/res/drawable-v24/btn_save.png
Normal file
BIN
app/src/main/res/drawable-v24/btn_save.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.6 KiB |
BIN
app/src/main/res/drawable-v24/img_barcode.png
Normal file
BIN
app/src/main/res/drawable-v24/img_barcode.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.1 KiB |
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user