修改样式问题

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

@@ -115,6 +115,12 @@ public abstract class BaseActivity<V extends ViewBinding> extends RxAppCompatAct
         }
     }
 
+    public void updateDimAmount(float dimAmount) {
+        if (mLoading != null) {
+            mLoading.updateDimAmount(dimAmount);
+        }
+    }
+
     @Override
     public void hideLoading() {
         if (mLoading != null) {

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

@@ -7,6 +7,7 @@ import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.view.Gravity;
 import android.view.View;
+import android.view.Window;
 import android.view.WindowManager;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
@@ -108,7 +109,7 @@ public class ProgressLoading2 extends BaseFullDialog {
         }
     }
 
-    public void setLoadingStyle(Drawable drawable, int contentTestSize,int textColor){
+    public void setLoadingStyle(Drawable drawable, int contentTestSize, int textColor) {
         if (mLlContent != null) {
             mLlContent.setBackground(drawable);
         }
@@ -117,4 +118,14 @@ public class ProgressLoading2 extends BaseFullDialog {
             mTvLoadingText.setTextColor(textColor);
         }
     }
+
+    public void updateDimAmount(float dimAmount) {
+        Window window = getWindow();
+        if (window != null) {
+            WindowManager.LayoutParams attributes = window.getAttributes();
+            attributes.gravity = Gravity.CENTER;
+            attributes.dimAmount = dimAmount;
+            window.setAttributes(attributes);
+        }
+    }
 }

BaseLibrary/src/main/res/values/styles.xml

@@ -24,8 +24,7 @@
         <item name="android:windowIsFloating">true</item>
         <item name="android:windowContentOverlay">@null</item>
         <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
-        <item name="android:windowSoftInputMode">stateUnspecified|adjustPan
-        </item>
+        <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
     </style>
 
     <style name="LightProgressDialog" parent="@style/LightDialog">

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

@@ -75,16 +75,17 @@ public class CustomDelayCheckView extends BaseDelayCheckView {
 
     private void fitPad() {
         boolean isTablet = QMUIDeviceHelper.isTablet(getContext());
-//        ConstraintSet constraintSet =new ConstraintSet();
-//        constraintSet.clone(mCsRoot);
-//        constraintSet.connect(R.id.iv_center,ConstraintSet.TOP, R.id.iv_tip, ConstraintSet.BOTTOM);
-//        constraintSet.connect(R.id.iv_center,ConstraintSet.LEFT, ConstraintSet.PARENT_ID, ConstraintSet.LEFT);
-//        constraintSet.connect(R.id.iv_center,ConstraintSet.RIGHT, ConstraintSet.PARENT_ID, ConstraintSet.RIGHT);
-//        if(isTablet){
-//            constraintSet.connect(R.id.iv_center,ConstraintSet.BOTTOM, ConstraintSet.PARENT_ID, ConstraintSet.BOTTOM);
-//            constraintSet.setMargin(R.id.iv_tip,ConstraintSet.TOP, SizeUtils.dp2px(50));
-//        }
-//        constraintSet.applyTo(mCsRoot);
+        ConstraintSet constraintSet =new ConstraintSet();
+        constraintSet.clone(mCsRoot);
+        constraintSet.connect(R.id.iv_center,ConstraintSet.TOP,ConstraintSet.PARENT_ID, ConstraintSet.TOP);
+        constraintSet.connect(R.id.iv_center,ConstraintSet.LEFT, ConstraintSet.PARENT_ID, ConstraintSet.LEFT);
+        constraintSet.connect(R.id.iv_center,ConstraintSet.RIGHT, ConstraintSet.PARENT_ID, ConstraintSet.RIGHT);
+        if(isTablet){
+            constraintSet.connect(R.id.iv_center,ConstraintSet.BOTTOM, R.id.iv_tip, ConstraintSet.TOP);
+        }else{
+            constraintSet.setMargin(R.id.iv_center,ConstraintSet.TOP, SizeUtils.dp2px(6));
+        }
+        constraintSet.applyTo(mCsRoot);
     }
 
     @Override

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

@@ -120,6 +120,7 @@
 
 
     <ImageView
+        android:layout_marginTop="6dp"
         android:id="@+id/iv_center"
         android:layout_width="0dp"
         android:layout_height="wrap_content"

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

@@ -177,17 +177,17 @@ public class MusicHandleActivity_ extends BaseMVPActivity<AcMusicHandleLayoutBin
         if (!TextUtils.isEmpty(musicSheetId)) {
             //本地文件模式
             boolean isVideo = MyFileUtils.isVideo(recordFilePath);
-            initMusicScoreFragment(musicSheetId, this.musicRenderType,isVideo);
+            initMusicScoreFragment(musicSheetId, this.musicRenderType, isVideo);
         }
     }
 
-    private void initMusicScoreFragment(String musicId, String musicRenderType,boolean isVideo) {
+    private void initMusicScoreFragment(String musicId, String musicRenderType, boolean isVideo) {
         if (mMusicScoreFragment == null) {
             mMusicScoreFragment = new MusicScoreFragment();
             Bundle bundle = new Bundle();
-            if(isVideo){
+            if (isVideo) {
                 viewBinding.flMusicScoreContainer.setBackgroundResource(R.drawable.shape_mh_music_score_bg);
-            }else{
+            } else {
                 viewBinding.flMusicScoreContainer.setBackgroundColor(Color.TRANSPARENT);
             }
             bundle.putString(WEB_URL, createUrl(musicId, musicRenderType));
@@ -199,7 +199,7 @@ public class MusicHandleActivity_ extends BaseMVPActivity<AcMusicHandleLayoutBin
     private String createUrl(String musicId, String musicRenderType) {
         //五线谱：staff、简谱：firstTone、固定音高：fixedTone
 //        return "https://dev.kt.colexiu.com/instrument/#/simple-detail?id=1001728&musicRenderType=staff";
-        return WebStartHelper.getWorksMusicScoreUrl(musicId, musicRenderType,String.valueOf(partIndex), isVideo);
+        return WebStartHelper.getWorksMusicScoreUrl(musicId, musicRenderType, String.valueOf(partIndex), isVideo);
     }
 
     private void initSurfaceView() {
@@ -286,7 +286,8 @@ 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,getResources().getColor(com.cooleshow.base.R.color.white));
+        updateDimAmount(0.7f);
+        setLoadingStyle(getResources().getDrawable(R.drawable.mh_shape_loading_bg), 16, getResources().getColor(com.cooleshow.base.R.color.white));
     }
 
 
@@ -898,7 +899,7 @@ public class MusicHandleActivity_ extends BaseMVPActivity<AcMusicHandleLayoutBin
                         }
                         if (currentPosition >= getAudioTotalDuration()) {
                             handleCompletedStatus();
-                        }else{
+                        } else {
                             setRecordProgress(currentPosition);
                         }
                     }
@@ -994,7 +995,7 @@ public class MusicHandleActivity_ extends BaseMVPActivity<AcMusicHandleLayoutBin
         long cu = getAudioPlayer().getPlayProgress();
         long cu1 = player2.getCu();
         int delayValue = getDelayValue();
-        long expectPlayer2Delay = cu1- delayValue;
+        long expectPlayer2Delay = cu1 - delayValue;
         long dif = cu - expectPlayer2Delay;
         String text = "演奏进度:" + cu + "\n视频进度:" + expectPlayer2Delay + "\n差值:" + dif;
         viewBinding.tvDelayText.setText(text);
@@ -1295,8 +1296,8 @@ public class MusicHandleActivity_ extends BaseMVPActivity<AcMusicHandleLayoutBin
     @Override
     public void onClick(View v) {
         int id = v.getId();
-        if(UiUtils.isFastClick(300)){
-            return ;
+        if (UiUtils.isFastClick(300)) {
+            return;
         }
         if (id == R.id.iv_play) {
             if (isPlaying()) {
@@ -1335,7 +1336,7 @@ public class MusicHandleActivity_ extends BaseMVPActivity<AcMusicHandleLayoutBin
     /**
      * 对齐一次视频播放器
      */
-    private void aligningVideoPlayer(){
+    private void aligningVideoPlayer() {
         long cu = getAudioPlayer().getPlayProgress();
         int seekResult2 = countAccompanyPosition(cu);
         LOG.i("pq", "seekResult2:" + seekResult2);
@@ -1629,7 +1630,7 @@ public class MusicHandleActivity_ extends BaseMVPActivity<AcMusicHandleLayoutBin
             accompanyUrl = data.getAccompanyUrl();
             boolean isVideo = MyFileUtils.isVideoFromUrl(data.getVideoUrl());
             MusicMergeConfigBean musicMergeConfigBean = toApplyConfig(jsonConfig);
-            initMusicScoreFragment(data.getMusicSheetId(), musicMergeConfigBean.getMusicRenderType(),isVideo);
+            initMusicScoreFragment(data.getMusicSheetId(), musicMergeConfigBean.getMusicRenderType(), isVideo);
             if (mSettingFragment != null) {
                 mSettingFragment.applyConfig(musicMergeConfigBean);
                 mSettingFragment.setAccompanyUrl(accompanyUrl, accompanyPlaySpeed);
@@ -1653,7 +1654,7 @@ public class MusicHandleActivity_ extends BaseMVPActivity<AcMusicHandleLayoutBin
             mSettingFragment.applyConfig(musicMergeConfigBean);
             accompanyPlaySpeed = musicMergeConfigBean.getSpeedRate();
             this.musicRenderType = musicMergeConfigBean.getMusicRenderType();
-            this.partIndex=musicMergeConfigBean.getPartIndex();
+            this.partIndex = musicMergeConfigBean.getPartIndex();
             return musicMergeConfigBean;
         } catch (Exception e) {
             e.printStackTrace();