Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/src/main/res/layout/activity_main.xml
master
hanxueqing 5 years ago
parent 15e2953e4a
commit 5cc0d04243

@ -104,12 +104,21 @@
<orderEntry type="library" scope="TEST" name="Gradle: androidx.test:monitor:1.1.1@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.test.espresso:espresso-idling-resource:3.1.1@aar" level="project" />
<orderEntry type="library" name="Gradle: __local_aars__:D.\AndroidStudio\cmknowledgegraph\app\libs\mysql-connector-java-8.0.15.jar:unspecified@jar" level="project" />
<orderEntry type="library" name="Gradle: __local_aars__:D.\我的大学\中医\userlib\commons-beanutils-1.7.0.jar:unspecified@jar" level="project" />
<orderEntry type="library" name="Gradle: __local_aars__:D.\我的大学\中医\userlib\commons-collections-3.1.jar:unspecified@jar" level="project" />
<orderEntry type="library" name="Gradle: __local_aars__:D.\我的大学\中医\userlib\commons-lang-2.5.jar:unspecified@jar" level="project" />
<orderEntry type="library" name="Gradle: __local_aars__:D.\我的大学\中医\userlib\commons-logging.jar:unspecified@jar" level="project" />
<orderEntry type="library" name="Gradle: __local_aars__:D.\我的大学\中医\userlib\ezmorph-1.0.3.jar:unspecified@jar" level="project" />
<orderEntry type="library" name="Gradle: __local_aars__:D.\我的大学\中医\userlib\gson-2.8.0.jar:unspecified@jar" level="project" />
<orderEntry type="library" name="Gradle: __local_aars__:D.\我的大学\中医\userlib\json-lib-2.1-jdk15.jar:unspecified@jar" level="project" />
<orderEntry type="library" name="Gradle: __local_aars__:D.\我的大学\中医\userlib\mysql-connector-java-8.0.15.jar:unspecified@jar" level="project" />
<orderEntry type="library" name="Gradle: com.hankcs:hanlp:portable-1.7.2@jar" level="project" />
<orderEntry type="library" name="Gradle: androidx.collection:collection:1.0.0@jar" level="project" />
<orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.0.0@jar" level="project" />
<orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.0.0@jar" level="project" />
<orderEntry type="library" name="Gradle: androidx.annotation:annotation:1.0.0@jar" level="project" />
<orderEntry type="library" name="Gradle: androidx.constraintlayout:constraintlayout-solver:1.1.3@jar" level="project" />
<orderEntry type="library" name="Gradle: com.alibaba:fastjson:1.2.62@jar" level="project" />
<orderEntry type="library" name="Gradle: com.google.android.material:material:1.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.appcompat:appcompat:1.0.2@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.fragment:fragment:1.0.0@aar" level="project" />

@ -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'
}

@ -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<String> label;//存储标签内容
public static ArrayList<String> 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();
//

@ -5,7 +5,7 @@ import com.hankcs.hanlp.suggest.Suggester;
import java.util.List;
public class test {
public class abcd {
public void init(){
Loading…
Cancel
Save