...
|
...
|
@@ -15,6 +15,7 @@ import android.widget.Toast; |
|
|
import androidx.annotation.Nullable;
|
|
|
|
|
|
import com.donkingliang.imageselector.utils.ImageSelector;
|
|
|
import com.google.gson.Gson;
|
|
|
import com.kongzue.dialog.v3.WaitDialog;
|
|
|
import com.yinhebairong.clasmanage.Config;
|
|
|
import com.yinhebairong.clasmanage.R;
|
...
|
...
|
@@ -22,11 +23,13 @@ import com.yinhebairong.clasmanage.base.BaseActivity; |
|
|
import com.yinhebairong.clasmanage.base.instant.Layout;
|
|
|
import com.yinhebairong.clasmanage.base.instant.TopNavigationBar;
|
|
|
import com.yinhebairong.clasmanage.base.instant.slideslip.SlideLip;
|
|
|
import com.yinhebairong.clasmanage.bean.TzUserDate;
|
|
|
import com.yinhebairong.clasmanage.entity.SolitaireEntity;
|
|
|
import com.yinhebairong.clasmanage.m.M;
|
|
|
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.Collections;
|
|
|
import java.util.List;
|
|
|
|
|
|
import butterknife.BindView;
|
|
|
import butterknife.ButterKnife;
|
...
|
...
|
@@ -77,6 +80,9 @@ public class FbxqActivity extends BaseActivity { |
|
|
});
|
|
|
}
|
|
|
|
|
|
List<TzUserDate.DataBean> dataBeans;
|
|
|
com.yinhebairong.clasmanage.entity.getClassListEntity getClassListEntity;
|
|
|
|
|
|
@Override
|
|
|
protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
|
|
|
super.onActivityResult(requestCode, resultCode, data);
|
...
|
...
|
@@ -88,10 +94,37 @@ public class FbxqActivity extends BaseActivity { |
|
|
ArrayList<String> parent_ids = extras.getStringArrayList("parent_ids");
|
|
|
teacherIds = TextUtils.join(",", teacher_ids);
|
|
|
parentIds = TextUtils.join(",", parent_ids);
|
|
|
fbxqName.setText(names);
|
|
|
getClassListEntity = (com.yinhebairong.clasmanage.entity.getClassListEntity) extras.getSerializable("AllDate");
|
|
|
dataBeans = new ArrayList<>();
|
|
|
if (getClassListEntity != null){
|
|
|
for (int i = 0; i < getClassListEntity.getData().size(); i++) {
|
|
|
if (getClassListEntity.getData().get(i).isChecked()) {
|
|
|
if (teacher_ids.size() != 0) {
|
|
|
teacher_ids.clear();
|
|
|
}
|
|
|
if (parent_ids.size() != 0) {
|
|
|
parent_ids.clear();
|
|
|
}
|
|
|
for (int j = 0; j < getClassListEntity.getData().get(i).getTeacher().size(); j++) {
|
|
|
if (getClassListEntity.getData().get(i).getTeacher().get(j).isChecked()) {
|
|
|
teacher_ids.add(getClassListEntity.getData().get(i).getTeacher().get(j).getId());
|
|
|
}
|
|
|
}
|
|
|
for (int j = 0; j < getClassListEntity.getData().get(i).getParent().size(); j++) {
|
|
|
if (getClassListEntity.getData().get(i).getParent().get(j).isChecked()) {
|
|
|
parent_ids.add(getClassListEntity.getData().get(i).getParent().get(j).getId());
|
|
|
}
|
|
|
}
|
|
|
dataBeans.add(new TzUserDate.DataBean(getClassListEntity.getData().get(i).getClass_id(), TextUtils.join(",", teacher_ids), TextUtils.join(",", parent_ids)));
|
|
|
}
|
|
|
}
|
|
|
|
|
|
}
|
|
|
classNames.setText(names);
|
|
|
fbxqName.setText("修改班级");
|
|
|
}
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
...
|
...
|
@@ -100,9 +133,16 @@ public class FbxqActivity extends BaseActivity { |
|
|
classSelect1.setOnClickListener(new View.OnClickListener() {
|
|
|
@Override
|
|
|
public void onClick(View view) {
|
|
|
Intent intent = new Intent();
|
|
|
intent.setClass(FbxqActivity.this, JsjlActivity.class);
|
|
|
startActivityForResult(intent, STRAT_ID);
|
|
|
if (getClassListEntity != null){
|
|
|
Intent intent = new Intent();
|
|
|
intent.putExtra("AllDate", getClassListEntity);
|
|
|
intent.setClass(FbxqActivity.this, JsjlActivity.class);
|
|
|
startActivityForResult(intent, STRAT_ID);
|
|
|
}else {
|
|
|
Intent intent = new Intent();
|
|
|
intent.setClass(FbxqActivity.this, JsjlActivity.class);
|
|
|
startActivityForResult(intent, STRAT_ID);
|
|
|
}
|
|
|
}
|
|
|
});
|
|
|
}
|
...
|
...
|
@@ -120,7 +160,9 @@ public class FbxqActivity extends BaseActivity { |
|
|
}
|
|
|
|
|
|
private void getData() {
|
|
|
Api().fbjl(Config.Token, Config.ClassId, parentIds,M.getEditTextString(addFbJl2),M.getEditTextString(addFbXq))
|
|
|
Gson gson = new Gson();
|
|
|
String s = gson.toJson(dataBeans);
|
|
|
Api().fbjl(Config.Token,s,M.getEditTextString(addFbJl2),M.getEditTextString(addFbXq))
|
|
|
.subscribeOn(Schedulers.io())
|
|
|
.observeOn(AndroidSchedulers.mainThread())
|
|
|
.subscribe(new Observer<SolitaireEntity>() {
|
...
|
...
|
@@ -147,6 +189,8 @@ public class FbxqActivity extends BaseActivity { |
|
|
|
|
|
}
|
|
|
});
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
} |
...
|
...
|
|