ㅈㄷ
This commit is contained in:
6
.idea/misc.xml
generated
6
.idea/misc.xml
generated
@@ -83,17 +83,23 @@
|
||||
<entry key="..\:/QTagger/a/QTagger_Android4/app/src/main/res/layout/fragment_rfid.xml" value="0.39739583333333334" />
|
||||
<entry key="..\:/QTagger/a/QTagger_Android4/app/src/main/res/layout/fragment_weight.xml" value="0.39739583333333334" />
|
||||
<entry key="..\:/QTagger/a/QTagger_Android4/app/src/main/res/layout/fragment_weight2.xml" value="0.5536458333333333" />
|
||||
<entry key="..\:/QTagger/a/QTagger_Android5/app/src/main/res/drawable/bg_fading_edge.xml" value="0.4395" />
|
||||
<entry key="..\:/QTagger/a/QTagger_Android5/app/src/main/res/drawable/bg_indicator_active.xml" value="0.4395" />
|
||||
<entry key="..\:/QTagger/a/QTagger_Android5/app/src/main/res/drawable/bg_indicator_inactive.xml" value="0.4395" />
|
||||
<entry key="..\:/QTagger/a/QTagger_Android5/app/src/main/res/drawable/default_fragment_background.xml" value="0.4645" />
|
||||
<entry key="..\:/QTagger/a/QTagger_Android5/app/src/main/res/drawable/item_slider.xml" value="0.4395" />
|
||||
<entry key="..\:/QTagger/a/QTagger_Android5/app/src/main/res/layout/activity_photography2.xml" value="0.3848958333333333" />
|
||||
<entry key="..\:/QTagger/a/QTagger_Android5/app/src/main/res/layout/activity_search.xml" value="0.3848958333333333" />
|
||||
<entry key="..\:/QTagger/a/QTagger_Android5/app/src/main/res/layout/activity_test2.xml" value="0.39739583333333334" />
|
||||
<entry key="..\:/QTagger/a/QTagger_Android5/app/src/main/res/layout/fragment_barcode.xml" value="0.5536458333333333" />
|
||||
<entry key="..\:/QTagger/a/QTagger_Android5/app/src/main/res/layout/fragment_capture.xml" value="0.4259365994236311" />
|
||||
<entry key="..\:/QTagger/a/QTagger_Android5/app/src/main/res/layout/fragment_fill.xml" value="0.3848958333333333" />
|
||||
<entry key="..\:/QTagger/a/QTagger_Android5/app/src/main/res/layout/fragment_info.xml" value="0.4427083333333333" />
|
||||
<entry key="..\:/QTagger/a/QTagger_Android5/app/src/main/res/layout/fragment_list.xml" value="0.3848958333333333" />
|
||||
<entry key="..\:/QTagger/a/QTagger_Android5/app/src/main/res/layout/fragment_photograph.xml" value="0.33" />
|
||||
<entry key="..\:/QTagger/a/QTagger_Android5/app/src/main/res/layout/fragment_rfid.xml" value="0.3848958333333333" />
|
||||
<entry key="..\:/QTagger/a/QTagger_Android5/app/src/main/res/layout/fragment_weight2.xml" value="0.3848958333333333" />
|
||||
<entry key="..\:/QTagger/a/QTagger_Android5/app/src/main/res/layout/item_slider.xml" value="0.44166666666666665" />
|
||||
<entry key="..\:/QTagger/a/QTagger_Android5/app/src/main/res/xml/file_paths.xml" value="0.3963541666666667" />
|
||||
</map>
|
||||
</option>
|
||||
|
||||
@@ -39,9 +39,11 @@ dependencies {
|
||||
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
|
||||
implementation 'androidx.room:room-common:2.4.3'
|
||||
implementation 'androidx.room:room-runtime:2.4.3'
|
||||
implementation 'com.github.bumptech.glide:glide:4.9.0'
|
||||
testImplementation 'junit:junit:4.13.2'
|
||||
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
|
||||
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
|
||||
annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
|
||||
annotationProcessor 'androidx.room:room-compiler:2.4.3'
|
||||
implementation fileTree(dir: 'C:\\lib\\libs-wsmr', include: ['*.aar', '*.jar'], exclude: [])
|
||||
}
|
||||
@@ -23,6 +23,7 @@
|
||||
<uses-permission android:name="android.permission.INTERNET" />
|
||||
<application
|
||||
android:allowBackup="true"
|
||||
android:requestLegacyExternalStorage="true"
|
||||
android:dataExtractionRules="@xml/data_extraction_rules"
|
||||
android:fullBackupContent="@xml/backup_rules"
|
||||
android:icon="@mipmap/ic_launcher"
|
||||
|
||||
@@ -1,14 +1,22 @@
|
||||
package com.qtagger.Activity.Test;
|
||||
|
||||
import android.content.Context;
|
||||
import android.os.Bundle;
|
||||
|
||||
import androidx.constraintlayout.widget.ConstraintLayout;
|
||||
import androidx.core.content.ContextCompat;
|
||||
import androidx.fragment.app.Fragment;
|
||||
import androidx.viewpager2.widget.ViewPager2;
|
||||
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.ImageView;
|
||||
import android.widget.LinearLayout;
|
||||
import android.widget.TextView;
|
||||
|
||||
import com.qtagger.R;
|
||||
import com.qtagger.util.ImageSliderAdapter;
|
||||
|
||||
/**
|
||||
* A simple {@link Fragment} subclass.
|
||||
@@ -17,6 +25,20 @@ import com.qtagger.R;
|
||||
*/
|
||||
public class InfoFragment extends Fragment {
|
||||
|
||||
private ViewPager2 sliderViewPager;
|
||||
private LinearLayout layoutIndicator;
|
||||
private TextView textPictureInfo;
|
||||
|
||||
private String[] images = new String[] {
|
||||
"https://cdn.pixabay.com/photo/2019/12/26/10/44/horse-4720178_1280.jpg",
|
||||
"https://cdn.pixabay.com/photo/2020/11/04/15/29/coffee-beans-5712780_1280.jpg",
|
||||
"https://cdn.pixabay.com/photo/2020/03/08/21/41/landscape-4913841_1280.jpg",
|
||||
"https://cdn.pixabay.com/photo/2020/09/02/18/03/girl-5539094_1280.jpg",
|
||||
"https://cdn.pixabay.com/photo/2014/03/03/16/15/mosque-279015_1280.jpg",
|
||||
"/storage/emulated/0/Download/check1.jpg"
|
||||
|
||||
};
|
||||
|
||||
// TODO: Rename parameter arguments, choose names that match
|
||||
// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
|
||||
private static final String ARG_PARAM1 = "param1";
|
||||
@@ -25,6 +47,7 @@ public class InfoFragment extends Fragment {
|
||||
// TODO: Rename and change types of parameters
|
||||
private String mParam1;
|
||||
private String mParam2;
|
||||
private Context context;
|
||||
|
||||
public InfoFragment() {
|
||||
// Required empty public constructor
|
||||
@@ -60,7 +83,63 @@ public class InfoFragment extends Fragment {
|
||||
@Override
|
||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||
Bundle savedInstanceState) {
|
||||
View view = inflater.inflate(R.layout.fragment_info, container, false);
|
||||
context = getContext();
|
||||
|
||||
sliderViewPager = view.findViewById(R.id.sliderViewPager);
|
||||
layoutIndicator = view.findViewById(R.id.layoutIndicators);
|
||||
textPictureInfo= view.findViewById(R.id.text_picture_info);
|
||||
|
||||
sliderViewPager.setOffscreenPageLimit(1);
|
||||
sliderViewPager.setAdapter(new ImageSliderAdapter(context, images));
|
||||
sliderViewPager.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback() {
|
||||
@Override
|
||||
public void onPageSelected(int position) {
|
||||
super.onPageSelected(position);
|
||||
setCurrentIndicator(position);
|
||||
textPictureInfo.setText(images[position]);
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
setupIndicators(images.length);
|
||||
|
||||
// Inflate the layout for this fragment
|
||||
return inflater.inflate(R.layout.fragment_info, container, false);
|
||||
return view;
|
||||
}
|
||||
|
||||
private void setupIndicators(int count) {
|
||||
ImageView[] indicators = new ImageView[count];
|
||||
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
|
||||
ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
|
||||
|
||||
params.setMargins(16, 8, 16, 8);
|
||||
|
||||
for (int i = 0; i < indicators.length; i++) {
|
||||
indicators[i] = new ImageView(getContext());
|
||||
indicators[i].setImageDrawable(ContextCompat.getDrawable(context,
|
||||
R.drawable.bg_indicator_inactive));
|
||||
indicators[i].setLayoutParams(params);
|
||||
layoutIndicator.addView(indicators[i]);
|
||||
}
|
||||
setCurrentIndicator(0);
|
||||
}
|
||||
|
||||
private void setCurrentIndicator(int position) {
|
||||
int childCount = layoutIndicator.getChildCount();
|
||||
for (int i = 0; i < childCount; i++) {
|
||||
ImageView imageView = (ImageView) layoutIndicator.getChildAt(i);
|
||||
if (i == position) {
|
||||
imageView.setImageDrawable(ContextCompat.getDrawable(
|
||||
context,
|
||||
R.drawable.bg_indicator_active
|
||||
));
|
||||
} else {
|
||||
imageView.setImageDrawable(ContextCompat.getDrawable(
|
||||
context,
|
||||
R.drawable.bg_indicator_inactive
|
||||
));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,2 +1,32 @@
|
||||
package com.qtagger.CustomPalette;public class SquareConstLayout {
|
||||
package com.qtagger.CustomPalette;
|
||||
|
||||
import android.content.Context;
|
||||
import android.util.AttributeSet;
|
||||
|
||||
import androidx.constraintlayout.widget.ConstraintLayout;
|
||||
|
||||
public class SquareConstLayout extends ConstraintLayout {
|
||||
public SquareConstLayout(Context context) {
|
||||
super(context);
|
||||
}
|
||||
|
||||
public SquareConstLayout(Context context, AttributeSet attrs) {
|
||||
super(context, attrs);
|
||||
}
|
||||
|
||||
public SquareConstLayout(Context context, AttributeSet attrs, int defStyle) {
|
||||
super(context, attrs, defStyle);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
|
||||
|
||||
int width = MeasureSpec.getSize(widthMeasureSpec);
|
||||
int height = MeasureSpec.getSize(heightMeasureSpec);
|
||||
|
||||
width = Math.min(width, height);
|
||||
height = width;
|
||||
|
||||
setMeasuredDimension(width, height);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,2 +1,23 @@
|
||||
package com.qtagger.Database;public class DBHelper {
|
||||
}
|
||||
package com.qtagger.Database;
|
||||
|
||||
import android.content.Context;
|
||||
import android.database.sqlite.SQLiteDatabase;
|
||||
import android.database.sqlite.SQLiteOpenHelper;
|
||||
|
||||
public class DBHelper extends SQLiteOpenHelper {
|
||||
public DBHelper(Context context) {
|
||||
super(context, "groupDB", null, 1);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onCreate(SQLiteDatabase db) {
|
||||
db.execSQL("CREATE TABLE groupTBL ( gName CHAR(20) PRIMARY KEY,gNumber INTEGER);");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
|
||||
db.execSQL("DROP TABLE IF EXISTS groupTBL");
|
||||
onCreate(db);
|
||||
|
||||
}
|
||||
}
|
||||
@@ -1,27 +1,24 @@
|
||||
package com.qtagger;
|
||||
|
||||
import android.Manifest;
|
||||
import static android.os.Environment.DIRECTORY_DCIM;
|
||||
import static android.os.Environment.DIRECTORY_DOWNLOADS;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.net.ConnectivityManager;
|
||||
import android.net.NetworkInfo;
|
||||
import android.net.Uri;
|
||||
import android.os.Build;
|
||||
import android.os.Bundle;
|
||||
import android.os.Environment;
|
||||
import android.view.View;
|
||||
import android.widget.ArrayAdapter;
|
||||
import android.widget.Button;
|
||||
import android.widget.Spinner;
|
||||
import android.widget.Toast;
|
||||
|
||||
import androidx.activity.result.ActivityResult;
|
||||
import androidx.activity.result.ActivityResultCallback;
|
||||
import androidx.activity.result.ActivityResultLauncher;
|
||||
import androidx.activity.result.contract.ActivityResultContracts;
|
||||
import androidx.annotation.RequiresApi;
|
||||
import androidx.appcompat.app.AppCompatActivity;
|
||||
import androidx.core.app.ActivityCompat;
|
||||
import androidx.core.content.ContextCompat;
|
||||
import androidx.room.Room;
|
||||
|
||||
import com.qtagger.Activity.AccountAdd;
|
||||
@@ -33,24 +30,23 @@ import com.qtagger.Database.AppDatabase;
|
||||
import com.qtagger.util.CommonHelper;
|
||||
import com.qtagger.util.DataManager;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.nio.file.Files;
|
||||
import java.util.List;
|
||||
|
||||
public class MainActivity extends AppCompatActivity {
|
||||
private static final int REQUEST_CODE = 0;
|
||||
private Spinner mSpinner;
|
||||
private Button btnLogin;
|
||||
private DataManager dataManager;
|
||||
private List<Account> accountList;
|
||||
|
||||
ActivityResultLauncher<Intent> activityResultPicture = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), new ActivityResultCallback<ActivityResult>() {
|
||||
@Override
|
||||
public void onActivityResult(ActivityResult result) {
|
||||
CommonHelper.CameraResult(result);
|
||||
@RequiresApi(api = Build.VERSION_CODES.O)
|
||||
public static void copy(File origin, File dest) throws IOException {
|
||||
Files.copy(origin.toPath(), dest.toPath());
|
||||
}
|
||||
|
||||
}
|
||||
});
|
||||
|
||||
@RequiresApi(api = Build.VERSION_CODES.M)
|
||||
@RequiresApi(api = Build.VERSION_CODES.O)
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
@@ -60,16 +56,47 @@ public class MainActivity extends AppCompatActivity {
|
||||
dataManager = DataManager.getInstance();
|
||||
CommonHelper.CheckCameraPermission(this);
|
||||
|
||||
//테스트용도 나중에 삭제
|
||||
findViewById(R.id.imageView).setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
File path22 = getDatabasePath("groupDB");
|
||||
try {
|
||||
copy(path22,new File(Environment.getExternalStoragePublicDirectory(DIRECTORY_DOWNLOADS).getPath()+"/groupDB"));
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
//Intent intent = new Intent(getApplicationContext(), test.class);
|
||||
//startActivity(intent);
|
||||
Intent intent = new Intent(getApplicationContext(), TestSelectActivity.class);
|
||||
startActivity(intent);
|
||||
}
|
||||
File path2 = getDatabasePath("AccountDB");
|
||||
try {
|
||||
copy(path2,new File(Environment.getExternalStoragePublicDirectory(DIRECTORY_DOWNLOADS).getPath()+"/AccountDB2"));
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
/*
|
||||
File path = Environment.getExternalStoragePublicDirectory(DIRECTORY_DOWNLOADS);
|
||||
File[] files = path.listFiles();
|
||||
files = getFilesDir().listFiles();
|
||||
File path22 = getDatabasePath("AccountDB");
|
||||
try {
|
||||
copy(path22,new File(path.getPath()+"/Account"));
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
Uri uri = Uri.fromParts("package",this.getPackageName(),null);
|
||||
//String path123 = uri.getPath();
|
||||
|
||||
|
||||
|
||||
files = (new File(uri.getPath())).listFiles();
|
||||
|
||||
*/
|
||||
|
||||
|
||||
//테스트용도 나중에 삭제
|
||||
findViewById(R.id.imageView).setOnClickListener(v -> {
|
||||
Intent intent = new Intent(getApplicationContext(), test.class);
|
||||
startActivity(intent);
|
||||
//Intent intent = new Intent(getApplicationContext(), TestSelectActivity.class);
|
||||
//startActivity(intent);
|
||||
});
|
||||
|
||||
//로그인
|
||||
@@ -86,8 +113,7 @@ public class MainActivity extends AppCompatActivity {
|
||||
}
|
||||
else
|
||||
{
|
||||
Account selectAcc = accountList.get(selId-1);
|
||||
dataManager.loginAccount = selectAcc;
|
||||
dataManager.loginAccount = accountList.get(selId-1);
|
||||
Intent intent2 = new Intent(getApplicationContext(), NavigationActivity.class);
|
||||
startActivity(intent2);
|
||||
}
|
||||
@@ -131,6 +157,7 @@ public class MainActivity extends AppCompatActivity {
|
||||
aa_items.add("사용자를 선택해주세요");
|
||||
AppDatabase db = Room.databaseBuilder(this,AppDatabase.class,"AccountDB").allowMainThreadQueries().build();
|
||||
|
||||
|
||||
//초기 데이터 세팅
|
||||
accountList = db.accountDao().getAll();
|
||||
for (Account ac: accountList) {
|
||||
|
||||
@@ -8,6 +8,7 @@ import androidx.appcompat.app.AppCompatActivity;
|
||||
import androidx.core.content.ContextCompat;
|
||||
import androidx.room.Room;
|
||||
|
||||
import android.database.sqlite.SQLiteDatabase;
|
||||
import android.graphics.Color;
|
||||
import android.graphics.drawable.Drawable;
|
||||
import android.os.AsyncTask;
|
||||
@@ -22,6 +23,7 @@ import android.widget.TextView;
|
||||
|
||||
import com.qtagger.Database.Account;
|
||||
import com.qtagger.Database.AppDatabase;
|
||||
import com.qtagger.Database.DBHelper;
|
||||
import com.qtagger.util.DataManager;
|
||||
|
||||
import org.json.JSONObject;
|
||||
@@ -38,12 +40,28 @@ import java.net.URL;
|
||||
public class test extends AppCompatActivity {
|
||||
ListView list1;
|
||||
private DataManager dataManager;
|
||||
DBHelper dbHelper;
|
||||
SQLiteDatabase sqlDB;
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.activity_test);
|
||||
dataManager = DataManager.getInstance();
|
||||
list1 = findViewById(R.id.list_test);
|
||||
dbHelper = new DBHelper(this);
|
||||
|
||||
sqlDB = dbHelper.getWritableDatabase();
|
||||
dbHelper.onUpgrade(sqlDB,1,2);
|
||||
sqlDB.close();
|
||||
|
||||
|
||||
sqlDB = dbHelper.getWritableDatabase();
|
||||
//sqlDB.execSQL("INSERT INTO groupTBL VALUES ( aaa,bbb);");
|
||||
String temp1 = "aaa";
|
||||
String temp2 = "1";
|
||||
|
||||
sqlDB.execSQL("INSERT INTO groupTBL VALUES ( '" + temp1 + "' , "+temp2 +");");
|
||||
sqlDB.close();
|
||||
|
||||
|
||||
String testString[] = {"A","B","C"};//,"D","E","A","B","C","D","E"};
|
||||
@@ -66,13 +84,17 @@ public class test extends AppCompatActivity {
|
||||
|
||||
list1.setAdapter(aa_items);
|
||||
|
||||
|
||||
AppDatabase db = Room.databaseBuilder(this,AppDatabase.class,"AccountDB").allowMainThreadQueries().build();
|
||||
|
||||
findViewById(R.id.button3).setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
|
||||
HttpGet();
|
||||
|
||||
|
||||
|
||||
//HttpGet();
|
||||
//http://1.245.98.188:9085/api/cmmn/getNotPassTypeCombo
|
||||
|
||||
//URL url = new URL("http://1.245.98.188:9097/api/cmmn/getNotPassTypeCombo");
|
||||
|
||||
@@ -1,2 +1,58 @@
|
||||
package com.qtagger.util;public class ImageSliderAdapter {
|
||||
package com.qtagger.util;
|
||||
|
||||
import android.content.Context;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.ImageView;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import com.bumptech.glide.Glide;
|
||||
import com.qtagger.R;
|
||||
|
||||
public class ImageSliderAdapter extends RecyclerView.Adapter<ImageSliderAdapter.MyViewHolder> {
|
||||
private Context context;
|
||||
private String[] sliderImage;
|
||||
|
||||
public ImageSliderAdapter(Context context, String[] sliderImage) {
|
||||
this.context = context;
|
||||
this.sliderImage = sliderImage;
|
||||
}
|
||||
|
||||
@NonNull
|
||||
@Override
|
||||
public MyViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
|
||||
View view = LayoutInflater.from(parent.getContext())
|
||||
.inflate(R.layout.item_slider, parent, false);
|
||||
|
||||
return new MyViewHolder(view);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onBindViewHolder(@NonNull MyViewHolder holder, int position) {
|
||||
holder.bindSliderImage(sliderImage[position]);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getItemCount() {
|
||||
return sliderImage.length;
|
||||
}
|
||||
|
||||
public class MyViewHolder extends RecyclerView.ViewHolder {
|
||||
|
||||
private ImageView mImageView;
|
||||
|
||||
public MyViewHolder(@NonNull View itemView) {
|
||||
super(itemView);
|
||||
mImageView = itemView.findViewById(R.id.imageSlider);
|
||||
}
|
||||
|
||||
public void bindSliderImage(String imageURL) {
|
||||
Glide.with(context)
|
||||
.load(imageURL)
|
||||
.into(mImageView);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,4 +1,12 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
</selector>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="oval">
|
||||
|
||||
<size
|
||||
android:width="12dp"
|
||||
android:height="12dp" />
|
||||
|
||||
<solid
|
||||
android:color="#6200EE" />
|
||||
|
||||
</shape>
|
||||
@@ -1,4 +1,12 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="oval">
|
||||
|
||||
</selector>
|
||||
<size
|
||||
android:width="8dp"
|
||||
android:height="8dp" />
|
||||
|
||||
<solid
|
||||
android:color="#eeeeee" />
|
||||
|
||||
</shape>
|
||||
@@ -3,12 +3,533 @@
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
tools:context=".Activity.Test.InfoFragment">
|
||||
|
||||
<!-- TODO: Update blank fragment layout -->
|
||||
<TextView
|
||||
<ScrollView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:text="@string/hello_blank_fragment" />
|
||||
android:scrollbars="none">
|
||||
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/linearList"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="10dp"
|
||||
android:background="@drawable/default_fragment_background"
|
||||
android:orientation="vertical">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="10dp"
|
||||
android:layout_marginTop="10dp"
|
||||
android:layout_marginBottom="10dp"
|
||||
android:text="일반 요건"
|
||||
android:textColor="@color/black"
|
||||
android:textSize="24sp">
|
||||
|
||||
</TextView>
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<TextView
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="0.7"
|
||||
android:gravity="left"
|
||||
android:paddingLeft="10dp"
|
||||
android:text="포장물 번호"
|
||||
android:textSize="16sp">
|
||||
|
||||
</TextView>
|
||||
|
||||
<TextView
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="left"
|
||||
android:text="AR0000B000000"
|
||||
android:textSize="16sp">
|
||||
|
||||
</TextView>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<TextView
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="0.7"
|
||||
android:gravity="left"
|
||||
android:paddingLeft="10dp"
|
||||
android:text="포장 일자"
|
||||
android:textSize="16sp">
|
||||
|
||||
</TextView>
|
||||
|
||||
<TextView
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="left"
|
||||
android:text="2014-01-01"
|
||||
android:textSize="16sp">
|
||||
|
||||
</TextView>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<TextView
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="0.7"
|
||||
android:gravity="left"
|
||||
android:paddingLeft="10dp"
|
||||
android:text="발생기관"
|
||||
android:textSize="16sp">
|
||||
|
||||
</TextView>
|
||||
|
||||
<TextView
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="left"
|
||||
android:text="한국원자력연구원"
|
||||
android:textSize="16sp">
|
||||
|
||||
</TextView>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<TextView
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="0.7"
|
||||
android:gravity="left"
|
||||
android:paddingLeft="10dp"
|
||||
android:text="폐기물내용물"
|
||||
android:textSize="16sp">
|
||||
|
||||
</TextView>
|
||||
|
||||
<TextView
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="left"
|
||||
android:text="비닐류"
|
||||
android:textSize="16sp">
|
||||
|
||||
</TextView>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<TextView
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="0.7"
|
||||
android:gravity="left"
|
||||
android:paddingLeft="10dp"
|
||||
android:text="총중량(kg)"
|
||||
android:textSize="16sp">
|
||||
|
||||
</TextView>
|
||||
|
||||
<TextView
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="left"
|
||||
android:text="100"
|
||||
android:textSize="16sp">
|
||||
|
||||
</TextView>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<TextView
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="0.7"
|
||||
android:gravity="left"
|
||||
android:paddingLeft="10dp"
|
||||
android:text="내용물 중량(kg)"
|
||||
android:textSize="16sp">
|
||||
|
||||
</TextView>
|
||||
|
||||
<TextView
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="left"
|
||||
android:text="80.4"
|
||||
android:textSize="16sp">
|
||||
|
||||
</TextView>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<TextView
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="0.7"
|
||||
android:gravity="left"
|
||||
android:paddingLeft="10dp"
|
||||
android:text="포장물 크기"
|
||||
android:textSize="16sp">
|
||||
|
||||
</TextView>
|
||||
|
||||
<TextView
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="left"
|
||||
android:text="일반잡고체(200L)"
|
||||
android:textSize="16sp">
|
||||
|
||||
</TextView>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="10dp"
|
||||
android:background="@drawable/default_fragment_background"
|
||||
android:orientation="vertical">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="10dp"
|
||||
android:layout_marginTop="10dp"
|
||||
android:layout_marginBottom="10dp"
|
||||
android:text="방사선적 특성"
|
||||
android:textColor="@color/black"
|
||||
android:textSize="24sp">
|
||||
|
||||
</TextView>
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<TextView
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="0.7"
|
||||
android:gravity="left"
|
||||
android:paddingLeft="10dp"
|
||||
android:text="표면방사선량률"
|
||||
android:textSize="16sp">
|
||||
|
||||
</TextView>
|
||||
|
||||
<TextView
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="left"
|
||||
android:text="AR0000B000000"
|
||||
android:textSize="16sp">
|
||||
|
||||
</TextView>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<TextView
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="0.7"
|
||||
android:gravity="left"
|
||||
android:paddingLeft="10dp"
|
||||
android:text="중방사능량"
|
||||
android:textSize="16sp">
|
||||
|
||||
</TextView>
|
||||
|
||||
<TextView
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="left"
|
||||
android:text="2014-01-01"
|
||||
android:textSize="16sp">
|
||||
|
||||
</TextView>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<TextView
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="0.7"
|
||||
android:gravity="left"
|
||||
android:paddingLeft="10dp"
|
||||
android:text="G-Alpha"
|
||||
android:textSize="16sp">
|
||||
|
||||
</TextView>
|
||||
|
||||
<TextView
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="left"
|
||||
android:text="한국원자력연구원"
|
||||
android:textSize="16sp">
|
||||
|
||||
</TextView>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<TextView
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="0.7"
|
||||
android:gravity="left"
|
||||
android:paddingLeft="10dp"
|
||||
android:text="폐기물내용물"
|
||||
android:textSize="16sp">
|
||||
|
||||
</TextView>
|
||||
|
||||
<TextView
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="left"
|
||||
android:text="비닐류"
|
||||
android:textSize="16sp">
|
||||
|
||||
</TextView>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<TextView
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="0.7"
|
||||
android:gravity="left"
|
||||
android:paddingLeft="10dp"
|
||||
android:text="총중량(kg)"
|
||||
android:textSize="16sp">
|
||||
|
||||
</TextView>
|
||||
|
||||
<TextView
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="left"
|
||||
android:text="100"
|
||||
android:textSize="16sp">
|
||||
|
||||
</TextView>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<TextView
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="0.7"
|
||||
android:gravity="left"
|
||||
android:paddingLeft="10dp"
|
||||
android:text="내용물 중량(kg)"
|
||||
android:textSize="16sp">
|
||||
|
||||
</TextView>
|
||||
|
||||
<TextView
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="left"
|
||||
android:text="80.4"
|
||||
android:textSize="16sp">
|
||||
|
||||
</TextView>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<TextView
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="0.7"
|
||||
android:gravity="left"
|
||||
android:paddingLeft="10dp"
|
||||
android:text="포장물 크기"
|
||||
android:textSize="16sp">
|
||||
|
||||
</TextView>
|
||||
|
||||
<TextView
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="left"
|
||||
android:text="일반잡고체(200L)"
|
||||
android:textSize="16sp">
|
||||
|
||||
</TextView>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_margin="10dp"
|
||||
android:background="@drawable/default_fragment_background"
|
||||
android:orientation="vertical">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="10dp"
|
||||
android:layout_marginTop="10dp"
|
||||
android:layout_marginBottom="10dp"
|
||||
android:text="사진"
|
||||
android:textColor="@color/black"
|
||||
android:textSize="24sp">
|
||||
|
||||
</TextView>
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="500dp">
|
||||
<androidx.viewpager2.widget.ViewPager2
|
||||
android:id="@+id/sliderViewPager"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/layoutIndicators"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
android:gravity="center"
|
||||
android:paddingBottom="8dp"
|
||||
app:layout_constraintBottom_toBottomOf="@id/sliderViewPager"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent" />
|
||||
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout >
|
||||
|
||||
<TextView
|
||||
android:id="@+id/text_picture_info"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_marginTop="10dp"
|
||||
android:textAlignment="center"
|
||||
android:text="사진"
|
||||
android:textColor="@color/black"
|
||||
android:textSize="18sp">
|
||||
|
||||
</TextView>
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
</ScrollView>
|
||||
|
||||
</FrameLayout>
|
||||
@@ -18,6 +18,7 @@
|
||||
<ScrollView
|
||||
android:id="@+id/scroll2"
|
||||
android:fillViewport="true"
|
||||
android:scrollbars="none"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:id="@+id/imageSlider"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:contentDescription="@string/app_name"
|
||||
android:scaleType="centerCrop" />
|
||||
@@ -15,6 +15,7 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
|
||||
# Android operating system, and which are packaged with your app"s APK
|
||||
# https://developer.android.com/topic/libraries/support-library/androidx-rn
|
||||
android.useAndroidX=true
|
||||
android.enableJetifier=true
|
||||
# Enables namespacing of each library's R class so that its R class includes only the
|
||||
# resources declared in the library itself and none from the library's dependencies,
|
||||
# thereby reducing the size of the R class for that library
|
||||
|
||||
Reference in New Issue
Block a user