bug修改

teacher/src/main/java/com/cooleshow/teacher/adapter/PianoRoomCourseStudentListAdapter.java

@@ -1,6 +1,7 @@
 package com.cooleshow.teacher.adapter;
 
 import android.text.TextUtils;
+import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -9,6 +10,7 @@ import com.chad.library.adapter.base.viewholder.BaseViewHolder;
 import com.cooleshow.base.utils.GlideUtils;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.bean.PianoRoomCourseInfoBean;
+import com.cooleshow.teacher.constants.CourseConstants;
 
 import androidx.annotation.NonNull;
 
@@ -17,6 +19,7 @@ import androidx.annotation.NonNull;
  */
 public class PianoRoomCourseStudentListAdapter extends BaseQuickAdapter<PianoRoomCourseInfoBean.StudentHomeworkListBean.RecordsBean, BaseViewHolder> {
     public static final int HOMEWORK_STATUS_IS_OK = 1;//已提交作业
+    private int mDecorateHomework;
 
     public PianoRoomCourseStudentListAdapter(int layoutResId) {
         super(layoutResId);
@@ -30,8 +33,19 @@ public class PianoRoomCourseStudentListAdapter extends BaseQuickAdapter<PianoRoo
         //名称
         holder.setText(R.id.tv_name, data.studentName);
         //subjectName
-        holder.setText(R.id.tv_course_name, data.subjectName);
+        if(TextUtils.isEmpty(data.subjectName)){
+            holder.setGone(R.id.tv_course_name,true);
+        }else {
+            holder.setVisible(R.id.tv_course_name,true);
+            holder.setText(R.id.tv_course_name, data.subjectName);
+        }
         TextView tv_submit_tip = holder.getView(R.id.tv_submit_tip);
+        if(mDecorateHomework == CourseConstants.COURSE_HOMEWORK_SET){
+            //布置了作业
+            tv_submit_tip.setVisibility(View.VISIBLE);
+        } else {
+            tv_submit_tip.setVisibility(View.GONE);
+        }
         if (data.submitHomework == HOMEWORK_STATUS_IS_OK) {
             tv_submit_tip.setText("已提交");
             tv_submit_tip.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.color_666666));
@@ -40,4 +54,8 @@ public class PianoRoomCourseStudentListAdapter extends BaseQuickAdapter<PianoRoo
             tv_submit_tip.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.color_999999));
         }
     }
+
+    public void setHomeWordStatus(int decorateHomework) {
+        mDecorateHomework = decorateHomework;
+    }
 }

teacher/src/main/java/com/cooleshow/teacher/bean/HomeCountBean.java

@@ -31,5 +31,9 @@ public class HomeCountBean {
      * 我收到的评价
      */
     public int studentReplied;
+    /**
+     * 琴房时间
+     */
+    public int pianoTime;
 
 }

teacher/src/main/java/com/cooleshow/teacher/ui/course/MineLiveCourseFragment.java

@@ -51,11 +51,11 @@ public class MineLiveCourseFragment extends BaseMVPFragment<FragmentMineLiveCour
 
                 break;
             case R.id.tv_open:
