修改老师端首页认证弹窗进度条样式,增加下架曲谱二次确认弹窗

BaseLibrary/src/main/res/drawable/progress_bar_4877ff_4dp.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- solid指定形状的填充色，只有android:color一个属性 -->
+    <solid android:color="@color/color_4877ff" />
+    <!-- padding设置内容区域离边界的间距 -->
+    <!-- corners设置圆角，只适用于rectangle -->
+    <corners
+        android:bottomLeftRadius="4dp"
+        android:topLeftRadius="4dp"
+        android:bottomRightRadius="4dp"
+        android:topRightRadius="4dp"/>
+</shape>

teacher/src/main/java/com/cooleshow/teacher/ui/main/NewHomeFragment.java

@@ -440,6 +440,15 @@ public class NewHomeFragment extends BaseMVPFragment<FragmentNewHomeLayoutBindin
         //VIP
         mViewBinding.ivVip.setImageResource(teacherUserInfo.isVip == 0 ? com.cooleshow.base.R.drawable.icon_vip_enable : com.cooleshow.base.R.drawable.icon_vip_able);
         //入驻状态
+        if (isEnableForBadge(teacherUserInfo.tag, TeacherInfoConstants.DEGREE) && isEnableForBadge(teacherUserInfo.tag, TeacherInfoConstants.TEACHER)) {
+            mViewBinding.viewCertRedPoint.setVisibility(View.GONE);
+        } else {
+            if (TextUtils.equals(teacherUserInfo.entryStatus, TeacherInfoConstants.ENTRY_STATUS_PASS)) {
+                mViewBinding.viewCertRedPoint.setVisibility(View.VISIBLE);
+            } else {
+                mViewBinding.viewCertRedPoint.setVisibility(View.GONE);
+            }
+        }
         this.entryStatus = teacherUserInfo.entryStatus;
         if (TextUtils.equals(teacherUserInfo.entryStatus, TeacherInfoConstants.ENTRY_STATUS_DOING)) {
             //入驻审核中
@@ -457,11 +466,6 @@ public class NewHomeFragment extends BaseMVPFragment<FragmentNewHomeLayoutBindin
     }
 
     private void handleBadgeUI(String tag) {
-        if (isEnableForBadge(tag, TeacherInfoConstants.DEGREE) && isEnableForBadge(tag, TeacherInfoConstants.TEACHER)) {
-            mViewBinding.viewCertRedPoint.setVisibility(View.GONE);
-        } else {
-            mViewBinding.viewCertRedPoint.setVisibility(View.VISIBLE);
-        }
         int badgeAbleCount = 0;
         boolean enableStyleBadge = isEnableForBadge(tag, STYLE_TYPE);
         if (enableStyleBadge) {

teacher/src/main/java/com/cooleshow/teacher/ui/score/MineScoreFragment.java

@@ -23,6 +23,8 @@ import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.fragment.BaseMVPFragment;
 import com.cooleshow.base.utils.UiUtils;
 import com.cooleshow.base.utils.helper.WebStartHelper;
+import com.cooleshow.base.widgets.dialog.CommonConfirmDialog;
+import com.cooleshow.base.widgets.dialog.CommonDialog;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.adapter.MineScoreAdapter;
 import com.cooleshow.teacher.bean.MusicSheetListBean;
@@ -167,10 +169,9 @@ public class MineScoreFragment extends BaseMVPFragment<FragmentMineScoreBinding,
                     if (UiUtils.isFastClick()) {
                         return;
                     }
-                    //下架
                     if (position < mineScoreAdapter.getData().size()) {
                         MusicSheetListBean.RowsBean rowsBean = mineScoreAdapter.getData().get(position);
-                        presenter.takeDownMusicSheet(rowsBean.id);
+                        showConfirmDialog(rowsBean.id);
                     }
                 }
             }
@@ -178,6 +179,31 @@ public class MineScoreFragment extends BaseMVPFragment<FragmentMineScoreBinding,
 
     }
 
+    private void showConfirmDialog(String musicSheetId) {
+        CommonDialog commonDialog = new CommonDialog(getContext());
+        commonDialog.show();
+        commonDialog.setTitle("提示");
+        commonDialog.setContent("确认下架该曲谱吗?");
+        commonDialog.setOnConfirmClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (commonDialog != null) {
+                    commonDialog.dismiss();
+                }
+                //下架
+                presenter.takeDownMusicSheet(musicSheetId);
+            }
+        });
+        commonDialog.setOnCancelClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (commonDialog != null) {
+                    commonDialog.dismiss();
+                }
+            }
+        });
+    }
+
     private int currentPage;
 
     @Override

teacher/src/main/res/drawable/shape_home_cert_progress_drawable.xml

@@ -9,11 +9,16 @@
         </shape>
     </item>
     <item android:id="@android:id/progress">
-        <clip>
-            <shape>
-                <corners android:radius="4dip" />
-                <solid android:color="@color/color_4877ff"/>
-            </shape>
-        </clip>
+<!--        <clip>-->
+<!--            <shape>-->
+<!--                <corners android:radius="4dip" />-->
+<!--                <solid android:color="@color/color_4877ff"/>-->
+<!--            </shape>-->
+<!--        </clip>-->
+
+        <!--
+   -->
+        <scale android:scaleWidth="100%"
+            android:drawable="@drawable/progress_bar_4877ff_4dp"/>
     </item>
 </layer-list>