p01643725
/
paz2s9bc5
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of http://bdgit.educoder.net/p01643725/paz2s9bc5

Browse Source 
# Conflicts:
#	cmkg/pom.xml
#	cmkg/src/main/java/com/cmkg/cmkg/CmkgApplication.java
#	cmkg/src/main/java/com/cmkg/cmkg/Controller/QuestionController.java
#	cmkg/src/main/java/com/cmkg/cmkg/database/ReturnData.java
#	cmkg/src/main/java/com/cmkg/cmkg/node/medicine.java
#	cmkg/src/main/java/com/cmkg/cmkg/process/ModelProcess.java
#	cmkg/src/main/java/com/cmkg/cmkg/repository/MedicineRespository.java
#	cmkg/src/main/java/com/cmkg/cmkg/repository/QuestionRespository.java
#	cmkg/src/main/java/com/cmkg/cmkg/server/QuestionService.java
#	cmkg/src/main/java/com/cmkg/cmkg/server/impl/QuestionServiceImpl.java
#	cmkg/src/main/resources/application.properties
master
hanxueqing 5 years ago
parent 15eebaa706
commit 5623f532c0
7 changed files with 129 additions and 72 deletions
Show Stats Download Patch File Download Diff File

10
app/src/main/java/com/example/SearchCenter/CMKGStackAdapter.java
Unescape View File

