家长端作业问题修改

@@ -148,7 +148,6 @@ public class Jxt_ListAdapter extends BaseMultiItemQuickAdapter<JxtAllListEntity.
             state_text.setTextColor(Color.parseColor("#8C9198"));
             state_text.setBackgroundResource(R.drawable.gray_shape_text);
         }
-        DebugLog.e("getIs_author===" + item.getIs_author());
         if (item.getIs_author() == 1) {//1-自己发的 0-别人发的
             ck_lin.setVisibility(View.VISIBLE);
             state_tv.setText("已报名");
@@ -271,10 +270,15 @@ public class Jxt_ListAdapter extends BaseMultiItemQuickAdapter<JxtAllListEntity.
         } else {
             ck_lin.setVisibility(View.GONE);
         }
-        if (item.getIs_online() ==0){
-            state_tv.setText("已查看");
+        if (Config.IDENTITY==1){
+           state_text.setText(item.getStatus_text());
         }else {
-            state_tv.setText("已提交");
+            if (item.getIs_online() ==0){
+                state_tv.setText("已查看");
+            } else {
+                state_tv.setText("已提交");
+            }
         }
+
     }
 }

@@ -8,6 +8,7 @@ import android.widget.TextView;
 import android.support.annotation.Nullable;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
+import com.yinhebairong.clasmanage.Config;
 import com.yinhebairong.clasmanage.R;
 import com.yinhebairong.clasmanage.entity.JxtZyListEntity;
 
@@ -41,16 +42,32 @@ public class Jxt_Zy_Adapter extends BaseQuickAdapter<JxtZyListEntity.DataBeanX.D
         yellow_tv.setText(item.getView_num()+"");
         gray_tv.setText("/"+item.getTotal_num());
         state_text.setVisibility(View.GONE);
-        if (item.getUncomment_num()==0) {
+        if (item.getIs_author() == 1) {//1-自己发的 0-别人发的
             massage_num.setVisibility(View.GONE);
-        } else {
-            massage_num.setText(item.getUncomment_num() + "");
+        } else {//不是我发的
+            if (item.getIs_read() == 1) {//已读
+                massage_num.setVisibility(View.GONE);
+                if (item.getIs_online() ==0){
+                    state_tv.setText("已查看");
+                }else {
+                    state_tv.setText("已提交");
+                }
+            } else {
+                massage_num.setVisibility(View.VISIBLE);
+                massage_num.setText("1");
+                if (item.getIs_online() ==0){
+                    state_tv.setText("未查看");
+                }else {
+                    state_tv.setText("未提交");
+                }
+            }
         }
-        helper.addOnClickListener(R.id.ck_lin);
-        if (item.getIs_online() ==0){
-            state_tv.setText("已查看");
-        }else {
-            state_tv.setText("已提交");
+        if (Config.IDENTITY == 0 && item.getIs_author() == 1) {//1-自己发的 0-别人发的
+            ck_lin.setVisibility(View.VISIBLE);
+            helper.addOnClickListener(R.id.ck_lin);
+        } else {
+            ck_lin.setVisibility(View.GONE);
         }
+
     }
 }

@@ -166,6 +166,70 @@ public class JxtZyListEntity {
             private String parent_name;
             private String student_name;
 
+            public int getStatus() {
+                return status;
+            }
+
+            public void setStatus(int status) {
+                this.status = status;
+            }
+
+            public String getLabel() {
+                return label;
+            }
+
+            public void setLabel(String label) {
+                this.label = label;
+            }
+
+            public int getRead_time() {
+                return read_time;
+            }
+
+            public void setRead_time(int read_time) {
+                this.read_time = read_time;
+            }
+
+            public String getType_text() {
+                return type_text;
+            }
+
+            public void setType_text(String type_text) {
+                this.type_text = type_text;
+            }
+
+            public String getStatus_text() {
+                return status_text;
+            }
+
+            public void setStatus_text(String status_text) {
+                this.status_text = status_text;
+            }
+
+            public int getIs_read() {
+                return is_read;
+            }
+
+            public void setIs_read(int is_read) {
+                this.is_read = is_read;
+            }
+
+            public String getParent_name() {
+                return parent_name;
+            }
+
+            public void setParent_name(String parent_name) {
+                this.parent_name = parent_name;
+            }
+
+            public String getStudent_name() {
+                return student_name;
+            }
+
+            public void setStudent_name(String student_name) {
+                this.student_name = student_name;
+            }
+
             public int getDetail_id() {
                 return detail_id;
             }

@@ -61,6 +61,7 @@ import com.yinhebairong.clasmanage.utils.SharedPreferenceUtil;
 import com.yinhebairong.clasmanage.widget.CircleImageView;
 import com.yinhebairong.clasmanage.widget.DatePickerView;
 
+import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
@@ -512,6 +513,29 @@ public class StuEvaFragment_per extends BaseFragment {
         }
         return result;
     }
