通知3.31

@@ -45,4 +45,14 @@ public class SolitaireEntity {
     public void setData(Object data) {
         this.data = data;
     }
+
+    @Override
+    public String toString() {
+        return "SolitaireEntity{" +
+                "code=" + code +
+                ", msg='" + msg + '\'' +
+                ", time='" + time + '\'' +
+                ", data=" + data +
+                '}';
+    }
 }

@@ -342,7 +342,7 @@ public interface ApiService {
 
     /*发布接龙任务*/
     @POST("/api/solitaire/publishSolitaire")
-    Observable<SolitaireEntity> fbjl(@Header("token") String token, @Query("class_id") String class_id, @Query("parent_ids") String parent_ids, @Query("title") String title, @Query("content") String content);
+    Observable<SolitaireEntity> fbjl(@Header("token") String token,@Query("object") String json, @Query("title") String title, @Query("content") String content);
 
     /*参与接龙*/
     @POST("/api/solitaire/setSolitaire")

@@ -57,8 +57,7 @@ public class JlxqActivity extends BaseActivity {
     TextView includeName;
     @BindView(R.id.teacher_lin)
     LinearLayout teacherLin;
-    @BindView(R.id.state_text)
-    TextView stateText;
+
     @BindView(R.id.title_tv)
     TextView titleTv;
     @BindView(R.id.jl_xqlist)
@@ -127,6 +126,7 @@ public class JlxqActivity extends BaseActivity {
                     @Override
                     public void onNext(JlxpEntity jlxpEntity) {
                         if (jlxpEntity.getCode() == M.success) {
+                            titleTv.setText(jlxpEntity.getData().getTitle());
                             jlLsName.setText(jlxpEntity.getData().getTeacher_name());
                             jlBj.setText(jlxpEntity.getData().getClass_name());
                             jlTime.setText(jlxpEntity.getData().getDate());

@@ -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 {
 
                     }
                 });
+
     }
 
+
 }

@@ -67,7 +67,9 @@ import com.yinhebairong.clasmanage.entity.VideoEntity;
 import com.yinhebairong.clasmanage.m.M;
 import com.yinhebairong.clasmanage.network.ApiService;
 import com.yinhebairong.clasmanage.ui.jxt.fragment.Jl.JsjlActivity;
+import com.yinhebairong.clasmanage.ui.my.StudentHeadImgActivity;
 import com.yinhebairong.clasmanage.utils.AudioUtils;
+import com.yinhebairong.clasmanage.utils.SdcardUtil;
 import com.yinhebairong.clasmanage.widget.CircularProgressBar;
 
 import java.io.File;
@@ -94,6 +96,9 @@ import retrofit2.Callback;
 import retrofit2.Response;
 import retrofit2.Retrofit;
 import retrofit2.converter.gson.GsonConverterFactory;
+import top.zibin.luban.CompressionPredicate;
+import top.zibin.luban.Luban;
+import top.zibin.luban.OnCompressListener;
 
 import static com.yinhebairong.clasmanage.ui.jxt.activity.Fbzy_Activity.isLink;
 
@@ -786,6 +791,8 @@ public class FbtzA_ctivity extends BaseActivity {
     protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         if (requestCode == STRAT_ID && resultCode == RESULT_OK) {
+
+
             Bundle extras = data.getExtras();
             ArrayList<String> class_names = extras.getStringArrayList("class_names");
             ArrayList<String> teachersId = new ArrayList<>();
@@ -815,6 +822,7 @@ public class FbtzA_ctivity extends BaseActivity {
                     }
                 }
             }
+
             String names = TextUtils.join(",", class_names);
             if (names.isEmpty()) {
                 className.setText("请选择班级");
@@ -825,9 +833,10 @@ public class FbtzA_ctivity extends BaseActivity {
 
         } else if (requestCode == REQUEST_CODE && resultCode == RESULT_OK) {
             ArrayList<String> Imags = data.getStringArrayListExtra(ImageSelector.SELECT_RESULT);
-            for (int i = 0; i < Imags.size(); i++) {
-                postFile(Imags.get(i), 1, "");
-            }
+//            for (int i = 0; i < Imags.size(); i++) {
+//                postFile(Imags.get(i), 1, "");
+//            }
+            yasuo(Imags);
             imageAdapter.notifyDataSetChanged();
         } else if (requestCode == VIDEO_CODE && resultCode == RESULT_OK) {
             Uri uri = data.getData();
@@ -853,6 +862,38 @@ public class FbtzA_ctivity extends BaseActivity {
         }
     }
 
+    private void yasuo(ArrayList<String> imags) {
+        Luban.with(this)
+                .load(imags)
+                .ignoreBy(100)
+                .setTargetDir(SdcardUtil.getPath())
+                .filter(new CompressionPredicate() {
+                    @Override
+                    public boolean apply(String path) {
+                        return !(TextUtils.isEmpty(path) || path.toLowerCase().endsWith(".gif"));
+                    }
+                })
+                .setCompressListener(new OnCompressListener() {
+                    @Override
+                    public void onStart() {
+                        // TODO 压缩开始前调用，可以在方法内启动 loading UI
+                    }
+
+                    @Override
+                    public void onSuccess(File file) {
+                        // TODO 压缩成功后调用，返回压缩后的图片文件
+                        postFile(file.getAbsolutePath(),1,"");
+                    }
+
+                    @Override
+                    public void onError(Throwable e) {
+                        // TODO 当压缩过程出现问题时调用
+                        Toast.makeText(FbtzA_ctivity.this, "图片压缩失败", Toast.LENGTH_SHORT).show();
+                    }
+                }).launch();
+
+    }
+
     private void postFile(String s, int i, String s1) {
         // 上传文件
         Retrofit sRetrofit = new Retrofit.Builder()

@@ -120,22 +120,12 @@
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:orientation="horizontal">
-                   <TextView
-                       android:padding="@dimen/dp_1"
-                       android:layout_marginLeft="@dimen/dp_20"
-                       android:layout_width="wrap_content"
-                       android:layout_height="wrap_content"
-                       android:text="进行中"
-                       android:textSize="@dimen/sp_12"
-                       android:textColor="#FFAB13"
-                       android:id="@+id/state_text"
-                       android:layout_marginRight="@dimen/dp_8"
-                       android:layout_marginTop="@dimen/dp_19"
-                       android:background="@drawable/yellow_shape_text"/>
+
                    <TextView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:textSize="@dimen/sp_16"
+                       android:layout_marginLeft="@dimen/dp_15"
                        android:text="11月25日家长会报名统计"
                        android:textStyle="bold"
                        android:id="@+id/title_tv"
@@ -163,7 +153,7 @@
                </TextView>
            </LinearLayout>
            <RelativeLayout
-
+               android:visibility="gone"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content">
                <LinearLayout

@@ -6,7 +6,7 @@
     <TextView
         android:id="@+id/hdtext"
         android:background="@drawable/shape_solid_16_f9f9f9"
-        android:layout_width="@dimen/dp_79"
+        android:layout_width="@dimen/dp_85"
         android:layout_height="@dimen/dp_32"
         android:textColor="#3D444D"
         android:gravity="center"