@ -109,13 +109,19 @@ public class CMKGStackAdapter extends StackAdapter<Integer> implements Condition
* * 药-用法：标题是药的名字，内容是药的用法
* * 药-作用：标题是药的名字，内容是药的用法
*/
if(returnData.getCode()==DiseaseToSymptom||returnData.getCode()==MedicineToOperation||returnData.getCode()==MedicineToSymptom){
if(returnData.getCode()==DiseaseToSymptom||returnData.getCode()==MedicineToOperation){
//对应病症，那么标题只有一个就是病的名字
titleText.setText(returnData.getMsg());
}else {
}else if(returnData.getCode()==DiseaseToMedicines){
//对应治疗方法，那么标题就要有多个
titleText.setText(SearchEntryActivity.content.get(title_num));
title_num++;
}else{
if(title_num==0) {
titleText.setText(returnData.getMsg());
title_num++;
}
else titleText.setText("可以治疗的病症");
}
cardTitle.getBackground().setColorFilter(ContextCompat.getColor(getContext(),backgroundColorId), PorterDuff.Mode.SRC_IN);//传入的int值，其实是一个颜色，在这里改变头部的颜色

19
app/src/main/java/com/example/SearchCenter/SearchEntryActivity.java
Unescape View File

@ -109,6 +109,7 @@ public class SearchEntryActivity extends AppCompatActivity implements CardStackV
List<ContentData> list=new LinkedList<>();
list.add(new ContentData("我是您的用法哦~请您看看我嘞\n我无比的期待您的光临嘞\n我们没有连数据呢，马上就有嘞！"));
content.add((String) jsonArray.get(i));
System.out.println("content.size="+content.size());
lists.add(list);
}
new_color=new Integer[jsonArray.length()];
@ -129,21 +130,21 @@ public class SearchEntryActivity extends AppCompatActivity implements CardStackV
*/
List<ContentData> list = new LinkedList<>();
// JSONObject jo=new JSONObject(response.getData().toString());
String str=(String)response.getData();
System.out.println("返回的数据事："+str);
JSONObject jo=new JSONObject(str.toString());
String medicine_symptom=jo.getString("fuction");
list.add(new ContentData(medicine_symptom));
String function=jo.getString("function");
list.add(new ContentData(function));
lists.add(list);
String disease_names=new String(jo.getString("name"));
String disease_names=new String(jo.getString("disease"));
JSONArray ja=new JSONArray(disease_names);
for(int i=0;i<ja.length();i++){
List<ContentData> list_1=new LinkedList<>();
list_1.add(new ContentData(content.get(i)));
lists.add(list);
for(int i=0;i<ja.length();i++){
// list_1=new LinkedList<>();
list_1.add(new ContentData(ja.get(i).toString()));
System.out.println("病症有这些！="+ja.get(i).toString());
}
new_color=new Integer[1];
lists.add(list_1);
new_color=new Integer[2];
}
for(int i=0;i<new_color.length;i++){

6
app/src/main/java/com/example/Util/ConditionCode.java
Unescape View File

@ -6,12 +6,12 @@ public interface ConditionCode {
* DiseaseToSymptom 病 症状
* DiseaseToMedeicines 病 治疗方法
* MedicineToOperation 药 用法
* MedicineToSympton 药 作用
* MedicineToFunction药 作用
*/
public final int DiseaseToSymptom=100;
public final int DiseaseToMedicines=200;
public final int MedicineToOperation=300;
public final int MedicineToSymptom=400;
public final int MedicineToFunction=400;
/***
*Model_Symptom 匹配模板 病——症状
* Model_Medicines 匹配模板 病——治疗方法
@ -19,7 +19,7 @@ public interface ConditionCode {
* Model_Function 匹配模板 药——作用
*/
public final String Model_Symptom="的症状";
public final String Model_Medicines="治疗方法";
public final String Model_Medicines="吃什么药";
public final String Model_Operation="用法";
public final String Model_Function="作用";

69
app/src/main/res/layout/activity_search_entry.xml
Unescape View File

@ -1,17 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:scrollbars="vertical"
android:fadingEdge="vertical">
<LinearLayout
android:orientation="vertical"
tools:context=".SearchEntryActivity">
android:layout_width="fill_parent"
android:layout_height="fill_parent"
tools:context=".MainActivity">
<com.loopeer.cardstack.CardStackView
android:id="@+id/cardStackView"
android:layout_width="match_parent"
android:layout_height="299dp"></com.loopeer.cardstack.CardStackView>
android:layout_height="500dp"></com.loopeer.cardstack.CardStackView>
<TextView
android:layout_width="wrap_content"
@ -42,5 +46,54 @@
android:shadowDy="4"
android:shadowRadius="2"
/>
</LinearLayout>
</ScrollView>
<!--<?xml version="1.0" encoding="utf-8"?>-->
<!--<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"-->
<!-- xmlns:app="http://schemas.android.com/apk/res-auto"-->
<!-- xmlns:tools="http://schemas.android.com/tools"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:orientation="vertical"-->
<!-- tools:context=".SearchEntryActivity">-->
<!-- <com.loopeer.cardstack.CardStackView-->
<!-- android:id="@+id/cardStackView"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="match_parent"></com.loopeer.cardstack.CardStackView>-->
<!-- <TextView-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:textSize="24sp"-->
<!-- android:text="你可能感兴趣"-->
<!-- android:textStyle="bold"-->
<!-- android:paddingLeft="100dp"-->
<!-- android:paddingTop="150dp"-->
<!-- android:id="@+id/asscoiate_text"-->
<!-- />-->
<!-- <TextView-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:paddingLeft="20dp"-->
<!-- android:id="@+id/asscoiate_entry"-->
<!-- />-->
<!-- <ListView-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:paddingTop="40dp"-->
<!-- android:paddingLeft="20dp"-->
<!-- android:divider="@null"-->
<!-- android:id="@+id/listview_group"-->
<!-- android:textSize="16sp"-->
<!-- android:textColor="#ff000000"-->
<!-- android:shadowDx="4"-->
<!-- android:shadowDy="4"-->
<!-- android:shadowRadius="2"-->
<!-- />-->
<!--</LinearLayout>-->

21
app/src/main/res/layout/cmkg_item.xml
Unescape View File

@ -4,7 +4,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:padding="16dp"
>
<!--
@ -18,32 +17,30 @@
android:background="#ffffff"
android:id="@+id/card_title"
>
<TextView
android:layout_width="match_parent"
android:id="@+id/card_title_text"
android:layout_width="340dp"
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:textSize="20sp"
android:textStyle="bold"
android:textColor="#ffffff"
android:id="@+id/card_title_text"
/>
android:textSize="20sp"
android:textStyle="bold" />
</FrameLayout>
<!-- android:text="2016-2017-2学期"-->
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="468dp">
<androidx.recyclerview.widget.RecyclerView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#ffffff"
android:id="@+id/scores_list"
android:layout_width="match_parent"
android:layout_height="350dp"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="16dp"
>
</androidx.recyclerview.widget.RecyclerView>
android:background="#ffffff"></androidx.recyclerview.widget.RecyclerView>
</FrameLayout>
</LinearLayout>

2
app/src/main/res/layout/cmkg_list_item.xml
Unescape View File

@ -100,7 +100,7 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="80dp"
android:id="@+id/search_content"
style="@style/scores_item_style"
android:paddingLeft="10dp"

2
app/src/main/res/values/styles.xml
Unescape View File

@ -49,7 +49,7 @@
<style name="scores_item_style">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:textSize">12sp</item>
<item name="android:textSize">20sp</item>
<item name="android:textColor">@color/text_black</item>
</style>

Write Preview
Loading…
Cancel
Save