+    //获取是否存在NavigationBar
+    public boolean checkDeviceHasNavigationBar(Context context) {
+        boolean hasNavigationBar = false;
+        Resources rs = context.getResources();
+        int id = rs.getIdentifier("config_showNavigationBar", "bool", "android");
+        if (id > 0) {
+            hasNavigationBar = rs.getBoolean(id);
+        }
+        try {
+            Class systemPropertiesClass = Class.forName("android.os.SystemProperties");
+            Method m = systemPropertiesClass.getMethod("get", String.class);
+            String navBarOverride = (String) m.invoke(systemPropertiesClass, "qemu.hw.mainkeys");
+            if ("1".equals(navBarOverride)) {
+                //不存在虚拟按键
+                hasNavigationBar = false;
+            } else if ("0".equals(navBarOverride)) {
+                //存在虚拟按键
+                hasNavigationBar = true;
+            }
+        } catch (Exception e) {
+        }
+        return hasNavigationBar;
+    }
     // 表现图标弹窗
     private void Bxpop() {
         View view = LayoutInflater.from(getActivity()).inflate(R.layout.pop_xiangmu, null);
@@ -522,22 +546,25 @@ public class StuEvaFragment_per extends BaseFragment {
         PopupWindow pop = new PopupWindow(view, WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT);
         // Limit popwindow size
         // Limit popwindow size
+
         if (Build.VERSION.SDK_INT >= 24) {
-            if (Build.MANUFACTURER.equals("Xiaomi")){
-                DisplayMetrics metrics = new DisplayMetrics();
-                getActivity().getWindowManager().getDefaultDisplay().getMetrics(metrics);
-                int height = metrics.heightPixels;
-                height += getNavigationBarHeight( getActivity());
-                Rect visibleFrame = new Rect();
-                view.getGlobalVisibleRect(visibleFrame);
-                int popheight =height - visibleFrame.bottom - linear_pop.getBottom() - getNavigationBarHeight( getActivity());
-                pop.setHeight(popheight);
-            }else {
-                Rect visibleFrame = new Rect();
-                view.getGlobalVisibleRect(visibleFrame);
-                int height = view.getResources().getDisplayMetrics().heightPixels - visibleFrame.bottom - linear_pop.getBottom() - getNavigationBarHeight( getActivity());
-                pop.setHeight(height);
-                M.log("getDisplayMetrics", view.getResources().getDisplayMetrics().heightPixels + "---" + visibleFrame.bottom + "---" + linear_pop.getBottom()+"---"+getNavigationBarHeight( getActivity()));
+            if (checkDeviceHasNavigationBar(getActivity())){
+                if (Build.MANUFACTURER.equals("Xiaomi")){
+                    DisplayMetrics metrics = new DisplayMetrics();
+                    getActivity().getWindowManager().getDefaultDisplay().getMetrics(metrics);
+                    int height = metrics.heightPixels;
+                    height += getNavigationBarHeight( getActivity());
+                    Rect visibleFrame = new Rect();
+                    view.getGlobalVisibleRect(visibleFrame);
+                    int popheight =height - visibleFrame.bottom - linear_pop.getBottom() ;
+                    pop.setHeight(popheight);
+                }else {
+                    Rect visibleFrame = new Rect();
+                    view.getGlobalVisibleRect(visibleFrame);
+                    int height = view.getResources().getDisplayMetrics().heightPixels - visibleFrame.bottom - linear_pop.getBottom();
+                    pop.setHeight(height);
+                    M.log("getDisplayMetrics", view.getResources().getDisplayMetrics().heightPixels + "---" + visibleFrame.bottom + "---" + linear_pop.getBottom()+"---"+getNavigationBarHeight( getActivity()));
+                }
             }
         }
         pop.setOutsideTouchable(true);

@@ -182,13 +182,12 @@ public class ZytjActivity extends BaseActivity {
             }
         }
         if (tzxqEntity.getData().getDetail_video()!=null&&tzxqEntity.getData().getDetail_video().size()>0){
-            for (int i = 0; i <tzxqEntity.getData().getVideo().size() ; i++) {
+            for (int i = 0; i <tzxqEntity.getData().getDetail_video().size() ; i++) {
                 videoUrl.add(tzxqEntity.getData().getDetail_video().get(i));
-                picAndVideo.add(new JxtImageEntity(tzxqEntity.getData().getDetail_video().get(i),2,getNetVideoBitmap(tzxqEntity.getData().getVideo().get(i))));
+                picAndVideo.add(new JxtImageEntity(tzxqEntity.getData().getDetail_video().get(i),2,tzxqEntity.getData().getDetail_video().get(i)));
             }
         }
         imageAdapter.setNewData(picAndVideo);
-        List<VideoEntity> frequencyUrl = new ArrayList<>();
         if (tzxqEntity.getData().getDetail_audio()!=null&&tzxqEntity.getData().getDetail_audio().size()>0){
             for (int i = 0; i <tzxqEntity.getData().getDetail_audio().size() ; i++) {
                 frequencyUrl.add(new VideoEntity(tzxqEntity.getData().getDetail_audio().get(i),false));
@@ -491,7 +490,7 @@ public class ZytjActivity extends BaseActivity {
                         } else if (type == 3) {
                             frequencyUrl.add(new VideoEntity(response.body().getData().getUrl(), false));
                         }
-                        audioAdapter.notifyDataSetChanged();
+                        audioAdapter.setNewData(frequencyUrl);
                         imageAdapter.notifyDataSetChanged();
                     }
 
@@ -811,7 +810,7 @@ public class ZytjActivity extends BaseActivity {
         @Override
         public void handleMessage(Message msg) {
             super.handleMessage(msg);
-            Fbzy_Activity currentActivity = (Fbzy_Activity) mActivity.get();
+            ZytjActivity currentActivity = (ZytjActivity) mActivity.get();
             switch (msg.what) {
                 case 100:
                     if (currentActivity.mediaPlayer != null) {

@@ -157,12 +157,14 @@ public class ZyxqPerActivity extends BaseActivity {
                             jlLsName.setText(tzxqEntity.getData().getTeacher_name());
                             jlBj.setText(tzxqEntity.getData().getClass_name());
                             jlTime.setText(tzxqEntity.getData().getDate());
-                            if (tzxqEntity.getData().getIs_online()==0){
+                            if (tzxqEntity.getData().getStatus()==1){
                                 fubu_layout .setVisibility(View.GONE);
                                 zyLayout.setVisibility(View.GONE);
                                 pjLayout.setVisibility(View.GONE);
                                 if (tzxqEntity.getData().getEvaluate_level_id()==0){
-
+                                    fubu_layout .setVisibility(View.VISIBLE);
+                                    fabutzBut.setVisibility(View.VISIBLE);
+                                    pjLayout.setVisibility(View.GONE);
                                 }else {
                                     pjLayout.setVisibility(View.VISIBLE);
                                     RequestOptions requestOptions = RequestOptions.circleCropTransform();
@@ -178,7 +180,6 @@ public class ZyxqPerActivity extends BaseActivity {
                                     audio_adapterpj.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
                                         @Override
                                         public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
-
                                             text_time = view.findViewById(R.id.text_time);
                                             List<VideoEntity> data = audio_adapterpj.getData();
                                             for (int i = 0; i < data.size(); i++) {

@@ -208,7 +208,7 @@ public class All_Fragment extends BaseFragment {
                                         switch (jxt_listAdapter.getData().get(position).getItemType()) {
                                             case 1:
                                                 if (data.get(position).getIs_author() == 1) {
-                                                    List<JxtZyListEntity.DataBeanX.DataBean> data = adapter.getData();
+                                                    List<JxtAllListEntity.DataBeanX.DataBean> data = adapter.getData();
                                                     Intent intent = new Intent(getActivity(), Zyxq_Activity.class);
                                                     intent.putExtra("ZyId", data.get(position).getId() + "");
                                                     startActivity(intent);
@@ -372,7 +372,6 @@ public class All_Fragment extends BaseFragment {
 
                     @Override
                     public void onError(Throwable e) {
-                        Toast.makeText(getActivity(), "走了Erro", Toast.LENGTH_SHORT).show();
                     }
 
                     @Override