From 5cc0d042439cae7360e8b36fd99f236d25b95ebe Mon Sep 17 00:00:00 2001
From: hanxueqing <1045352474@qq.com>
Date: Fri, 3 Jan 2020 20:50:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
# Conflicts:
# app/src/main/res/layout/activity_main.xml
---
app/app.iml | 9 ++++
app/build.gradle | 15 +++----
.../PersonalCenter/SearchServiceGet.java | 43 +++++++++++++++++++
.../cmknowledgegraph/{test.java => abcd.java} | 2 +-
4 files changed, 58 insertions(+), 11 deletions(-)
rename app/src/main/java/com/example/cmknowledgegraph/{test.java => abcd.java} (98%)
diff --git a/app/app.iml b/app/app.iml
index 0744adc..94be285 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -104,12 +104,21 @@
+
+
+
+
+
+
+
+
+
diff --git a/app/build.gradle b/app/build.gradle
index 1b2b0c6..b10ca98 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -32,14 +32,9 @@ dependencies {
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
api 'com.hankcs:hanlp:portable-1.7.2'
implementation 'com.google.android.material:material:1.0.0'
-// implementation 'androidx.appcompat:appcompat:1.1.0'
-// implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-// testImplementation 'junit:junit:4.12'
-// androidTestImplementation 'androidx.test.ext:junit:1.1.0'
-// androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
-// api 'com.hankcs:hanlp:portable-1.7.2'
-// implementation 'com.google.android.material:material:1.0.0'
-// androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-// androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-// implementation fileTree(dir: 'libs', include: ['*.aar', '*.jar'], exclude: [])
+ implementation files('net.sf.json.JSONObject')
+ implementation fileTree(dir: 'D:\\我的大学\\中医\\userlib', include: ['*.aar', '*.jar'], exclude: [])
+ implementation 'com.alibaba:fastjson:1.2.62'
+ implementation 'com.alibaba:fastjson:1.2.62'
+
}
diff --git a/app/src/main/java/com/example/PersonalCenter/SearchServiceGet.java b/app/src/main/java/com/example/PersonalCenter/SearchServiceGet.java
index 0206d31..74d791b 100644
--- a/app/src/main/java/com/example/PersonalCenter/SearchServiceGet.java
+++ b/app/src/main/java/com/example/PersonalCenter/SearchServiceGet.java
@@ -2,6 +2,10 @@ package com.example.PersonalCenter;
import android.util.Log;
+import com.alibaba.fastjson.JSON;
+
+import net.sf.json.JSONObject;
+
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
@@ -10,8 +14,14 @@ import java.net.HttpURLConnection;
import java.net.MalformedURLException;
import java.net.ProtocolException;
import java.net.URL;
+import java.util.ArrayList;
+import java.util.Map;
public class SearchServiceGet {
+
+ public static ArrayList label;//存储标签内容
+ public static ArrayList content;//存储数据内容
+
public static String executeSearchGet(String name){
HttpURLConnection connection = null;
InputStream in = null;
@@ -40,6 +50,39 @@ public class SearchServiceGet {
//这时候response就是一个连续字符串了吧
Log.i("response+++++",response+"返回值");
System.out.println(response.toString());
+
+ //开始解析返回的数据
+ JSONObject jo=JSONObject.fromObject(response.toString());
+ String message=jo.getString("message");
+ int code=jo.getInt("code");
+ if((message.equals("病症查询成功")||message.equals("药品查询成功"))&&code==200){
+ //查询成功，在开始解析数据
+ //把data里的数据转换为Map，遍历map，打印键值对
+ String data=jo.get("data").toString();
+ Map mapType = JSON.parseObject(data,Map.class);
+ for (Object obj : mapType.keySet()){
+ if(!obj.equals("teammates")){
+ //把键值对放入队列中
+ label.add(obj.toString());
+ content.add(mapType.get(obj).toString());
+ System.out.println("key为："+obj+"值为："+mapType.get(obj));
+ }else{
+
+ }
+
+ }
+ //
+ }else{
+ //查询失败什么都没有查到
+ //在页面显示什么都没有查到
+ }
+
+
+
+
+
+
+
return response.toString();
//
diff --git a/app/src/main/java/com/example/cmknowledgegraph/test.java b/app/src/main/java/com/example/cmknowledgegraph/abcd.java
similarity index 98%
rename from app/src/main/java/com/example/cmknowledgegraph/test.java
rename to app/src/main/java/com/example/cmknowledgegraph/abcd.java
index b6561c8..ed15d8f 100644
--- a/app/src/main/java/com/example/cmknowledgegraph/test.java
+++ b/app/src/main/java/com/example/cmknowledgegraph/abcd.java
@@ -5,7 +5,7 @@ import com.hankcs.hanlp.suggest.Suggester;
import java.util.List;
-public class test {
+public class abcd {
public void init(){