diff --git a/AndroidLabs/app/src/main/java/edu/hzuapps/androidlabs/homeworks/net1414080903101/1414080903101.json b/AndroidLabs/app/src/main/java/edu/hzuapps/androidlabs/homeworks/net1414080903101/1414080903101.json
new file mode 100644
index 00000000..c03a2487
--- /dev/null
+++ b/AndroidLabs/app/src/main/java/edu/hzuapps/androidlabs/homeworks/net1414080903101/1414080903101.json
@@ -0,0 +1 @@
+[{"grade":"14网1","name":"刘豪杰","number":"1414080903101"}]
diff --git a/AndroidLabs/app/src/main/java/edu/hzuapps/androidlabs/homeworks/net1414080903101/Net1414080903101JsonActivity.java b/AndroidLabs/app/src/main/java/edu/hzuapps/androidlabs/homeworks/net1414080903101/Net1414080903101JsonActivity.java
new file mode 100644
index 00000000..0d41f294
--- /dev/null
+++ b/AndroidLabs/app/src/main/java/edu/hzuapps/androidlabs/homeworks/net1414080903101/Net1414080903101JsonActivity.java
@@ -0,0 +1,72 @@
+package edu.hzuapps.androidlabs.homeworks.net1414080903101;
+
+import android.os.Bundle;
+import android.os.Handler;
+import android.support.v7.app.AppCompatActivity;
+import android.widget.TextView;
+
+import org.json.JSONArray;
+import org.json.JSONObject;
+
+import edu.hzuapps.androidlabs.R;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+
+/*����json�ļ�*/
+public class Net1414080903101JsonActivity extends AppCompatActivity {
+ private String grade;
+ private String name;
+ private String number;
+ private TextView GithubResponse;
+ private Handler handler = null;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_net1414080903101_json);
+ handler = new Handler();
+ GithubResponse = (TextView) findViewById(R.id.response_info);
+ sendRequest();
+ }
+
+ private void sendRequest() {
+ new Thread(){
+ @Override
+ public void run() {
+ try {
+ OkHttpClient client = new OkHttpClient();
+ Request request = new Request.Builder().url("https://raw.githubusercontent.com/duguhaojie/android-labs-2017/master/AndroidLabs/app/src/main/java/edu/hzuapps/androidlabs/homeworks/net1414080903101/1414080903101.json").build();//Ŀ���ַ
+ Response response = client.newCall(request).execute();
+ String responseData = response.body().string();
+ AnalysisJson(responseData);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ handler.post(runnableUi);
+ }
+ }.start();
+ }
+
+ /*����json�ļ�*/
+ private void AnalysisJson(String jsonData) {
+ try {
+ JSONArray jsonArray = new JSONArray(jsonData);
+ for (int i = 0; i < jsonArray.length(); i++) {
+ JSONObject jsonObject = jsonArray.getJSONObject(i);
+ grade = jsonObject.getString("grade");
+ name = jsonObject.getString("name");
+ number = jsonObject.getString("number");
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+/*����UI*/
+ Runnable runnableUi = new Runnable() {
+ public void run() {
+ GithubResponse.setText("�༶: " + grade + "\n" + "\n" + "����: " + name + "\n" + "\n" + "ѧ��: " + number + "\n" + "\n");//��ʾ�������
+ }
+ };
+}
\ No newline at end of file
diff --git a/AndroidLabs/app/src/main/java/edu/hzuapps/androidlabs/homeworks/net1414080903101/Net1414080903101MainActivity.java b/AndroidLabs/app/src/main/java/edu/hzuapps/androidlabs/homeworks/net1414080903101/Net1414080903101MainActivity.java
index d673385e..5d6254d8 100644
--- a/AndroidLabs/app/src/main/java/edu/hzuapps/androidlabs/homeworks/net1414080903101/Net1414080903101MainActivity.java
+++ b/AndroidLabs/app/src/main/java/edu/hzuapps/androidlabs/homeworks/net1414080903101/Net1414080903101MainActivity.java
@@ -16,6 +16,7 @@ public class Net1414080903101MainActivity extends AppCompatActivity {
TextView tv6;
TextView tv7;
TextView tv8;
+ Button send;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -29,6 +30,7 @@ protected void onCreate(Bundle savedInstanceState) {
tv6= (TextView) findViewById(R.id.tv6);
tv7= (TextView) findViewById(R.id.tv7);
tv8= (TextView) findViewById(R.id.tv8);
+ send=(Button)findViewById(R.id.send_request);
tv1.setOnClickListener(new View.OnClickListener() {
@Override
@@ -93,6 +95,15 @@ public void onClick(View v) {
intent.putExtra("type",8);
startActivity(intent);
}
+ });
+ /*点击按钮解析到github解析json文件*/
+ send_request.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ Intent intent=new Intent(Net1414080903101MainActivity.this,Net1414080903101JsonActivity.class);
+ intent.putExtra("type",8);
+ startActivity(intent);
+ }
});
}
}
diff --git a/AndroidLabs/app/src/main/java/edu/hzuapps/androidlabs/homeworks/net1414080903101/db1414080903101_SQLOperate.java b/AndroidLabs/app/src/main/java/edu/hzuapps/androidlabs/homeworks/net1414080903101/db1414080903101_SQLOperate.java
index 37f7d01b..92168722 100644
--- a/AndroidLabs/app/src/main/java/edu/hzuapps/androidlabs/homeworks/net1414080903101/db1414080903101_SQLOperate.java
+++ b/AndroidLabs/app/src/main/java/edu/hzuapps/androidlabs/homeworks/net1414080903101/db1414080903101_SQLOperate.java
@@ -1,5 +1,8 @@
package edu.hzuapps.androidlabs.homeworks.net1414080903101;
+<<<<<<< HEAD
+=======
+>>>>>>> 84e0e7eb67d6893cec6bccf75d22a39d971a3cf1
/**
diff --git a/AndroidLabs/app/src/main/java/edu/hzuapps/androidlabs/homeworks/net1414080903101/db1414080903101_SQLOperateImpl.java b/AndroidLabs/app/src/main/java/edu/hzuapps/androidlabs/homeworks/net1414080903101/db1414080903101_SQLOperateImpl.java
index a9e1c732..c8c8fa7d 100644
--- a/AndroidLabs/app/src/main/java/edu/hzuapps/androidlabs/homeworks/net1414080903101/db1414080903101_SQLOperateImpl.java
+++ b/AndroidLabs/app/src/main/java/edu/hzuapps/androidlabs/homeworks/net1414080903101/db1414080903101_SQLOperateImpl.java
@@ -5,7 +5,6 @@
import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
-import com.intelligent_chest.entity.User;
/**
* Created by Czd on 2017/6/1.
diff --git a/AndroidLabs/app/src/main/res/layout/activity_net1414080903101_json.xml b/AndroidLabs/app/src/main/res/layout/activity_net1414080903101_json.xml
new file mode 100644
index 00000000..60dadd70
--- /dev/null
+++ b/AndroidLabs/app/src/main/res/layout/activity_net1414080903101_json.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
diff --git a/AndroidLabs/app/src/main/res/layout/activity_net1414080903101_main.xml b/AndroidLabs/app/src/main/res/layout/activity_net1414080903101_main.xml
index 2fedeedd..d2748dee 100644
--- a/AndroidLabs/app/src/main/res/layout/activity_net1414080903101_main.xml
+++ b/AndroidLabs/app/src/main/res/layout/activity_net1414080903101_main.xml
@@ -94,4 +94,10 @@
android:textSize="18sp"
android:padding="15dp"
android:text="4.陈式太极单刀"/>
+