diff --git a/PersonalCenter/.idea/misc.xml b/PersonalCenter/.idea/misc.xml index fbb6828..5d19981 100644 --- a/PersonalCenter/.idea/misc.xml +++ b/PersonalCenter/.idea/misc.xml @@ -37,7 +37,7 @@ - + diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/AccountManagementActivity.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/AccountManagementActivity.java index 3366b7b..e6feab2 100644 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/AccountManagementActivity.java +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/AccountManagementActivity.java @@ -46,8 +46,31 @@ public class AccountManagementActivity extends AppCompatActivity implements View super.handleMessage(msg); switch (msg.what){ case HttpCode.CHILDS_SUCESS: + String name = null; + String grade = null; + String school = null; + String addr = null; + String phote = null; + List childList = new ArrayList<>() ; + List list = (List)msg.obj ; + for (int i = 0; i < list.size(); i++) { + int type = list.get(i).getType(); + if(type == 1){ + name = list.get(i).getName(); + grade = list.get(i).getGrade(); + school = list.get(i).getSchool(); + addr = list.get(i).getRegion(); + phote = list.get(i).getImage(); + }else if (type == 2){ + childList.add(list.get(i)); + } + } + tv_username.setText(name); + tv_grade.setText(grade); + tv_school.setText(school); + tv_adress.setText(addr); data.clear(); - data.addAll( (List)msg.obj); + data.addAll(childList); childsAdapter.notifyDataSetChanged(); break; } @@ -88,10 +111,7 @@ public class AccountManagementActivity extends AppCompatActivity implements View String tv_adresss = SaveParam.getInstance().getLoginParam(this,SaveParam.ADRESS); String account = SaveParam.getInstance().getLoginParam(this,SaveParam.ACCOUNT); usernames.setText(cunt_username); - tv_username.setText(tv_usernames); - tv_grade.setText(tv_grades); - tv_school.setText(tv_schools); - tv_adress.setText(tv_adresss); + if (account.equals("1")){ tv_changzhu.setText("使用中"); tv_changzhu.setEnabled(false); diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ForgotPasswordActivity.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ForgotPasswordActivity.java index fb5e3d4..86e6b3a 100644 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ForgotPasswordActivity.java +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ForgotPasswordActivity.java @@ -23,6 +23,9 @@ import com.hjx.personalcenter.util.PhoneNumCheckUtils; import org.json.JSONException; import org.json.JSONObject; +import java.util.Timer; +import java.util.TimerTask; + /** * 忘记密码 * Created by h on 2017/6/17. diff --git a/PersonalCenter/app/src/test/java/com/hjx/personalcenter/ExampleUnitTest.java b/PersonalCenter/app/src/test/java/com/hjx/personalcenter/ExampleUnitTest.java index a9275db..384db50 100644 --- a/PersonalCenter/app/src/test/java/com/hjx/personalcenter/ExampleUnitTest.java +++ b/PersonalCenter/app/src/test/java/com/hjx/personalcenter/ExampleUnitTest.java @@ -2,6 +2,9 @@ package com.hjx.personalcenter; import org.junit.Test; +import java.util.Timer; +import java.util.TimerTask; + import static org.junit.Assert.*; /** @@ -12,6 +15,13 @@ import static org.junit.Assert.*; public class ExampleUnitTest { @Test public void addition_isCorrect() throws Exception { - assertEquals(4, 2 + 2); +// assertEquals(4, 2 + 2); + Timer timer = new Timer(); + timer.schedule(new TimerTask() { + @Override + public void run() { + System.out.print("爆炸"); + } + }, 60 * 1000, 1000); } } \ No newline at end of file