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 02:39:01 +09:00
parent fd62838070
commit ceb1d64307
26 changed files with 291 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/misc.xml generated
View File

@@ -127,9 +127,11 @@
<entry key="..\:/QTagger/a/QTagger_Android12/app/src/main/res/layout/fragment_info.xml" value="0.34427083333333336" />
<entry key="..\:/QTagger/a/QTagger_Android12/app/src/main/res/layout/fragment_insert.xml" value="0.31302083333333336" />
<entry key="..\:/QTagger/a/QTagger_Android12/app/src/main/res/layout/fragment_list.xml" value="0.3848958333333333" />
<entry key="..\:/QTagger/a/QTagger_Android12/app/src/main/res/layout/fragment_photograph.xml" value="0.31302083333333336" />
<entry key="..\:/QTagger/a/QTagger_Android12/app/src/main/res/layout/fragment_rfid.xml" value="0.31302083333333336" />
<entry key="..\:/QTagger/a/QTagger_Android12/app/src/main/res/layout/fragment_weight2.xml" value="0.31302083333333336" />
<entry key="..\:/QTagger/a/QTagger_Android12/app/src/main/res/layout/item_slider.xml" value="0.31302083333333336" />
<entry key="..\:/QTagger/a/QTagger_Android12/app/src/main/res/layout/layout_capture_test.xml" value="0.31302083333333336" />
<entry key="..\:/QTagger/a/QTagger_Android12/app/src/main/res/layout/layout_dialog.xml" value="0.31302083333333336" />
<entry key="..\:/QTagger/a/QTagger_Android12/app/src/main/res/layout/layout_dialog2.xml" value="0.31302083333333336" />
<entry key="..\:/QTagger/a/QTagger_Android12/app/src/main/res/layout/layout_side_menu.xml" value="0.31302083333333336" />

2
OpenCV/build/intermediates/cxx/Debug/a3l26472/meta/arm64-v8a/generate_cxx_metadata_6899_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_7419_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_7767_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_8096_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_8378_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_8675_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_9010_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_9347_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_9706_timing.txt Normal file
View File

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

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

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

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

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

10
OpenCV/build/intermediates/cxx/create_cxx_tasks_7601_timing.txt Normal file
View File

@@ -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 19ms
create_cxx_tasks completed in 20ms

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

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

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

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

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

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

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

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

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

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

58
app/src/main/java/com/qtagger/Activity/Test/CaptureFragment.java
View File