-                if (mViewBinding.tvOpen.getText().toString().equals("去认证")){
+                if (mViewBinding.tvOpen.getText().toString().equals("去认证")) {
                     ARouter.getInstance().build(RouterPath.WebCenter.ACTIVITY_HTML)
                             .withString(WebConstants.WEB_URL, WebConstants.TEACHER_CERT)
                             .navigation();
-                }else if (mViewBinding.tvOpen.getText().toString().equals("立即开通")){
+                } else if (mViewBinding.tvOpen.getText().toString().equals("立即开通")) {
                     ARouter.getInstance()
                             .build(RouterPath.WebCenter.ACTIVITY_HTML)
                             .withString(WebConstants.WEB_URL, WebConstants.TEACHER_OPEN_LIVE)
@@ -215,14 +215,14 @@ public class MineLiveCourseFragment extends BaseMVPFragment<FragmentMineLiveCour
             mViewBinding.tvOpen.setVisibility(View.GONE);
         } else if (TextUtils.equals(teacherUserInfo.entryStatus, TeacherInfoConstants.ENTRY_STATUS_PASS)) {
             //入驻审核通过
-            if (teacherUserInfo.liveFlag==0){
+            if (teacherUserInfo.liveFlag == 0) {
                 //是否有直播权限 0 否 1 是
                 mViewBinding.refreshLayout.setVisibility(View.GONE);
                 mViewBinding.clEmptyLiveFlag.setVisibility(View.VISIBLE);
-                mViewBinding.tvEmptyHint.setText("您尚未开通直播服务\\n开通后即可创建直播课程");
+                mViewBinding.tvEmptyHint.setText("您尚未开通直播服务\n开通后即可创建直播课程");
                 mViewBinding.tvOpen.setVisibility(View.VISIBLE);
                 mViewBinding.tvOpen.setText("立即开通");
-            }else{
+            } else {
                 mViewBinding.refreshLayout.setVisibility(View.VISIBLE);
                 mViewBinding.clEmptyLiveFlag.setVisibility(View.GONE);
                 currentPage = 1;

teacher/src/main/java/com/cooleshow/teacher/ui/course/PianoRoomCourseDetailActivity.java

@@ -165,6 +165,7 @@ public class PianoRoomCourseDetailActivity extends BaseMVPActivity<ActivityPiano
      */
     private void handleStudentList(PianoRoomCourseInfoBean infoBean) {
         if (mAdapter != null && infoBean != null && infoBean.studentHomeworkList != null) {
+            mAdapter.setHomeWordStatus(infoBean.decorateHomework);
             List<PianoRoomCourseInfoBean.StudentHomeworkListBean.RecordsBean> records = infoBean.studentHomeworkList.records;
             if (records != null && records.size() > 0) {
                 mAdapter.setNewInstance(records);

teacher/src/main/java/com/cooleshow/teacher/ui/main/HomeFragment.kt

@@ -216,7 +216,7 @@ class HomeFragment : BaseMVPFragment<FragmentHomeLayoutBinding, HomePresenter>()
             mViewBinding.tvMineMusicSheetCount.text = "共" + data.musicSheet + "支\n乐谱"
             mViewBinding.tvMineAssessCount.text = "本周收到\n" + data.studentReplied + "个评价"
             mViewBinding.tvMineIncomeCount.text = "本月收入\n" + data.decimal + "元"
-            mViewBinding.tvMineKotofusaCount.text="剩余\n"+"0分钟"
+            mViewBinding.tvMineKotofusaCount.text="剩余\n"+data.pianoTime + "分钟"
         }
     }
 

teacher/src/main/res/layout/activity_piano_room_detail_layout.xml

@@ -247,7 +247,6 @@
                 android:id="@+id/recyclerView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
                 android:overScrollMode="never"
                 android:scrollbars="horizontal" />
         </LinearLayout>

teacher/src/main/res/layout/item_piano_room_student_layout.xml

@@ -5,6 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@drawable/bg_white_10dp"
+    android:layout_marginTop="@dimen/dp_10"
     android:paddingStart="12dp"
     android:paddingTop="14dp"
     android:paddingBottom="14dp">

teacher/src/main/res/raw/charles.pem

@@ -0,0 +1,26 @@
+-----BEGIN CERTIFICATE-----
+MIIFOjCCBCKgAwIBAgIGAXthWyM4MA0GCSqGSIb3DQEBCwUAMIGhMTIwMAYDVQQDDClDaGFybGVz
+IFByb3h5IENBICgyMCBBdWcgMjAyMSwgbG9jYWxob3N0KTElMCMGA1UECwwcaHR0cHM6Ly9jaGFy
+bGVzcHJveHkuY29tL3NzbDERMA8GA1UECgwIWEs3MiBMdGQxETAPBgNVBAcMCEF1Y2tsYW5kMREw
+DwYDVQQIDAhBdWNrbGFuZDELMAkGA1UEBhMCTlowHhcNMjEwODE5MDIxOTI3WhcNMjIwODE5MDIx
+OTI3WjCBoTEyMDAGA1UEAwwpQ2hhcmxlcyBQcm94eSBDQSAoMjAgQXVnIDIwMjEsIGxvY2FsaG9z
+dCkxJTAjBgNVBAsMHGh0dHBzOi8vY2hhcmxlc3Byb3h5LmNvbS9zc2wxETAPBgNVBAoMCFhLNzIg
+THRkMREwDwYDVQQHDAhBdWNrbGFuZDERMA8GA1UECAwIQXVja2xhbmQxCzAJBgNVBAYTAk5aMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAorS8avaN1OvnRWRW0osqM/cN/5c0aaSlt766
+B3XQ6PbGLTIAl+ril3bxttYmySFDsxW/NGO970HONy86gzciJoZLC8A+tjFpJEZoyvG2e9PYyVux
+bnjmEY2AomYUTZPNkUrIZe/Ey1MhgRIdL2iiuPWhKwzSV69PVg9bZ+TH9A0zq8eBITwCZPTo+73n
+PaDf5tV3rqkHN0ua+mT8+yk6ZVEQCCDsov3FFvoYgK6TtiGFwRDd59F4EdSpxl3oTkfvOtG+5Qxd
+B4/AckQFB6YMnEZBUJJReHvKCxddRagdaMqBopidf+u8RvburXClzX916tups3A3SlOKTzkgdHaL
+hwIDAQABo4IBdDCCAXAwDwYDVR0TAQH/BAUwAwEB/zCCASwGCWCGSAGG+EIBDQSCAR0TggEZVGhp
+cyBSb290IGNlcnRpZmljYXRlIHdhcyBnZW5lcmF0ZWQgYnkgQ2hhcmxlcyBQcm94eSBmb3IgU1NM
+IFByb3h5aW5nLiBJZiB0aGlzIGNlcnRpZmljYXRlIGlzIHBhcnQgb2YgYSBjZXJ0aWZpY2F0ZSBj
+aGFpbiwgdGhpcyBtZWFucyB0aGF0IHlvdSdyZSBicm93c2luZyB0aHJvdWdoIENoYXJsZXMgUHJv
+eHkgd2l0aCBTU0wgUHJveHlpbmcgZW5hYmxlZCBmb3IgdGhpcyB3ZWJzaXRlLiBQbGVhc2Ugc2Vl
+IGh0dHA6Ly9jaGFybGVzcHJveHkuY29tL3NzbCBmb3IgbW9yZSBpbmZvcm1hdGlvbi4wDgYDVR0P
+AQH/BAQDAgIEMB0GA1UdDgQWBBTFDUHefpPwiOUWlyr+SBAeDs21EzANBgkqhkiG9w0BAQsFAAOC
+AQEAOr130q4wZ1qMP/G8Heggfdb8YX/OeBS2WxPgvVKKr+BJ8RF3WkUTPxLYvC0DTo5r3ER/7hYu
+j9xTbVGRu+SKhLEIsZQwLkLOAPRiJqzn6oGYg6+E02u4o8vRvapW0h8hRF1YuIfCclRUEXF4WBj0
+ly5A977zzxBC8sK78UNgbh8HO9aGCikk0YU9HkdxDo2gyfLpaHJMDTovoFJnhGcybN/I90eDBzwV
+koFrcyPJPV5Y8g5tMd4pUmxL64kuBxdcMTSecGuQhtc3DDYUT/NCz6FJEUCUzGPnWlpoBNcJmHmH
+sNtfyR8DJUqrYf5ER3/B4l5MsWKUUX5IypHHnhLs6Q==
+-----END CERTIFICATE-----

teacher/src/main/res/xml/network_security_config.xml

@@ -5,7 +5,9 @@
         <trust-anchors>
             <!-- Trust user added CAs while debuggable only -->
             <certificates src="user" />
+            <certificates src="@raw/charles"/>
         </trust-anchors>
+
     </debug-overrides>
     <!--<domain-config-->
         <!--cleartextTrafficPermitted="true"-->