李明 / ClasManage · 提交

转到一个项目

作者 朱振飞
提交 441aa631be4b82585ec80309b76cba4bf25d4110 1 个父辈 f0ad62ba

add

内嵌 并排对比
正在显示 8 个修改的文件 包含 48 行增加 和 20 行删除
... ... @@ -185,12 +185,12 @@ public class Jxt_ListAdapter extends BaseMultiItemQuickAdapter<JxtAllListEntity.
}
}else{//不是我发的
ck_lin.setVisibility(View.GONE);
// if (item.getIs_read()==1){//已读
// massage_num.setVisibility(View.GONE);
// }else {
// massage_num.setVisibility(View.VISIBLE);
// massage_num.setText("1");
// }
if (item.getIs_read()==1){//已读
massage_num.setVisibility(View.GONE);
}else {
massage_num.setVisibility(View.VISIBLE);
massage_num.setText("1");
}
if (item.getStatus_text().equals("已报名")){
state_tv.setText("已报名");
state_tv.setTextColor(Color.parseColor("#FFAB13"));
... ...
... ... @@ -161,10 +161,18 @@ public class JxtAllListEntity {
private String status_text;
private int detail_id;
private int is_author;
private int is_read;
private int itemType;
public int getIs_read() {
return is_read;
}
public void setIs_read(int is_read) {
this.is_read = is_read;
}
public String getLabel() {
return label;
}
... ...
... ... @@ -157,7 +157,7 @@ public class Hd_Rv_Fragment extends BaseFragment {
@Override
protected void refreshLoad() {
setParam(1);
// setParam(1);
super.refreshLoad();
}
... ...
... ... @@ -5,12 +5,14 @@ import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.TextView;
import com.google.gson.Gson;
import com.yinhebairong.clasmanage.Config;
import com.yinhebairong.clasmanage.R;
import com.yinhebairong.clasmanage.base.BaseActivity;
import com.yinhebairong.clasmanage.base.instant.InstantViews;
import com.yinhebairong.clasmanage.base.instant.Layout;
import com.yinhebairong.clasmanage.base.instant.click.ClickView;
import com.yinhebairong.clasmanage.entity.LoginEntity;
import com.yinhebairong.clasmanage.m.M;
import com.yinhebairong.clasmanage.ui.MainActivity;
import com.yinhebairong.clasmanage.utils.SharedPreferenceUtil;
... ... @@ -45,11 +47,23 @@ public class ChoiStaActivity extends BaseActivity {
break;
case R.id.chois_tea: // 教师
Config.IDENTITY=0;
//设置老师的classid
String json = (String) SharedPreferenceUtil.get(this, M.UserJson, "");
Gson gson = new Gson();
LoginEntity loginEntity = gson.fromJson(json, LoginEntity.class);
Config.ClassId = loginEntity.getData().getUser().getClassId();
SharedPreferenceUtil.put(ChoiStaActivity.this,M.ClassId,Config.ClassId);
SharedPreferenceUtil.put(ChoiStaActivity.this,M.IDENTITY,Config.IDENTITY);
skipAnotherActivity(activity, MainActivity.class,true);
break;
case R.id.chois_par: // 家长
Config.IDENTITY=1;
//设置家长的classid
String json2 = (String) SharedPreferenceUtil.get(this, M.UserJson, "");
Gson gson2 = new Gson();
LoginEntity loginEntity2 = gson2.fromJson(json2, LoginEntity.class);
Config.ClassId = loginEntity2.getData().getUser().getStudentInfoList().get(0).getClassId();
SharedPreferenceUtil.put(ChoiStaActivity.this,M.ClassId,Config.ClassId);
SharedPreferenceUtil.put(ChoiStaActivity.this,M.IDENTITY,Config.IDENTITY);
skipAnotherActivity(activity, MainActivity.class,true);
break;
... ...
... ... @@ -179,7 +179,6 @@ public class LoginActivity extends BaseActivity {
SharedPreferenceUtil.put(LoginActivity.this,M.UserJson,UserJson);
if (Config.Type.equals("1")||Config.Type.equals("2")||Config.Type.equals("3")) {//教师
//教师端不处理
Config.ClassId = entity.getData().getUser().getClassId();
SharedPreferenceUtil.put(LoginActivity.this, M.ClassId, entity.getData().getUser().getClassId());
Config.IDENTITY=0;
SharedPreferenceUtil.put(LoginActivity.this,M.IDENTITY,Config.IDENTITY);
... ... @@ -187,6 +186,9 @@ public class LoginActivity extends BaseActivity {
setChildrenData(entity);
skipAnotherActivity(activity, ChoiStaActivity.class, false);
return;
}else {
//不是家长ClassId为班级id
Config.ClassId = entity.getData().getUser().getClassId();
}
}else {//就是家长
setChildrenData(entity);
... ... @@ -218,13 +220,11 @@ public class LoginActivity extends BaseActivity {
SharedPreferenceUtil.put(LoginActivity.this,M.IDENTITY,Config.IDENTITY);
Config.id = entity.getData().getUser().getStudentInfoList().get(0).getId();
Config.Student_name = entity.getData().getUser().getStudentInfoList().get(0).getStudentName();
Config.ClassId = entity.getData().getUser().getStudentInfoList().get(0).getClassId();
if(null!=entity.getData().getUser().getStudentInfoList().get(0).getPhoto()){
Config.StudentPhoto=entity.getData().getUser().getStudentInfoList().get(0).getPhoto();
SharedPreferenceUtil.put(LoginActivity.this,M.STUDENTPHOTO,Config.StudentPhoto);
}
SharedPreferenceUtil.put(LoginActivity.this,M.StudentId,entity.getData().getUser().getStudentInfoList().get(0).getId());
SharedPreferenceUtil.put(LoginActivity.this,M.ClassId,entity.getData().getUser().getStudentInfoList().get(0).getClassId());
SharedPreferenceUtil.put(LoginActivity.this,M.StudentName,entity.getData().getUser().getStudentInfoList().get(0).getStudentName());
}
}
... ...
... ... @@ -20,6 +20,7 @@ import com.yinhebairong.clasmanage.bean.TeacherInfoBean;
import com.yinhebairong.clasmanage.entity.LoginEntity;
import com.yinhebairong.clasmanage.m.M;
import com.yinhebairong.clasmanage.ui.MainActivity;
import com.yinhebairong.clasmanage.ui.login.ChoiStaActivity;
import com.yinhebairong.clasmanage.utils.SharedPreferenceUtil;
import com.yinhebairong.clasmanage.widget.CircleImageView;
... ... @@ -94,15 +95,20 @@ public class MyInfoActivity extends BaseActivity {
finish();
break;
case R.id.ll_change://切换身份
Log.e("22Config.IDENTITY===","==="+Config.IDENTITY);
String json = (String) SharedPreferenceUtil.get(this, M.UserJson, "");
Gson gson = new Gson();
LoginEntity loginEntity = gson.fromJson(json, LoginEntity.class);
if (Config.IDENTITY == 0) {
Config.IDENTITY = 1;
Config.ClassId = loginEntity.getData().getUser().getStudentInfoList().get(0).getClassId();
} else if (Config.IDENTITY == 1) {
Config.IDENTITY = 0;
Config.ClassId = loginEntity.getData().getUser().getClassId();
}
Log.e("33Config.IDENTITY===","==="+Config.IDENTITY);
SharedPreferenceUtil.put(this,M.IDENTITY, Config.IDENTITY );
Intent intent1 =new Intent(MyInfoActivity.this, MainActivity.class);
SharedPreferenceUtil.put(MyInfoActivity.this, M.ClassId, Config.ClassId);
SharedPreferenceUtil.put(this, M.IDENTITY, Config.IDENTITY);
Intent intent1 = new Intent(MyInfoActivity.this, MainActivity.class);
startActivity(intent1);
setResult(RESULT_OK);
finish();
... ... @@ -141,7 +147,7 @@ public class MyInfoActivity extends BaseActivity {
Log.e("teacherInfoBean==", teacherInfoBean.getData().getName());
tv_name.setText(teacherInfoBean.getData().getName());
tv_phone.setText(teacherInfoBean.getData().getAccount());
if(teacherInfoBean.getData().getCurrent_campus()!=null){
if (teacherInfoBean.getData().getCurrent_campus() != null) {
tv_school.setText(teacherInfoBean.getData().getCurrent_campus());
}
if (null != teacherInfoBean.getData().getPhoto()) {
... ... @@ -168,7 +174,7 @@ public class MyInfoActivity extends BaseActivity {
* 获取家长信息
*/
private void getParentsProfile() {
Api().getParentsProfile(Config.Token,Config.Student_id)
Api().getParentsProfile(Config.Token, Config.Student_id)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<ParentsInfoBean>() {
... ... @@ -183,7 +189,7 @@ public class MyInfoActivity extends BaseActivity {
if (null != teacherInfoBean.getData()) {
tv_name.setText(teacherInfoBean.getData().getName());
tv_phone.setText(teacherInfoBean.getData().getAccount());
if(teacherInfoBean.getData().getCurrent_campus()!=null){
if (teacherInfoBean.getData().getCurrent_campus() != null) {
tv_school.setText(teacherInfoBean.getData().getCurrent_campus());
}
if (null != teacherInfoBean.getData().getPhoto()) {
... ...
... ... @@ -13,12 +13,12 @@
<android.support.v4.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginBottom="@dimen/dp_60"
android:layout_below="@+id/Atytitle">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="@dimen/dp_60"
android:orientation="vertical">
<LinearLayout
... ...
... ... @@ -48,7 +48,7 @@
android:background="@null"
android:hint="请输入账号"
android:maxLines="1"
android:text="13888372529"
android:text="13888680699"
android:textColor="@color/color_bdc4ce"
android:textSize="@dimen/sp_16" />
... ...