@@ -23,6 +23,7 @@ import android.graphics.drawable.Drawable;
import android.os.Build;
import android.os.Bundle;
import androidx.annotation.DrawableRes;
import androidx.annotation.RequiresApi;
import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.core.content.ContextCompat;
@@ -92,15 +93,17 @@ public class CaptureFragment extends Fragment {
btnBottomRight = view.findViewById(R.id.capture_bottomRight);
return view;
}
private void resetView(View view, String title, TestType type)
{
ImageView imageView = view.findViewById(R.id.imageView_Icon);
int resourceId = getResourceId(type);
if(resourceId != 0)
imageView.setImageResource(resourceId);
if(title != null && !title.isEmpty()) {
TextView textView = view.findViewById(R.id.capture_title);
textView.setText(title);
@@ -123,9 +126,56 @@ public class CaptureFragment extends Fragment {
LinearLayout linearLayout = view.findViewById(R.id.linearlayout_Info);
linearLayout.setVisibility(View.INVISIBLE);
}
private @DrawableRes int getResourceId(TestType type)
{
int result = 0;
switch (type)
{
case Top_Front:
result = R.drawable.top_front;
break;
case Top_Back:
result = R.drawable.top_back;
break;
case Top_Left:
result = R.drawable.top_left;
break;
case Top_Right:
result = R.drawable.top_right;
break;
case Middle_Front:
result = R.drawable.middle_front;
break;
case Middle_Back:
result = R.drawable.middle_back;
break;
case Middle_Left:
result = R.drawable.middle_left;
break;
case Middle_Right:
result = R.drawable.middle_right;
break;
case Bottom_Front:
result = R.drawable.bottom_front;
break;
case Bottom_Back:
result = R.drawable.bottom_back;
break;
case Bottom_Left:
result = R.drawable.bottom_left;
break;
case Bottom_Right:
result = R.drawable.bottom_right;
break;
}
return result;
}
private void allResetView()

33
app/src/main/java/com/qtagger/Activity/Test/FillFragment.java
View File

@@ -13,6 +13,7 @@ import android.graphics.drawable.Drawable;
import android.os.Build;
import android.os.Bundle;
import androidx.annotation.DrawableRes;
import androidx.annotation.RequiresApi;
import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.core.content.ContextCompat;
@@ -114,6 +115,11 @@ public class FillFragment extends Fragment {
private void resetView(View view, String title, int fillValue)
{
ImageView imageView = view.findViewById(R.id.imageView_Icon);
int resourceId = getResourceId(fillValue);
if(resourceId != 0)
imageView.setImageResource(resourceId);
if(title != null && !title.isEmpty()) {
TextView textView = view.findViewById(R.id.capture_title);
textView.setText(title);
@@ -155,6 +161,33 @@ public class FillFragment extends Fragment {
}
private @DrawableRes
int getResourceId(int fillValue)
{
int result = 0;
switch (fillValue)
{
case 100:
result = R.drawable.pack_100;
break;
case 75:
result = R.drawable.pack_75;
break;
case 50:
result = R.drawable.pack_50;
break;
case 25:
result = R.drawable.pack_25;
break;
default:
result = R.drawable.pack_direct;
break;
}
return result;
}
@RequiresApi(api = Build.VERSION_CODES.M)

221
app/src/main/java/com/qtagger/Activity/Test/InfoFragment.java
View File

@@ -175,7 +175,7 @@ public class InfoFragment extends Fragment {
connectViewMap.put("용기 종류",createInfoTextView(layout_defaultInfo1,"용기 종류"));
connectViewMap.put("폐기물종류",createInfoTextView(layout_defaultInfo1,"폐기물종류"));
connectViewMap.put("처리 방법",createInfoTextView(layout_defaultInfo1,"처리 방법"));
connectViewMap.put("총 중량(kg)",createInfoTextView(layout_defaultInfo1,"총 중량(kg)"));
connectViewMap.put("총중량(kg)",createInfoTextView(layout_defaultInfo1,"총중량(kg)"));
lastLine = true;
connectViewMap.put("내용물 중량(kg)",createInfoTextView(layout_defaultInfo1,"내용물 중량(kg)"));
@@ -197,9 +197,10 @@ public class InfoFragment extends Fragment {
connectViewMap.put("표면오염도",createInfoTextView(addInfo,"표면오염도(㏃/c㎡)"));
connectViewMap.put("표면오염도 측정일자",createInfoTextView(addInfo,"표면오염도 측정일자"));
connectViewMap.put("표면오염도 측정자",createInfoTextView(addInfo,"표면오염도 측정자"));
connectViewMap.put("표면방사선량률",createInfoTextView(addInfo,"표면방사선량률"));
connectViewMap.put("표면방사선량률(mSv/hr)",createInfoTextView(addInfo,"표면방사선량률(mSv/hr)"));
connectViewMap.put("표면선량률 측정일자",createInfoTextView(addInfo,"표면선량률 측정일자"));
connectViewMap.put("표면선량률 측정자",createInfoTextView(addInfo,"표면선량률 측정자"));
connectViewMap.put("채움률(%)",createInfoTextView(addInfo,"채움률(%)"));
connectViewMap.put("총방사능량",createInfoTextView(addInfo,"총방사능량(㏃)"));
connectViewMap.put("핵종측정일",createInfoTextView(addInfo,"핵종측정일"));
connectViewMap.put("핵종측정자",createInfoTextView(addInfo,"핵종측정자"));
@@ -386,7 +387,7 @@ public class InfoFragment extends Fragment {
connectViewMap.put("폭발성 등 유해물질",createInfoTextView(addInfo,"폭발성 등 유해물질"));
connectViewMap.put("표면오염도(Bq/cm²)",createInfoTextView(addInfo,"표면오염도(Bq/cm²)"));
connectViewMap.put("표면오염도 측정일자",createInfoTextView(addInfo,"표면오염도 측정일자"));
connectViewMap.put("표면방사선량률",createInfoTextView(addInfo,"표면방사선량률"));
connectViewMap.put("표면방사선량률(mSv/hr)",createInfoTextView(addInfo,"표면방사선량률(mSv/hr)"));
connectViewMap.put("표면선량률 측정일자",createInfoTextView(addInfo,"표면선량률 측정일자"));
connectViewMap.put("총방사능량",createInfoTextView(addInfo,"총방사능량"));
lastLine = true;
@@ -440,6 +441,36 @@ public class InfoFragment extends Fragment {
List<ImageFile> files = dataManager.dbHelper.selectFiles(dataManager.selPkg.getPKG_NO(),dataManager.testEnum.label());
double maxValue = -1;
double fillingMaxValue = -1;
ImageFile surfaceFile = null;
ImageFile weightFile = null;
ImageFile fillFile = null;
for (ImageFile imagefile : files) {
if(imagefile.getType().contains("Surface"))
{
double temp = Double.parseDouble(imagefile.getPkgData());
if(maxValue < temp)
{
maxValue = temp;
surfaceFile = imagefile;
}
}
else if(imagefile.getType().compareTo("Weight") == 0)
{
weightFile = imagefile;
}
else if(imagefile.getType().compareTo("Filling") == 0)
{
double temp = Double.parseDouble(imagefile.getPkgData());
if(fillingMaxValue < temp)
{
fillingMaxValue = temp;
fillFile = imagefile;
}
}
}
if(dataManager.testEnum == TestEnum.발생지특성규명) {
ORIGIN_CHRCT selPkg = (ORIGIN_CHRCT) dataManager.selPkg;
@@ -454,7 +485,7 @@ public class InfoFragment extends Fragment {
connectViewMap.get("용기 종류").setText(selPkg.getORIGIN_CONTAINER_TYPE());
connectViewMap.get("폐기물종류").setText(selPkg.getORIGIN_WASTE_TYPE());
connectViewMap.get("처리 방법").setText(selPkg.getORIGIN_PKG_PRCSN_MTHD());
connectViewMap.get("총 중량(kg)").setText(selPkg.getORIGIN_TOTAL_WEIGHT());
connectViewMap.get("총중량(kg)").setText(selPkg.getORIGIN_TOTAL_WEIGHT());
connectViewMap.get("내용물 중량(kg)").setText(selPkg.getORIGIN_PKG_IN_WT());
//포장물검사확인
@@ -471,7 +502,7 @@ public class InfoFragment extends Fragment {
connectViewMap.get("표면오염도").setText(selPkg.getORIGIN_PKG_SRFC_PLTN());
connectViewMap.get("표면오염도 측정일자").setText(selPkg.getORIGIN_PKG_SRFC_PLTN_DATE());
connectViewMap.get("표면오염도 측정자").setText(selPkg.getORIGIN_PKG_SRFC_PLTN_MSRRS());
connectViewMap.get("표면방사선량률").setText(selPkg.getORIGIN_PKG_SURFC_RD());
connectViewMap.get("표면방사선량률(mSv/hr)").setText(selPkg.getORIGIN_PKG_SURFC_RD());
connectViewMap.get("표면선량률 측정일자").setText(selPkg.getORIGIN_SURFC_RD_MSRMN_DATE());
connectViewMap.get("표면선량률 측정자").setText(selPkg.getORIGIN_PKG_SURFC_RD_MSRRS());
connectViewMap.get("총방사능량").setText(selPkg.getORIGIN_PKG_TOTAL_RDCTV_Bq());
@@ -504,51 +535,6 @@ public class InfoFragment extends Fragment {
connectViewMap.get("Tc-99").setText(selPkg.getORIGIN_CHRCT_Tc_99());
connectViewMap.get("Zn-65").setText(selPkg.getORIGIN_CHRCT_Zn_65());
connectViewMap.get("Zr-95").setText(selPkg.getORIGIN_CHRCT_Zr_95());
double maxValue = -1;
ImageFile surfaceFile = null;
ImageFile weightFile = null;
for (ImageFile imagefile : files) {
if(imagefile.getType().contains("Surface"))
{
double temp = Double.parseDouble(imagefile.getPkgData());
if(maxValue < temp)
{
maxValue = temp;
surfaceFile = imagefile;
}
}
if(imagefile.getType().compareTo("Weight") == 0)
{
weightFile = imagefile;
}
}
if(surfaceFile != null)
{
connectViewMap.get("표면방사선량률").setText(surfaceFile.getPkgData());
connectViewMap.get("표면방사선량률").setTextColor(Color.parseColor("#408DCF"));
connectViewMap.get("표면선량률 측정일자").setText(surfaceFile.getCreateDate());
connectViewMap.get("표면선량률 측정일자").setTextColor(Color.parseColor("#408DCF"));
connectViewMap.get("표면선량률 측정자").setText(surfaceFile.getUserId());
connectViewMap.get("표면선량률 측정자").setTextColor(Color.parseColor("#408DCF"));
}
else
{
connectViewMap.get("표면방사선량률").setTextColor(Color.BLACK);
connectViewMap.get("표면선량률 측정일자").setTextColor(Color.BLACK);
connectViewMap.get("표면선량률 측정자").setTextColor(Color.BLACK);
}
if(weightFile == null)
{
connectViewMap.get("총 중량(kg)").setTextColor(Color.BLACK);
}
else
{
connectViewMap.get("총 중량(kg)").setText(weightFile.getPkgData());
connectViewMap.get("총 중량(kg)").setTextColor(Color.parseColor("#408DCF"));
}
}
else if(dataManager.testEnum == TestEnum.인수검사){
ACCEPT_TEST selPkg = (ACCEPT_TEST) dataManager.selPkg;
@@ -616,49 +602,6 @@ public class InfoFragment extends Fragment {
connectViewMap.get("Zn-65").setText(selPkg.getACCEPT_TEST_Zn_65());
connectViewMap.get("Zr-95").setText(selPkg.getACCEPT_TEST_Zr_95());
double maxValue = -1;
ImageFile surfaceFile = null;
ImageFile weightFile = null;
for (ImageFile imagefile : files) {
if(imagefile.getType().contains("Surface"))
{
double temp = Double.parseDouble(imagefile.getPkgData());
if(maxValue < temp)
{
maxValue = temp;
surfaceFile = imagefile;
}
}
if(imagefile.getType().compareTo("Weight") == 0)
{
weightFile = imagefile;
}
}
if(surfaceFile != null)
{
connectViewMap.get("표면방사선량률(mSv/hr)").setText(surfaceFile.getPkgData());
connectViewMap.get("표면방사선량률(mSv/hr)").setTextColor(Color.parseColor("#408DCF"));
connectViewMap.get("표면선량률 측정일자").setText(surfaceFile.getCreateDate());
connectViewMap.get("표면선량률 측정일자").setTextColor(Color.parseColor("#408DCF"));
}
else
{
connectViewMap.get("표면방사선량률(mSv/hr)").setTextColor(Color.BLACK);
connectViewMap.get("표면선량률 측정일자").setTextColor(Color.BLACK);
}
if(weightFile == null)
{
connectViewMap.get("총중량(kg)").setTextColor(Color.BLACK);
}
else
{
connectViewMap.get("총중량(kg)").setText(weightFile.getPkgData());
connectViewMap.get("총중량(kg)").setTextColor(Color.parseColor("#408DCF"));
}
}
else if(dataManager.testEnum == TestEnum.처분검사){
DISPOSAL_TEST selPkg = (DISPOSAL_TEST) dataManager.selPkg;
@@ -719,7 +662,7 @@ public class InfoFragment extends Fragment {
connectViewMap.get("폭발성 등 유해물질").setText(selPkg.getPREPAR_HAZA_SUBSTANCES());
connectViewMap.get("표면오염도(Bq/cm²)").setText(selPkg.getPREPAR_SURFC_PLT());
connectViewMap.get("표면오염도 측정일자").setText(selPkg.getPREPAR_SURFC_PLT_DATE());
connectViewMap.get("표면방사선량률").setText(selPkg.getPREPAR_SURFC_RD_RATE());
connectViewMap.get("표면방사선량률(mSv/hr)").setText(selPkg.getPREPAR_SURFC_RD_RATE());
connectViewMap.get("표면선량률 측정일자").setText(selPkg.getPREPAR_SURFC_RD_DATE());
connectViewMap.get("총방사능량").setText(selPkg.getPREPAR_TOT_RD_QTY());
connectViewMap.get("핵종분석일").setText(selPkg.getPREPAR_NUCLIDE_ANALS_DATE());
@@ -751,66 +694,38 @@ public class InfoFragment extends Fragment {
connectViewMap.get("Tc-99").setText(selPkg.getPREPAR_TEST_Tc_99());
connectViewMap.get("Zn-65").setText(selPkg.getPREPAR_TEST_Zn_65());
connectViewMap.get("Zr-95").setText(selPkg.getPREPAR_TEST_Zr_95());
double maxValue = -1;
ImageFile surfaceFile = null;
ImageFile weightFile = null;
ImageFile fillFile = null;
for (ImageFile imagefile : files) {
if(imagefile.getType().contains("Surface"))
{
double temp = Double.parseDouble(imagefile.getPkgData());
if(maxValue < temp)
{
maxValue = temp;
surfaceFile = imagefile;
}
}
if(imagefile.getType().compareTo("Weight") == 0)
{
weightFile = imagefile;
}
if(fillFile.getType().compareTo("Filling") == 0)
{
fillFile = imagefile;
}
}
if(surfaceFile != null)
{
connectViewMap.get("표면방사선량률").setText(surfaceFile.getPkgData());
connectViewMap.get("표면방사선량률").setTextColor(Color.parseColor("#408DCF"));
connectViewMap.get("표면선량률 측정일자").setText(surfaceFile.getCreateDate());
connectViewMap.get("표면선량률 측정일자").setTextColor(Color.parseColor("#408DCF"));
}
else
{
connectViewMap.get("표면방사선량률").setTextColor(Color.BLACK);
connectViewMap.get("표면선량률 측정일자").setTextColor(Color.BLACK);
}
if(weightFile == null)
{
connectViewMap.get("총중량(kg)").setTextColor(Color.BLACK);
}
else
{
connectViewMap.get("총중량(kg)").setText(weightFile.getPkgData());
connectViewMap.get("총중량(kg)").setTextColor(Color.parseColor("#408DCF"));
}
/*
if(fillFile == null)
{
connectViewMap.get("채움률(%)").setTextColor(Color.BLACK);
}
else
{
connectViewMap.get("채움률(%)").setText(weightFile.getPkgData());
connectViewMap.get("채움률(%)").setTextColor(Color.parseColor("#408DCF"));
}*/
}
//QTagger 데이터 업데이트
updateMapData("표면방사선량률(mSv/hr)",surfaceFile,0);
updateMapData("표면선량률 측정일자",surfaceFile,1);
updateMapData("표면선량률 측정자",surfaceFile,2);
updateMapData("총중량(kg)",weightFile,0);
updateMapData("채움률(%)",fillFile,0);
}
//0 기본, 1 날짜, 2 생성유저
private void updateMapData(String key,ImageFile data, int type)
{
if(connectViewMap.get(key) != null )
{
if(data != null)
{
if(type == 1)
connectViewMap.get(key).setText(data.getCreateDate());
else if(type == 2)
connectViewMap.get(key).setText(data.getUserId());
else
connectViewMap.get(key).setText(data.getPkgData());
connectViewMap.get(key).setTextColor(Color.parseColor("#408DCF"));
}
else
{
connectViewMap.get(key).setTextColor(Color.BLACK);
}
}
}
public void createInfoTitle(LinearLayout linearLayout,String title)

9
app/src/main/java/com/qtagger/Activity/Test/InsertFragment.java
View File

@@ -1,8 +1,12 @@
package com.qtagger.Activity.Test;
import android.content.Intent;
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.os.Bundle;
import androidx.annotation.RequiresApi;
import androidx.core.content.ContextCompat;
import androidx.fragment.app.Fragment;
import android.text.Editable;
@@ -152,6 +156,7 @@ public class InsertFragment extends Fragment {
}
@RequiresApi(api = Build.VERSION_CODES.M)
@Override
public void onStart() {
super.onStart();
@@ -167,6 +172,8 @@ public class InsertFragment extends Fragment {
editText_value.setInputType(InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_FLAG_DECIMAL);
textView_title.setText("직접 입력");
editText_value.setHint("채움률을 입력해주세요.");
Drawable defaultDrawable = ContextCompat.getDrawable(getActivity(),R.drawable.pack_direct);
button_Picture.setForeground(defaultDrawable);
}
else if(type == TestType.Nothing)
@@ -174,6 +181,8 @@ public class InsertFragment extends Fragment {
editText_value.setInputType(InputType.TYPE_CLASS_TEXT);
textView_title.setText("사진 설명 입력");
editText_value.setHint("설명을 입력해주세요.");
Drawable defaultDrawable = ContextCompat.getDrawable(getActivity(),R.drawable.photo_add);
button_Picture.setForeground(defaultDrawable);
}
}

2
app/src/main/java/com/qtagger/Activity/Test/WeightFragment.java
View File

@@ -127,7 +127,7 @@ public class WeightFragment extends Fragment {
imageView_deleteButton.setVisibility(View.GONE);
tableLayout_data.setVisibility(View.GONE);
Drawable buttonBackground = ContextCompat.getDrawable(context,R.drawable.listview_background);
Drawable defaultDrawable = ContextCompat.getDrawable(context,R.drawable.img_cam02);
Drawable defaultDrawable = ContextCompat.getDrawable(context,R.drawable.scale);
weightButton.setBackground(buttonBackground);
weightButton.setForeground(defaultDrawable);
}

108
app/src/main/res/layout/fragment_insert.xml
View File

@@ -6,66 +6,68 @@
android:background="@color/defaultBackgroundColor"
tools:context=".Activity.Test.InsertFragment">
<!-- TODO: Update blank fragment layout -->
<LinearLayout
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="25dp"
android:layout_marginTop="20dp"
android:layout_marginRight="20dp"
android:orientation="horizontal">
android:layout_height="match_parent"
android:orientation="vertical">
<TextView
android:id="@+id/textView_title"
android:layout_width="wrap_content"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="직접 입력"
android:textSize="18sp"
android:textStyle="bold" />
android:layout_marginLeft="25dp"
android:layout_marginTop="20dp"
android:layout_marginRight="20dp"
android:orientation="horizontal">
<ImageView
android:id="@+id/itemButton"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:visibility="invisible"
android:src="@drawable/btn_back_white"/>
<TextView
android:id="@+id/textView_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="직접 입력"
android:textSize="18sp"
android:textStyle="bold" />
<ImageView
android:id="@+id/itemButton"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:src="@drawable/btn_back_white"
android:visibility="invisible" />
</LinearLayout>
<EditText
android:id="@+id/editText_value"
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_margin="20dp"
android:background="@drawable/searchview_background"
android:hint="채움률을 입력해주세요."
android:paddingLeft="20dp"
android:textSize="14sp" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="#EEEEEE" />
<com.qtagger.CustomPalette.SquareButton
android:id="@+id/button_Picture"
android:layout_width="match_parent"
android:layout_height="500dp"
android:layout_margin="20dp"
android:background="@drawable/listview_background"
android:foreground="@drawable/img_cam02"
android:foregroundGravity="center"
android:stateListAnimator="@null" />
</LinearLayout>
<EditText
android:id="@+id/editText_value"
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_margin="20dp"
android:background="@drawable/searchview_background"
android:hint="채움률을 입력해주세요."
android:textSize="14sp"
android:paddingLeft="20dp" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="#EEEEEE" />
<com.qtagger.CustomPalette.SquareButton
android:id="@+id/button_Picture"
android:layout_width="match_parent"
android:layout_height="500dp"
android:layout_margin="20dp"
android:background="@drawable/listview_background"
android:foreground="@drawable/img_cam02"
android:foregroundGravity="center"
android:stateListAnimator="@null" />
</LinearLayout>
</ScrollView>
</FrameLayout>

3
app/src/main/res/layout/fragment_photograph.xml
View File

@@ -61,13 +61,14 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/img_cam01" />
app:srcCompat="@drawable/photo_add" />
<TextView
android:id="@+id/capture_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="추가"
android:visibility="invisible"
android:textColor="@color/defaultDisableTextColor"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"

8
app/src/main/res/layout/layout_capture_test.xml
View File

@@ -18,26 +18,26 @@
android:visibility="visible">
<ImageView
android:id="@+id/imageView3"
android:id="@+id/imageView_Icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="4dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/img_cam01" />
app:srcCompat="@drawable/photo_add" />
<TextView
android:id="@+id/capture_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="TOP-FRONT"
android:visibility="invisible"
android:textColor="@color/defaultDisableTextColor"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imageView3" />
app:layout_constraintTop_toBottomOf="@+id/imageView_Icon" />
</androidx.constraintlayout.widget.ConstraintLayout>