diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 44e7397..3e2a2bf 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -17,5 +17,6 @@
+
\ No newline at end of file
diff --git a/app/src/main/java/com/hjx/parent/ChooseActivity.java b/app/src/main/java/com/hjx/parent/ChooseActivity.java
index 6f871ed..2893b46 100644
--- a/app/src/main/java/com/hjx/parent/ChooseActivity.java
+++ b/app/src/main/java/com/hjx/parent/ChooseActivity.java
@@ -128,9 +128,6 @@ public class ChooseActivity extends BaseActivity {
}
public void loadList() {
- StudentBean sb = new StudentBean();
- sb.setNickName("添加学生");
- alist.add(sb);
String student = (String) SharedPreferencesUtil.getData("student", "");
try {
StudentBean studentBean = new Gson().fromJson(student, StudentBean.class);
@@ -154,13 +151,7 @@ public class ChooseActivity extends BaseActivity {
StudentBean studentBean = alist.get(item.getAdapterPosition());
item.setText(R.id.tv_name, studentBean.getNickName());
if (TextUtils.isEmpty(studentBean.getStuId())) {
- item.setVisible(R.id.rl_add, true);
- item.getConvertView().setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View view) {
- startActivity(new Intent(ChooseActivity.this, AddStudentActivity.class));
- }
- });
+ // do nothing
} else {
item.setBackgroundRes(R.id.rl_child, select == item.getAdapterPosition() ? R.drawable.bg_solid_white_10_or : R.drawable.bg_solid_white_10);
item.setImageResource(R.id.iv_select, select == item.getAdapterPosition() ? R.mipmap.gx : R.mipmap.wsyq);
diff --git a/app/src/main/java/com/hjx/parent/SmsLoginActivity.java b/app/src/main/java/com/hjx/parent/SmsLoginActivity.java
index 3de613c..5a3fe6e 100644
--- a/app/src/main/java/com/hjx/parent/SmsLoginActivity.java
+++ b/app/src/main/java/com/hjx/parent/SmsLoginActivity.java
@@ -10,11 +10,13 @@ import android.widget.Toast;
import com.hjx.parent.databinding.ActivitySmsLoginBinding;
import com.hjx.parent.rx.BaseRxActivity;
+import com.prws.common.bean.Student;
import com.prws.common.net.NetWorks;
import com.prws.common.utils.LogUtil;
import com.prws.common.utils.SharedPreferencesUtil;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
@@ -90,6 +92,11 @@ public class SmsLoginActivity extends BaseRxActivity {
.subscribe((response, th) -> {
binding.btnLogin.setEnabled(true);
if (handleResponseData(response, th)) {
+ List list = response.getData().parentInfoList;
+ if (list == null || list.isEmpty()) {
+ showToast("未注册学生, 无法登录");
+ return;
+ }
SharedPreferencesUtil.putData("phone", phone);
SharedPreferencesUtil.putData("role", "parent");
SharedPreferencesUtil.putData("userId", response.getData().id);
diff --git a/app/src/main/java/com/hjx/parent/fragment/MeFragment.java b/app/src/main/java/com/hjx/parent/fragment/MeFragment.java
index e8938ec..198c2d9 100644
--- a/app/src/main/java/com/hjx/parent/fragment/MeFragment.java
+++ b/app/src/main/java/com/hjx/parent/fragment/MeFragment.java
@@ -145,9 +145,6 @@ public class MeFragment extends BaseFragment {
// }
public void loadList() {
- StudentBean sb = new StudentBean();
- sb.setNickName("添加学生");
- alist.add(0, sb);
BaseQuickAdapter adapter = new BaseQuickAdapter(R.layout.item_child, alist) {
@Override
public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
@@ -159,14 +156,7 @@ public class MeFragment extends BaseFragment {
StudentBean studentBean = alist.get(item.getAdapterPosition());
item.setText(R.id.tv_name, studentBean.getNickName());
if (TextUtils.isEmpty(studentBean.getStuId())) {
- item.setImageResource(R.id.iv_avatar, R.mipmap.tjxss);
- item.setVisible(R.id.iv_vip, false);
- item.getConvertView().setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View view) {
- startActivity(new Intent(getActivity(), AddStudentActivity.class));
- }
- });
+ // do nothing
} else {
if (TextUtils.isEmpty(studentBean.getPhoto())) {
item.setImageResource(R.id.iv_avatar, "男".equals(studentBean.getGender()) ? R.mipmap.ic_avatar_male : R.mipmap.ic_avatar_female);
diff --git a/libs/common/src/main/java/com/prws/common/bean/User.java b/libs/common/src/main/java/com/prws/common/bean/User.java
index a183852..76f3593 100644
--- a/libs/common/src/main/java/com/prws/common/bean/User.java
+++ b/libs/common/src/main/java/com/prws/common/bean/User.java
@@ -1,5 +1,7 @@
package com.prws.common.bean;
+import java.util.ArrayList;
+
public class User {
public String id;
@@ -11,5 +13,6 @@ public class User {
public String identityName; //用户身份(普通用户、管理员、内部员工)
public String gender; //性别
public String registration; //注册方式(用户创建、员工创建)
+ public ArrayList parentInfoList;
public String token;
}
diff --git a/libs/common/src/main/java/com/prws/common/net/NetWorks.java b/libs/common/src/main/java/com/prws/common/net/NetWorks.java
index 0986e8e..75fd790 100644
--- a/libs/common/src/main/java/com/prws/common/net/NetWorks.java
+++ b/libs/common/src/main/java/com/prws/common/net/NetWorks.java
@@ -58,7 +58,7 @@ import retrofit2.http.Url;
*/
public class NetWorks extends RetrofitUtils {
//服务器路径
- public static final NetService service_url = getMachineRetrofit(BuildConfig.SERVER_URL).create(NetService.class);
+ public static final NetService service_url = getMachineRetrofit("https://mgr.hjx.com").create(NetService.class);
//设缓存有效期为1天
protected static final long CACHE_STALE_SEC = 60 * 60 * 24 * 1;