Skip to content

Commit

Permalink
Merge pull request #16 from Cau-Coin/gunhee
Browse files Browse the repository at this point in the history 
 Multi-node connection implemented
  • Loading branch information
@GunHee5719
GunHee5719 authored Nov 1, 2018
2 parents 9795af0 + 155ac25 commit 88865de
Show file tree
Hide file tree
Showing 4 changed files with 94 additions and 47 deletions.
36 changes: 32 additions & 4 deletions app/src/main/java/com/example/cau_coin/DetailReviewActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,17 @@ public String doInBackground(String... params) {
e.printStackTrace();
}

String url = "http://115.68.207.101:4444/write_transaction";
int randomNum = (int) (Math.random() * 10);
randomNum = randomNum % 3;

String url;
if (randomNum == 0) {
url = "http://115.68.207.101:4444/write_transaction";
} else if (randomNum == 1) {
url = "http://115.68.232.77:4444/write_transaction";
} else {
url = "http://115.68.232.78:4444/write_transaction";
}
URL obj = new URL(url);

HttpURLConnection conn = (HttpURLConnection) obj.openConnection();
Expand Down Expand Up @@ -401,11 +411,29 @@ public class ReadData extends AsyncTask<String, Void, String> {
public String doInBackground(String... params) {
try {
String url;

int randomNum = (int) (Math.random() * 10);
randomNum = randomNum % 3;

if (lookup.equals("yes")) {
url = "http://115.68.207.101:4444/read_one_data/" + evaluateId;
if (randomNum == 0) {
url = "http://115.68.207.101:4444/read_one_data/" + evaluateId;
} else if (randomNum == 1) {
url = "http://115.68.232.77:4444/read_one_data/" + evaluateId;
} else {
url = "http://115.68.232.78:4444/read_one_data/" + evaluateId;
}
} else {
//url = "http://115.68.207.101:4444/read_one_data/" + evaluateId + "&" + id;
url = "http://115.68.207.101:4444/read_one_data/" + evaluateId;
if (randomNum == 0) {
//url = "http://115.68.207.101:4444/read_one_data/" + evaluateId + "&" + id;
url = "http://115.68.207.101:4444/read_one_data/" + evaluateId;
} else if (randomNum == 1) {
//url = "http://115.68.232.77:4444/read_one_data/" + evaluateId + "&" + id;
url = "http://115.68.232.77:4444/read_one_data/" + evaluateId;
} else {
//url = "http://115.68.232.78:4444/read_one_data/" + evaluateId + "&" + id;
url = "http://115.68.232.78:4444/read_one_data/" + evaluateId;
}
}
URL obj = new URL(url);

Expand Down
86 changes: 54 additions & 32 deletions app/src/main/java/com/example/cau_coin/MainActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ public void onClick(DialogInterface dialog, int which) {
tempLook = 0;
}
myList.add(new RecycleItem(dataList.get(i).getDept(), dataList.get(i).getGrade(), dataList.get(i).getSemester(),
dataList.get(i).getSubject(), dataList.get(i).getTakeYear(), dataList.get(i).getEvaluateId(), dataList.get(i).getScore(), dataList.get(i).getEvaluate(), dataList.get(i).getReview(),tempLook));
dataList.get(i).getSubject(), dataList.get(i).getTakeYear(), dataList.get(i).getEvaluateId(), dataList.get(i).getScore(), dataList.get(i).getEvaluate(), dataList.get(i).getReview(), tempLook));
}
checkLookup();
unshowProgress();
Expand Down Expand Up @@ -405,7 +405,7 @@ public void searching() {
tempLook = 0;
}
myList.add(new RecycleItem(dataList.get(i).getDept(), dataList.get(i).getGrade(), dataList.get(i).getSemester(),
dataList.get(i).getSubject(), dataList.get(i).getTakeYear(), dataList.get(i).getEvaluateId(), dataList.get(i).getScore(), dataList.get(i).getEvaluate(), dataList.get(i).getReview(),tempLook));
dataList.get(i).getSubject(), dataList.get(i).getTakeYear(), dataList.get(i).getEvaluateId(), dataList.get(i).getScore(), dataList.get(i).getEvaluate(), dataList.get(i).getReview(), tempLook));
if (num_Filter <= 0) {
myList2.clear();
adapter2.notifyDataSetChanged();
Expand Down Expand Up @@ -482,11 +482,11 @@ public void setMainPage5() {
data5 = dataList.get(i);
}
}
int tempLook1=0;
int tempLook2=0;
int tempLook3=0;
int tempLook4=0;
int tempLook5=0;
int tempLook1 = 0;
int tempLook2 = 0;
int tempLook3 = 0;
int tempLook4 = 0;
int tempLook5 = 0;
if (data1.getUserId().equals(id)) {
tempLook1 = 2;
}
Expand All @@ -505,31 +505,31 @@ public void setMainPage5() {

switch (dataList.size()) {
case 4:
myList.add(new RecycleItem(data1.getDept(), data1.getGrade(), data1.getSemester(), data1.getSubject(), data1.getTakeYear(), data1.getEvaluateId(), data1.getScore(), data1.getEvaluate(), data1.getReview(),tempLook1));
myList.add(new RecycleItem(data2.getDept(), data2.getGrade(), data2.getSemester(), data2.getSubject(), data2.getTakeYear(), data2.getEvaluateId(), data2.getScore(), data2.getEvaluate(), data2.getReview(),tempLook2));
myList.add(new RecycleItem(data3.getDept(), data3.getGrade(), data3.getSemester(), data3.getSubject(), data3.getTakeYear(), data3.getEvaluateId(), data3.getScore(), data3.getEvaluate(), data3.getReview(),tempLook3));
myList.add(new RecycleItem(data4.getDept(), data4.getGrade(), data4.getSemester(), data4.getSubject(), data4.getTakeYear(), data4.getEvaluateId(), data4.getScore(), data4.getEvaluate(), data4.getReview(),tempLook4));
myList.add(new RecycleItem(data1.getDept(), data1.getGrade(), data1.getSemester(), data1.getSubject(), data1.getTakeYear(), data1.getEvaluateId(), data1.getScore(), data1.getEvaluate(), data1.getReview(), tempLook1));
myList.add(new RecycleItem(data2.getDept(), data2.getGrade(), data2.getSemester(), data2.getSubject(), data2.getTakeYear(), data2.getEvaluateId(), data2.getScore(), data2.getEvaluate(), data2.getReview(), tempLook2));
myList.add(new RecycleItem(data3.getDept(), data3.getGrade(), data3.getSemester(), data3.getSubject(), data3.getTakeYear(), data3.getEvaluateId(), data3.getScore(), data3.getEvaluate(), data3.getReview(), tempLook3));
myList.add(new RecycleItem(data4.getDept(), data4.getGrade(), data4.getSemester(), data4.getSubject(), data4.getTakeYear(), data4.getEvaluateId(), data4.getScore(), data4.getEvaluate(), data4.getReview(), tempLook4));
break;
case 3:
myList.add(new RecycleItem(data1.getDept(), data1.getGrade(), data1.getSemester(), data1.getSubject(), data1.getTakeYear(), data1.getEvaluateId(), data1.getScore(), data1.getEvaluate(), data1.getReview(),tempLook1));
myList.add(new RecycleItem(data2.getDept(), data2.getGrade(), data2.getSemester(), data2.getSubject(), data2.getTakeYear(), data2.getEvaluateId(), data2.getScore(), data2.getEvaluate(), data2.getReview(),tempLook2));
myList.add(new RecycleItem(data3.getDept(), data3.getGrade(), data3.getSemester(), data3.getSubject(), data3.getTakeYear(), data3.getEvaluateId(), data3.getScore(), data3.getEvaluate(), data3.getReview(),tempLook3));
myList.add(new RecycleItem(data1.getDept(), data1.getGrade(), data1.getSemester(), data1.getSubject(), data1.getTakeYear(), data1.getEvaluateId(), data1.getScore(), data1.getEvaluate(), data1.getReview(), tempLook1));
myList.add(new RecycleItem(data2.getDept(), data2.getGrade(), data2.getSemester(), data2.getSubject(), data2.getTakeYear(), data2.getEvaluateId(), data2.getScore(), data2.getEvaluate(), data2.getReview(), tempLook2));
myList.add(new RecycleItem(data3.getDept(), data3.getGrade(), data3.getSemester(), data3.getSubject(), data3.getTakeYear(), data3.getEvaluateId(), data3.getScore(), data3.getEvaluate(), data3.getReview(), tempLook3));
break;
case 2:
myList.add(new RecycleItem(data1.getDept(), data1.getGrade(), data1.getSemester(), data1.getSubject(), data1.getTakeYear(), data1.getEvaluateId(), data1.getScore(), data1.getEvaluate(), data1.getReview(),tempLook1));
myList.add(new RecycleItem(data2.getDept(), data2.getGrade(), data2.getSemester(), data2.getSubject(), data2.getTakeYear(), data2.getEvaluateId(), data2.getScore(), data2.getEvaluate(), data2.getReview(),tempLook2));
myList.add(new RecycleItem(data1.getDept(), data1.getGrade(), data1.getSemester(), data1.getSubject(), data1.getTakeYear(), data1.getEvaluateId(), data1.getScore(), data1.getEvaluate(), data1.getReview(), tempLook1));
myList.add(new RecycleItem(data2.getDept(), data2.getGrade(), data2.getSemester(), data2.getSubject(), data2.getTakeYear(), data2.getEvaluateId(), data2.getScore(), data2.getEvaluate(), data2.getReview(), tempLook2));
break;
case 1:
myList.add(new RecycleItem(data1.getDept(), data1.getGrade(), data1.getSemester(), data1.getSubject(), data1.getTakeYear(), data1.getEvaluateId(), data1.getScore(), data1.getEvaluate(), data1.getReview(),tempLook1));
myList.add(new RecycleItem(data1.getDept(), data1.getGrade(), data1.getSemester(), data1.getSubject(), data1.getTakeYear(), data1.getEvaluateId(), data1.getScore(), data1.getEvaluate(), data1.getReview(), tempLook1));
break;
case 0:
break;
default:
myList.add(new RecycleItem(data1.getDept(), data1.getGrade(), data1.getSemester(), data1.getSubject(), data1.getTakeYear(), data1.getEvaluateId(), data1.getScore(), data1.getEvaluate(), data1.getReview(),tempLook1));
myList.add(new RecycleItem(data2.getDept(), data2.getGrade(), data2.getSemester(), data2.getSubject(), data2.getTakeYear(), data2.getEvaluateId(), data2.getScore(), data2.getEvaluate(), data2.getReview(),tempLook2));
myList.add(new RecycleItem(data3.getDept(), data3.getGrade(), data3.getSemester(), data3.getSubject(), data3.getTakeYear(), data3.getEvaluateId(), data3.getScore(), data3.getEvaluate(), data3.getReview(),tempLook3));
myList.add(new RecycleItem(data4.getDept(), data4.getGrade(), data4.getSemester(), data4.getSubject(), data4.getTakeYear(), data4.getEvaluateId(), data4.getScore(), data4.getEvaluate(), data4.getReview(),tempLook4));
myList.add(new RecycleItem(data5.getDept(), data5.getGrade(), data5.getSemester(), data5.getSubject(), data5.getTakeYear(), data5.getEvaluateId(), data5.getScore(), data5.getEvaluate(), data5.getReview(),tempLook5));
myList.add(new RecycleItem(data1.getDept(), data1.getGrade(), data1.getSemester(), data1.getSubject(), data1.getTakeYear(), data1.getEvaluateId(), data1.getScore(), data1.getEvaluate(), data1.getReview(), tempLook1));
myList.add(new RecycleItem(data2.getDept(), data2.getGrade(), data2.getSemester(), data2.getSubject(), data2.getTakeYear(), data2.getEvaluateId(), data2.getScore(), data2.getEvaluate(), data2.getReview(), tempLook2));
myList.add(new RecycleItem(data3.getDept(), data3.getGrade(), data3.getSemester(), data3.getSubject(), data3.getTakeYear(), data3.getEvaluateId(), data3.getScore(), data3.getEvaluate(), data3.getReview(), tempLook3));
myList.add(new RecycleItem(data4.getDept(), data4.getGrade(), data4.getSemester(), data4.getSubject(), data4.getTakeYear(), data4.getEvaluateId(), data4.getScore(), data4.getEvaluate(), data4.getReview(), tempLook4));
myList.add(new RecycleItem(data5.getDept(), data5.getGrade(), data5.getSemester(), data5.getSubject(), data5.getTakeYear(), data5.getEvaluateId(), data5.getScore(), data5.getEvaluate(), data5.getReview(), tempLook5));
break;
}
checkLookup();
Expand Down Expand Up @@ -585,7 +585,7 @@ public void setMainPageF() {
tempLook = 0;
}
myList.add(new RecycleItem(dataList.get(i).getDept(), dataList.get(i).getGrade(), dataList.get(i).getSemester(),
dataList.get(i).getSubject(), dataList.get(i).getTakeYear(), dataList.get(i).getEvaluateId(), dataList.get(i).getScore(), dataList.get(i).getEvaluate(), dataList.get(i).getReview(),tempLook));
dataList.get(i).getSubject(), dataList.get(i).getTakeYear(), dataList.get(i).getEvaluateId(), dataList.get(i).getScore(), dataList.get(i).getEvaluate(), dataList.get(i).getReview(), tempLook));
}
}
}
Expand Down Expand Up @@ -627,16 +627,15 @@ public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {

@Override
public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
if(mItems.get(position).getLookup() == 2){
if (mItems.get(position).getLookup() == 2) {
((ViewHolder) holder).firstLayout.setBackgroundColor(0xffeeeeee);

((ViewHolder) holder).cardview_status_unlook.setVisibility(View.INVISIBLE);
((ViewHolder) holder).cardview_status_look1.setVisibility(View.VISIBLE);
((ViewHolder) holder).cardview_status_look2.setVisibility(View.VISIBLE);
((ViewHolder) holder).cardview_status_look1.setText("[본인 게시글 - 수강자 평점 : " + mItems.get(position).getEvaluate() + ".0점, 평가 평점 : " + mItems.get(position).getScore() + "점 ]");
((ViewHolder) holder).cardview_status_look2.setText(mItems.get(position).getReview());
}
else if (mItems.get(position).getLookup() == 1) {
} else if (mItems.get(position).getLookup() == 1) {
((ViewHolder) holder).firstLayout.setBackgroundColor(0xffeeeeee);

((ViewHolder) holder).cardview_status_unlook.setVisibility(View.INVISIBLE);
Expand Down Expand Up @@ -827,7 +826,7 @@ public void onClick(View v) {
}
}

// 조회 리스트를 가져오기 위한 서버 연동 코드
// 조회 리스트를 가져오기 위한 중앙 서버 연동 코드
public class GetLookup extends AsyncTask<String, Void, String> {

public String doInBackground(String... params) {
Expand Down Expand Up @@ -891,7 +890,7 @@ protected void onPostExecute(String s) {
}
}

// 조회 시 조회 리스트에 추가하기 위한 서버 연동 코드
// 조회 시 조회 리스트에 추가하기 위한 중앙 서버 연동 코드
public class WriteLookup extends AsyncTask<String, Void, String> {

public String doInBackground(String... params) {
Expand Down Expand Up @@ -949,12 +948,22 @@ public void onBackPressed() {
}
}

// 블록으로부터 데이터 받아오기 위해 Transaction 전송
// 블록으로부터 데이터 받아오기 위해 블록체인 서버에 Transaction 전송
public class ReadData extends AsyncTask<String, Void, String> {

public String doInBackground(String... params) {
try {
String url = "http://115.68.207.101:4444/read_all_data";
int randomNum = (int) (Math.random() * 10);
randomNum = randomNum % 3;

String url;
if (randomNum == 0) {
url = "http://115.68.207.101:4444/read_all_data";
} else if (randomNum == 1) {
url = "http://115.68.232.77:4444/read_all_data";
} else {
url = "http://115.68.232.78:4444/read_all_data";
}
URL obj = new URL(url);

HttpURLConnection conn = (HttpURLConnection) obj.openConnection();
Expand Down Expand Up @@ -1099,12 +1108,22 @@ protected void onPostExecute(String s) {
}
}

// 블록으로부터 코인정보를 받아오는 Transaction 전송
// 블록으로부터 코인정보를 받아오는 Transaction 블록체인 서버에 전송
public class ReadCoin extends AsyncTask<String, Void, String> {

public String doInBackground(String... params) {
try {
String url = "http://115.68.207.101:4444/coin/" + id;
int randomNum = (int) (Math.random() * 10);
randomNum = randomNum % 3;

String url;
if (randomNum == 0) {
url = "http://115.68.207.101:4444/coin/" + id;
} else if (randomNum == 1) {
url = "http://115.68.232.77:4444/coin/" + id;
} else {
url = "http://115.68.232.78:4444/coin/" + id;
}
URL obj = new URL(url);

HttpURLConnection conn = (HttpURLConnection) obj.openConnection();
Expand Down Expand Up @@ -1144,15 +1163,18 @@ protected void onPostExecute(String s) {
}
}

// 소프트 키보드 숨기기
public void hideKeyboard() {
imm.hideSoftInputFromWindow(inputSearch.getWindowToken(), 0);
}

// Progress bar 보이기
public void showProgress() {
progressBar.setVisibility(View.VISIBLE);
recyclerView.setVisibility(View.INVISIBLE);
}

// Progress bar 숨기기
public void unshowProgress() {
progressBar.setVisibility(View.INVISIBLE);
recyclerView.setVisibility(View.VISIBLE);
Expand Down
7 changes: 2 additions & 5 deletions app/src/main/res/layout/activity_detailreview.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@

<TextView
android:id="@+id/detail_title"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="10dp"
Expand All @@ -44,10 +45,6 @@
android:textColor="@color/normalColor"
android:textSize="20dp"
android:textStyle="bold" />
<View
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1"/>
<ImageView
android:id="@+id/detail_refresh"
android:layout_width="30dp"
Expand Down
Loading

0 comments on commit 88865de

Please sign in to comment.