修改样式问题

BaseLibrary/src/main/java/com/cooleshow/base/ui/activity/BaseActivity.java

@@ -109,9 +109,9 @@ public abstract class BaseActivity<V extends ViewBinding> extends RxAppCompatAct
         }
     }
 
-    public void setLoadingStyle(Drawable drawable, int contentTestSize){
+    public void setLoadingStyle(Drawable drawable, int contentTestSize,int textColor){
         if (mLoading != null) {
-            mLoading.setLoadingStyle(drawable,contentTestSize);
+            mLoading.setLoadingStyle(drawable,contentTestSize,textColor);
         }
     }
 

BaseLibrary/src/main/java/com/cooleshow/base/widgets/ProgressLoading2.java

@@ -108,12 +108,13 @@ public class ProgressLoading2 extends BaseFullDialog {
         }
     }
 
-    public void setLoadingStyle(Drawable drawable, int contentTestSize){
+    public void setLoadingStyle(Drawable drawable, int contentTestSize,int textColor){
         if (mLlContent != null) {
             mLlContent.setBackground(drawable);
         }
         if (mTvLoadingText != null) {
             mTvLoadingText.setTextSize(contentTestSize);
+            mTvLoadingText.setTextColor(textColor);
         }
     }
 }

accompanySDK/src/main/java/com/daya/accompanysdk/widget/CustomDelayCheckView.java

@@ -92,7 +92,7 @@ public class CustomDelayCheckView extends BaseDelayCheckView {
         super.initData();
 
         mCenterAnim = ObjectAnimator.ofFloat(mIvCenter, "translationY", 0f, 24f);
-        mCenterAnim.setDuration(2000);
+        mCenterAnim.setDuration(1000);
         mCenterAnim.setRepeatCount(ValueAnimator.INFINITE);
         mCenterAnim.setInterpolator(new LinearInterpolator());
         mCenterAnim.setRepeatMode(ValueAnimator.REVERSE);

accompanySDK/src/main/res/drawable/shape_b3000000_19dp.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="19dp"/>
+    <solid android:color="#b3000000"/>
+</shape>

accompanySDK/src/main/res/layout/ac_custom_delay_check_layout.xml

@@ -136,7 +136,7 @@
         android:layout_width="wrap_content"
         android:layout_height="38dp"
         android:layout_marginTop="24dp"
-        android:background="@drawable/acc_shape_70000000_19dp"
+        android:background="@drawable/shape_b3000000_19dp"
         android:gravity="center_vertical"
         android:orientation="horizontal"
         android:paddingStart="11dp"
@@ -170,7 +170,7 @@
             android:paddingEnd="10dp"
             android:text="我知道了"
             android:textColor="@color/color_2cb99e"
-            android:textSize="@dimen/sp_14" />
+            android:textSize="@dimen/sp_12" />
 
     </LinearLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>

accompanySDK/src/main/res/layout/accompany_permissions_popu2.xml

@@ -72,10 +72,10 @@
             app:layout_constraintTop_toTopOf="@id/iv_content_bg" />
 
         <View
-            android:layout_marginTop="7dp"
+            android:layout_marginBottom="8dp"
             app:layout_constraintLeft_toLeftOf="@+id/iv_top"
             android:id="@+id/view_help"
-            app:layout_constraintTop_toBottomOf="@+id/iv_top"
+            app:layout_constraintBottom_toBottomOf="@+id/iv_top"
             android:layout_width="1px"
             android:layout_height="1px"/>
 
@@ -84,12 +84,14 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="17dp"
+            app:layout_constraintHorizontal_chainStyle="packed"
             app:layout_constraintRight_toLeftOf="@+id/btn_commit"
             android:src="@drawable/icon_no_permission_cancel_bg"
             app:layout_constraintLeft_toLeftOf="@+id/iv_top"
             app:layout_constraintBottom_toTopOf="@+id/view_help" />
 
         <ImageView
+            android:layout_marginStart="11dp"
             android:id="@+id/btn_commit"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"

musicMerge/src/main/java/com/cooleshow/musicmerge/ui/MusicHandleActivity_.java

@@ -286,7 +286,7 @@ public class MusicHandleActivity_ extends BaseMVPActivity<AcMusicHandleLayoutBin
     private void showAssetsLoading() {
         showLoadingAndCancel(getString(R.string.mh_loading_str));
         setLoadingCancelable(false);
-//        setLoadingStyle(getResources().getDrawable(R.drawable.mh_shape_loading_bg), 16);
+        setLoadingStyle(getResources().getDrawable(R.drawable.mh_shape_loading_bg), 16,getResources().getColor(com.cooleshow.base.R.color.white));
     }
 
 
@@ -1696,7 +1696,7 @@ public class MusicHandleActivity_ extends BaseMVPActivity<AcMusicHandleLayoutBin
         commonConfirmDialog.show();
         commonConfirmDialog.setIsCanCel(false);
         commonConfirmDialog.setTitle("温馨提示");
-        commonConfirmDialog.setContent("已成功保存到草稿，草稿7天未发布将自动删除。");
+        commonConfirmDialog.setContent("已成功保存到草稿，草稿7天内未发布将自动删除。");
         commonConfirmDialog.setCancelText("我知道了");
         commonConfirmDialog.setConfirmText("查看草稿");
         commonConfirmDialog.setOnCancelClickListener(new View.OnClickListener() {

musicMerge/src/main/java/com/cooleshow/musicmerge/ui/work/MyWorkActivity.java

@@ -1,6 +1,7 @@
 package com.cooleshow.musicmerge.ui.work;
 
 import android.content.Intent;
+import android.graphics.Typeface;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -85,6 +86,32 @@ public class MyWorkActivity extends BaseMVPActivity<AcMyWorkLayoutBinding, MyWor
                 changeEditBt(position == 1);
             }
         });
+
+        viewBinding.tabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
+            @Override
+            public void onTabSelected(TabLayout.Tab tab) {
+                if (tab != null && tab.getCustomView() != null) {
+                    View customView = tab.getCustomView();
+                    TextView tv_text = customView.findViewById(R.id.tv_text);
+                    tv_text.setTextColor(getResources().getColor(com.cooleshow.base.R.color.color_333333));
+                    tv_text.setTypeface(Typeface.defaultFromStyle(Typeface.BOLD));
+                }
+            }
+
+            @Override
+            public void onTabUnselected(TabLayout.Tab tab) {
+                if (tab != null && tab.getCustomView() != null) {
+                    View customView = tab.getCustomView();
+                    TextView tv_text = customView.findViewById(R.id.tv_text);
+                    tv_text.setTextColor(getResources().getColor(com.cooleshow.base.R.color.color_666666));
+                    tv_text.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));
+                }
+            }
+
+            @Override
+            public void onTabReselected(TabLayout.Tab tab) {
+            }
+        });
     }
 
     private void changeEditBt(boolean isSelectDraft) {

musicMerge/src/main/res/drawable/mh_shape_loading_bg.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/transparent" />
+</shape>