Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/src/main/java/com/yinhebairong/clasmanage/network/ApiService.java

@@ -66,7 +66,7 @@ public class DclxEntity {
         @SerializedName("4")
         private String _$4;
 
-        public String get_$1() {
+        public  String get_$1() {
             return _$1;
         }
 

@@ -10,11 +10,13 @@ import com.yinhebairong.clasmanage.entity.BjListEntity;
 import com.yinhebairong.clasmanage.entity.BjxzEntity;
 import com.yinhebairong.clasmanage.entity.ChxqEntity;
 import com.yinhebairong.clasmanage.entity.DateEntity;
+import com.yinhebairong.clasmanage.entity.DclxEntity;
 import com.yinhebairong.clasmanage.entity.DcwjEntity;
 import com.yinhebairong.clasmanage.entity.DeleteEntity;
 import com.yinhebairong.clasmanage.entity.DetailsEntity;
 import com.yinhebairong.clasmanage.entity.EdithonorEntity;
 import com.yinhebairong.clasmanage.entity.ErweimaEntity;
+import com.yinhebairong.clasmanage.entity.FbdcEntity;
 import com.yinhebairong.clasmanage.entity.FbwjrwEntity;
 import com.yinhebairong.clasmanage.entity.GetRevokeEntity;
 import com.yinhebairong.clasmanage.entity.GrpjEntity_sj;
@@ -308,9 +310,8 @@ public interface ApiService {
     Observable<DcwjEntity> dcwjlist(@Header("token") String token, @Query("type") int type);
     /*发布问卷任务*/
     @POST("/api/questionnaire/publishQuestionnaire")
-    Observable<FbwjrwEntity> fbwjrw(@Header("token") String token , @Query("class_id") int class_id,@Query("teacher_ids") String teacher_ids,@Query("parent_ids") String parent_ids, @Query("name") String name,
-                                    @Query("content") String content ,@Query("deadline") String deadline ,@Query("is_anonymous") String is_anonymous,@Query("show_lock") String show_lock,
-                                    @Query("question") String question);
+    Observable<FbwjrwEntity> fbwjrw(@Header("token") String token, @Query("teacher_ids") String teacher_ids, @Query("parent_ids") String parent_ids, @Query("name") String name,
+                                    @Query("content") String content, @Query("deadline") String deadline, @Query("is_anonymous") String is_anonymous);
 
     /*问卷详情*/
     @POST("/api/questionnaire/getQuestionnaireInfo")
@@ -331,4 +332,12 @@ public interface ApiService {
     Observable<getTaskStatusEntity> publishActive(@Header("token") String token, @Query("class_id") String class_id, @Query("teacher_ids") String teacher_ids, @Query("student_ids") String parent_ids, @Query("title") String title,
                                                 @Query("content") String content, @Query("call") String call, @Query("inscription") String inscription, @Query("video") String video, @Query("images") String images, @Query("link") String link,
                                                 @Query("deadline") String deadline, @Query("open_switch") int open_switch, @Query("start_time") String start_time,@Query("end_time") String end_time);
+
+    /*请假类型*/
+    @POST("/api/leave/getLeaveType")
+    Observable<DclxEntity> dclx(@Header("token") String token , @Query(("id")) int id);
+    /*发布请假任务*/
+    @POST("/api/leave/publishLeave")
+    Observable<FbdcEntity> fndc(@Header("tokoen") String token, @Query("student_id") int student_id, @Query("leave_type") CharSequence leave_type, @Query("start_date") CharSequence start_date,
+                                @Query("end_date") CharSequence end_date, @Query("day") String day, @Query("content") String content);
 }
\ No newline at end of file

@@ -54,12 +54,12 @@ public class Tz_Rv_Fragment extends BaseFragment {
 
     @Override
     protected void lazyLoad() {
-        getDate(0);
+        getDate(2);
     }
 
     @Override
     protected void refreshLoad() {
-        getDate(0);
+        getDate(2);
         super.refreshLoad();
     }
 
@@ -75,16 +75,8 @@ public class Tz_Rv_Fragment extends BaseFragment {
 
                     @Override
                     public void onNext(JxtZyListEntity jxtZyListEntity) {
-//                        List<JxtZyListEntity.DataBeanX.DataBean> data = jxtZyListEntity.getData().getData();
-//                        jxt_listAdapter = new Jxt_ListAdapter(getMultipleItemData(data));
-//                        dataRv.setLayoutManager(new LinearLayoutManager(getActivity()));
-//                        dataRv.setAdapter(jxt_listAdapter);
-//                        jxt_listAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
-//                            @Override
-//                            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
-//
-//                            }
-//                        });
+
+                        
                     }
 
                     @Override
@@ -136,21 +128,4 @@ public class Tz_Rv_Fragment extends BaseFragment {
                     }
                 });
     }
-
-    /**
-     * 添加布局Itemtype
-     *
-     * @param itemList
-     * @return
-     */
-    private List<JxtZyListEntity.DataBeanX.DataBean> getMultipleItemData(List<JxtZyListEntity.DataBeanX.DataBean> itemList) {
-        if (null == itemList || itemList.size() <= 0) {
-            return null;
-        }
-        for (int i = 0; i < itemList.size(); i++) {
-            //type标识
-            itemList.get(i).setItemType(itemList.get(i).getType());
-        }
-        return itemList;
-    }
 }

@@ -81,7 +81,7 @@ public abstract class XmlxChooseDcDialog extends Dialog implements jsc.kit.wheel
     private void data() {
         ApiStore.createApi(ApiService.class).dclx(Config.Token,Config.id).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(data -> {
             if (data.getCode() == M.success) {
-                List<String> type = data.getData().get_$1();
+                List<String> type = (List<String>) data.getData();
                 arr.addAll(type);
                 WheelItem[] items = new WheelItem[type.size()];
                 for (int i = 0; i < type.size(); i++) {