Browse Source

修改课件部分逻辑

Pq 2 năm trước cách đây
mục cha
commit
e004c1638f

+ 24 - 24
BaseLibrary/src/main/java/com/cooleshow/base/utils/helper/WebStartHelper.java

@@ -11,7 +11,7 @@ public class WebStartHelper {
     /**
      * 开启音乐人认证页面
      */
-    public static void startMusicPersonCertPage(){
+    public static void startMusicPersonCertPage() {
         ARouter.getInstance().build(RouterPath.WebCenter.ACTIVITY_HTML)
                 .withString(WebConstants.WEB_URL, WebConstants.TEACHER_MUSIC_PERSON_CERT)
                 .navigation();
@@ -20,7 +20,7 @@ public class WebStartHelper {
     /**
      * 开启达人认证页面
      */
-    public static void startCertPage(){
+    public static void startCertPage() {
         ARouter.getInstance().build(RouterPath.WebCenter.ACTIVITY_HTML)
                 .withString(WebConstants.WEB_URL, WebConstants.TEACHER_CERT)
                 .navigation();
@@ -29,7 +29,7 @@ public class WebStartHelper {
     /**
      * 开启上传乐谱页面
      */
-    public static void startUploadSheetMusicPage(){
+    public static void startUploadSheetMusicPage() {
         ARouter.getInstance().build(RouterPath.WebCenter.ACTIVITY_HTML)
                 .withString(WebConstants.WEB_URL, WebConstants.TEACHER_UPLOAD_SHEET_MUSIC)
                 .navigation();
@@ -40,7 +40,7 @@ public class WebStartHelper {
      * 打开曲谱详情页
      * * @param id
      */
-    public static void startAccompany(String id){
+    public static void startAccompany(String id) {
         ARouter.getInstance().build(RouterPath.WebCenter.ACTIVITY_ACCOMPANY_HTML)
                 .withString("url", String.format(WebConstants.SCORE_DETAIL_PAGE, id))
                 .withBoolean("isHideTitle", true)
@@ -53,7 +53,7 @@ public class WebStartHelper {
     /**
      * 打开用户协议页面
      */
-    public static void startUserPrivacy(){
+    public static void startUserPrivacy() {
         ARouter.getInstance()
                 .build(RouterPath.WebCenter.ACTIVITY_HTML)
                 .withString(WebConstants.WEB_URL, WebConstants.REGISTRATION_AGREEMENT)
@@ -63,7 +63,7 @@ public class WebStartHelper {
     /**
      * 打开隐私协议页面
      */
-    public static void startPrivacy(){
+    public static void startPrivacy() {
         ARouter.getInstance()
                 .build(RouterPath.WebCenter.ACTIVITY_HTML)
                 .withString(WebConstants.WEB_URL, WebConstants.PRIVACY_AGREEMENT)
@@ -73,7 +73,7 @@ public class WebStartHelper {
     /**
      * 打开交易记录页面
      */
-    public static void startTradeRecord(){
+    public static void startTradeRecord() {
         ARouter.getInstance()
                 .build(RouterPath.WebCenter.ACTIVITY_HTML)
                 .withString(WebConstants.WEB_URL, WebConstants.TRADE_RECORD_PAGE)
@@ -83,7 +83,7 @@ public class WebStartHelper {
     /**
      * 打开推广计划页面
      */
-    public static void startPromotePlanPage(){
+    public static void startPromotePlanPage() {
         ARouter.getInstance()
                 .build(RouterPath.WebCenter.ACTIVITY_HTML)
                 .withString(WebConstants.WEB_URL, WebConstants.PROMOTE_PLAN_PAGE)
@@ -93,7 +93,7 @@ public class WebStartHelper {
     /**
      * 热门专辑
      */
-    public static void startHotAlbum(){
+    public static void startHotAlbum() {
         ARouter.getInstance()
                 .build(RouterPath.WebCenter.ACTIVITY_HTML)
                 .withString(WebConstants.WEB_URL, WebConstants.STUDENT_MUSIC_ALBUM)
@@ -104,7 +104,7 @@ public class WebStartHelper {
      * 打开专辑详情页
      * @param id
      */
-    public static void startHotAlbumDetail(String id){
+    public static void startHotAlbumDetail(String id) {
         ARouter.getInstance()
                 .build(RouterPath.WebCenter.ACTIVITY_HTML)
                 .withString(WebConstants.WEB_URL, WebConstants.STUDENT_MUSIC_ALBUM_DETAIL + id)
@@ -114,7 +114,7 @@ public class WebStartHelper {
     /**
      * 热门曲目
      */
-    public static void startHotMusicSheetList(){
+    public static void startHotMusicSheetList() {
         ARouter.getInstance()
                 .build(RouterPath.WebCenter.ACTIVITY_HTML)
                 .withString(WebConstants.WEB_URL, WebConstants.HOT_MUSIC_SHEET_LIST)
@@ -124,7 +124,7 @@ public class WebStartHelper {
     /**
      * 热门曲目
      */
-    public static void startGoodMusicSheetList(){
+    public static void startGoodMusicSheetList() {
         ARouter.getInstance()
                 .build(RouterPath.WebCenter.ACTIVITY_HTML)
                 .withString(WebConstants.WEB_URL, WebConstants.GOOD_MUSIC_SHEET_LIST)
@@ -134,7 +134,7 @@ public class WebStartHelper {
     /**
      * 打开隐私协议页面
      */
-    public static void startSearch(){
+    public static void startSearch() {
         ARouter.getInstance()
                 .build(RouterPath.WebCenter.ACTIVITY_HTML)
                 .withString(WebConstants.WEB_URL, WebConstants.SEARCH_PAGE)
@@ -145,7 +145,7 @@ public class WebStartHelper {
     /**
      * 打开优惠券
      */
-    public  static void startCouponsPage(){
+    public static void startCouponsPage() {
         ARouter.getInstance()
                 .build(RouterPath.WebCenter.ACTIVITY_HTML)
                 .withString(WebConstants.WEB_URL, WebConstants.COUPONS_PAGE)
@@ -155,7 +155,7 @@ public class WebStartHelper {
     /**
      * 打开联系我们
      */
-    public  static void startContactUs(){
+    public static void startContactUs() {
         ARouter.getInstance()
                 .build(RouterPath.WebCenter.ACTIVITY_HTML)
                 .withString(WebConstants.WEB_URL, WebConstants.CONTACT_US_PAGE)
@@ -165,7 +165,7 @@ public class WebStartHelper {
     /**
      * 打开我的收藏(我的乐谱)
      */
-    public static void startMineFavorite(){
+    public static void startMineFavorite() {
         ARouter.getInstance()
                 .build(RouterPath.WebCenter.ACTIVITY_HTML)
                 .withString(WebConstants.WEB_URL, WebConstants.MINE_MUSIC_SHEET)
@@ -175,7 +175,7 @@ public class WebStartHelper {
     /**
      * 打开实名认证的协议地址
      */
-    public static void startCertProtocol(){
+    public static void startCertProtocol() {
         ARouter.getInstance()
                 .build(RouterPath.WebCenter.ACTIVITY_HTML)
                 .withString(WebConstants.WEB_URL, WebConstants.CERT_PROTOCOL_URL)
@@ -185,7 +185,7 @@ public class WebStartHelper {
     /**
      * 打开领奖地址
      */
-    public static void startAwardPage(){
+    public static void startAwardPage() {
         ARouter.getInstance()
                 .build(RouterPath.WebCenter.ACTIVITY_HTML)
                 .withString(WebConstants.WEB_URL, WebConstants.AWARD_URL)
@@ -196,7 +196,7 @@ public class WebStartHelper {
      * 打开老师个人主页
      * @param teacherId
      */
-    public static void startTeacherHomePage(String teacherId){
+    public static void startTeacherHomePage(String teacherId) {
         ARouter.getInstance()
                 .build(RouterPath.WebCenter.ACTIVITY_HTML)
                 .withString(WebConstants.WEB_URL, WebConstants.STUDENT_TEACHER_HOME + teacherId)
@@ -207,7 +207,7 @@ public class WebStartHelper {
      * 打开老师个人主页
      * @param
      */
-    public static void startMusicSheetDetail(String musicId){
+    public static void startMusicSheetDetail(String musicId) {
         ARouter.getInstance()
                 .build(RouterPath.WebCenter.ACTIVITY_HTML)
                 .withString(WebConstants.WEB_URL, WebConstants.MUSIC_SHEET_DETAIL + musicId)
@@ -218,10 +218,10 @@ public class WebStartHelper {
      * 打开目标主页
      * @param
      */
-    public static void startWeb(String url){
+    public static void startWeb(String url) {
         ARouter.getInstance()
                 .build(RouterPath.WebCenter.ACTIVITY_HTML)
-                .withString(WebConstants.WEB_URL,url)
+                .withString(WebConstants.WEB_URL, url)
                 .navigation();
     }
 
@@ -229,10 +229,10 @@ public class WebStartHelper {
      * 老师打开其他老师个人主页
      * @param targetTeacherId
      */
-    public static void startTeacherHomePageFromTeacher(String targetTeacherId){
+    public static void startTeacherHomePageFromTeacher(String targetTeacherId) {
         ARouter.getInstance()
                 .build(RouterPath.WebCenter.ACTIVITY_HTML)
-                .withString(WebConstants.WEB_URL,String.format(WebConstants.TEACHER_HOME_PAGE_FOR_TEACHER,targetTeacherId))
+                .withString(WebConstants.WEB_URL, String.format(WebConstants.TEACHER_HOME_PAGE_FOR_TEACHER, targetTeacherId))
                 .navigation();
     }
 }

+ 1 - 1
live_teaching/src/main/java/com/daya/live_teaching/repository/ClassRepository.java

@@ -960,7 +960,7 @@ public class ClassRepository extends BaseRepository {
         bodyMap.put("idAndName", searchStr);
         bodyMap.put("page", page);
         bodyMap.put("rows", Constants.DEFAULT_DATA_SIZE);
-        bodyMap.put("status", "1");//是否有效, 0:失效 1:有效
+        bodyMap.put("status", 1);//是否有效, 0:失效 1:有效
         sealClassService.getCoursewareList(RetrofitUtil.createJsonRequest(bodyMap))
                 .subscribeOn(Schedulers.newThread())
                 .observeOn(AndroidSchedulers.mainThread())

+ 4 - 4
teacher/src/main/java/com/cooleshow/teacher/adapter/CoursewareListAdapter.java

@@ -81,12 +81,12 @@ public class CoursewareListAdapter extends BaseQuickAdapter<CoursewareListBean.R
 
         holder.setText(R.id.tv_name, rowsBean.musicSheetName);
         View tv_failure = holder.getView(R.id.tv_failure);
-        if (TextUtils.equals(rowsBean.status, "0")) {
-            //失效
-            tv_failure.setVisibility(View.VISIBLE);
-        } else {
+        if (TextUtils.equals(rowsBean.status, "1")) {
             //有效
             tv_failure.setVisibility(View.GONE);
+        } else {
+            //失效
+            tv_failure.setVisibility(View.VISIBLE);
         }
 
         ImageView iv_check = holder.getView(R.id.iv_check);

+ 5 - 0
teacher/src/main/java/com/cooleshow/teacher/ui/mine/CoursewareListActivity.java

@@ -12,6 +12,7 @@ import com.cooleshow.base.constanst.Constants;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
+import com.cooleshow.base.utils.helper.WebStartHelper;
 import com.cooleshow.base.widgets.EmptyViewLayout;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.adapter.CoursewareListAdapter;
@@ -74,6 +75,10 @@ public class CoursewareListActivity extends BaseMVPActivity<ActivityCoursewareLi
             public void onItemClick(@NonNull BaseQuickAdapter<?, ?> adapter, @NonNull View view, int position) {
                 boolean selectMode = mListAdapter.isSelectMode();
                 if (!selectMode) {
+                    if (position < mListAdapter.getData().size()) {
+                        CoursewareListBean.RowsBean rowsBean = mListAdapter.getData().get(position);
+                        WebStartHelper.startMusicSheetDetail(String.valueOf(rowsBean.musicSheetId));
+                    }
                     return;
                 }
                 mListAdapter.setSelectPos(position);