更新qmui

app/build.gradle

@@ -11,6 +11,7 @@ android {
         versionCode rootProject.ext.versionCode
         versionName rootProject.ext.versionName
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
+        multiDexEnabled true
     }
     buildTypes {
         release {
@@ -71,8 +72,11 @@ dependencies {
 
     // QMUI框架 link: http://qmuiteam.com/android
     // 本App 搭建的基础框架，基本使用控件功能请看官网的功能列表
-    implementation 'com.qmuiteam:qmui:1.2.0'
-    implementation 'com.qmuiteam:arch:0.3.1'
+//    implementation 'com.qmuiteam:qmui:1.2.0'
+//    implementation 'com.qmuiteam:arch:0.3.1'
+//    implementation 'com.qmuiteam:qmui:1.2.0'
+    implementation 'com.qmuiteam:arch:2.0.0-alpha10'
+    implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
 
     // RecyclerAdapter框架
     implementation 'com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.46'

app/src/main/java/com/bonait/bnframework/common/utils/UpdateAppUtils.java

@@ -73,10 +73,23 @@ public class UpdateAppUtils {
      */
     private static void doPost(final Context context) {
         VersionMode mode=new VersionMode();
-        mode.productCode="1668085292913659904";
-        mode.moduleCode="naichaji";
-        mode.serverCode="1668175205545807872";
-        mode.branchCode="1668801915890962433";
+        //大炒
+        mode.productCode="1679306986915368960";
+        mode.moduleCode="dcdjbbd";
+        mode.serverCode="1680766359592243200";
+        mode.branchCode="1679308856555737089";
+
+        //小炒网络v版本
+//        mode.productCode="1679306986915368960";
+//        mode.moduleCode="xcapp";
+//        mode.serverCode="1680766359592243200";
+//        mode.branchCode="1679307408505835521";
+
+        //小炒单击
+//        mode.productCode="1679306986915368960";
+//        mode.moduleCode="xcdjbbd";
+//        mode.serverCode="1680766359592243200";
+//        mode.branchCode="1679308917918404609";
         String msg= new Json<VersionMode>().objectToJson(VersionMode.class, mode);
         String getNewVersionUrl =ConfigName.getInstance().UpdateVersion;
         MediaType JSON = MediaType.parse("application/json; charset=utf-8");
@@ -90,7 +103,7 @@ public class UpdateAppUtils {
                         ResVersion version= response.body();
                         if (version != null && version.data!=null) {
                             serviceVersionCode = version.data.versionNo;
-                            description = version.data.description;
+                            description = version.data.description==null?"暂无描述":version.data.description;
                             //获取apk下载地址
                             downloadUrl = version.data.downloadLink;
                             // 判断Apk是否是最新版本
@@ -101,6 +114,9 @@ public class UpdateAppUtils {
                                 ToastUtils.info("当前版本已是最新版本");
                             }
 
+                        }else
+                        {
+                            ToastUtils.info("服务器没有版本");
                         }
                     }
                 });

app/src/main/java/com/bonait/bnframework/common/view/QMAutoDialogBuilderView.java

@@ -1,6 +1,8 @@
 package com.bonait.bnframework.common.view;
 
 import android.content.Context;
+
+import androidx.annotation.NonNull;
 import androidx.core.content.ContextCompat;
 import android.view.View;
 import android.view.ViewGroup;
@@ -28,19 +30,15 @@ public class QMAutoDialogBuilderView extends QMUIDialog.AutoResizeDialogBuilder
         mContext = context;
     }
 
-    public EditText getEditText() {
-        return mEditText;
-    }
-
     @Override
-    public View onBuildContent(QMUIDialog dialog, ScrollView parent) {
+    public View onBuildContent(@NonNull QMUIDialog dialog, @NonNull Context context) {
         LinearLayout layout = new LinearLayout(mContext);
         layout.setOrientation(LinearLayout.VERTICAL);
         layout.setLayoutParams(new ScrollView.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
         int padding = QMUIDisplayHelper.dp2px(mContext, 20);
         layout.setPadding(padding, padding, padding, padding);
         mEditText = new EditText(mContext);
-        QMUIViewHelper.setBackgroundKeepingPadding(mEditText, QMUIResHelper.getAttrDrawable(mContext, R.attr.qmui_list_item_bg_with_border_bottom));
+        QMUIViewHelper.setBackgroundKeepingPadding(mEditText, QMUIResHelper.getAttrDrawable(mContext, R.attr.qmui_border_color));
         mEditText.setHint("输入框");
         LinearLayout.LayoutParams editTextLP = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, QMUIDisplayHelper.dpToPx(50));
         editTextLP.bottomMargin = QMUIDisplayHelper.dp2px(mContext, 15);
@@ -57,4 +55,9 @@ public class QMAutoDialogBuilderView extends QMUIDialog.AutoResizeDialogBuilder
         layout.addView(textView);
         return layout;
     }
+
+    public EditText getEditText() {
+        return mEditText;
+    }
+
 }

app/src/main/java/com/bonait/bnframework/modules/home/activity/BottomNavigationActivity.java

@@ -7,6 +7,8 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentTransaction;
 import androidx.core.content.ContextCompat;
 import androidx.viewpager.widget.ViewPager;
+
+import android.view.Gravity;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.ViewGroup;
@@ -21,8 +23,10 @@ import com.bonait.bnframework.modules.mine.fragment.MyFragment;
 import com.lzy.okgo.OkGo;
 import com.qmuiteam.qmui.util.QMUIResHelper;
 import com.qmuiteam.qmui.widget.QMUIPagerAdapter;
-import com.qmuiteam.qmui.widget.QMUITabSegment;
 import com.qmuiteam.qmui.widget.QMUIViewPager;
+import com.qmuiteam.qmui.widget.tab.QMUITab;
+import com.qmuiteam.qmui.widget.tab.QMUITabBuilder;
+import com.qmuiteam.qmui.widget.tab.QMUITabSegment;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -55,27 +59,26 @@ public class BottomNavigationActivity extends BaseActivity {
      * 初始化tab
      * */
     private void initTabs() {
-        int normalColor = QMUIResHelper.getAttrColor(context, R.attr.qmui_config_color_gray_6);
-        int selectColor = QMUIResHelper.getAttrColor(context, R.attr.qmui_config_color_blue);
-        mTabSegment.setDefaultNormalColor(normalColor);
-        mTabSegment.setDefaultSelectedColor(selectColor);
-
-        QMUITabSegment.Tab home = new QMUITabSegment.Tab(
-                ContextCompat.getDrawable(context, R.mipmap.icon_tabbar_component),
-                ContextCompat.getDrawable(context, R.mipmap.icon_tabbar_component_selected),
-                "主页", false
-        );
-
-        QMUITabSegment.Tab Lab = new QMUITabSegment.Tab(
-                ContextCompat.getDrawable(context, R.mipmap.icon_tabbar_util),
-                ContextCompat.getDrawable(context, R.mipmap.icon_tabbar_util_selected),
-                "烹饪", false
-        );
-        QMUITabSegment.Tab My = new QMUITabSegment.Tab(
-                ContextCompat.getDrawable(context, R.mipmap.icon_tabbar_lab),
-                ContextCompat.getDrawable(context, R.mipmap.icon_tabbar_lab_selected),
-                "我的", false
-        );
+//        int normalColor = QMUIResHelper.getAttrColor(context, R.attr.qmui_config_color_gray_6);
+//        int selectColor = QMUIResHelper.getAttrColor(context, R.attr.qmui_config_color_blue);
+//        mTabSegment.setDefaultNormalColor(normalColor);
+//        mTabSegment.setDefaultSelectedColor(selectColor);
+        QMUITabBuilder tabBuilder =mTabSegment.tabBuilder().setGravity(Gravity.CENTER);
+        QMUITab home = tabBuilder
+                .setNormalDrawable(ContextCompat.getDrawable(context, R.mipmap.icon_tabbar_component))
+                .setSelectedDrawable(ContextCompat.getDrawable(context, R.mipmap.icon_tabbar_component_selected))
+                .setText("主页")
+                .build(context);
+        QMUITab Lab = tabBuilder
+                .setNormalDrawable(ContextCompat.getDrawable(context, R.mipmap.icon_tabbar_component))
+                .setSelectedDrawable(ContextCompat.getDrawable(context, R.mipmap.icon_tabbar_component_selected))
+                .setText("烹饪")
+                .build(context);
+        QMUITab My = tabBuilder
+                .setNormalDrawable(ContextCompat.getDrawable(context, R.mipmap.icon_tabbar_component))
+                .setSelectedDrawable(ContextCompat.getDrawable(context, R.mipmap.icon_tabbar_component_selected))
+                .setText("我的")
+                .build(context);
         mTabSegment.addTab(home)
                 .addTab(Lab)
                 .addTab(My);

app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/QDSectionHeaderView.java

@@ -29,12 +29,12 @@ public class QDSectionHeaderView extends LinearLayout {
         super(context, attrs);
         setOrientation(LinearLayout.HORIZONTAL);
         setGravity(Gravity.CENTER_VERTICAL);
-        setBackgroundColor(Color.WHITE);
+        setBackgroundColor(Color.parseColor("#DEE0E2"));         //   android:background="@drawable/qmui_list_item_bg_with_border_bottom"
         int paddingHor = QMUIDisplayHelper.dp2px(context, 24);
         mTitleTv = new TextView(getContext());
         mTitleTv.setTextSize(16);
         mTitleTv.setTextColor(Color.BLACK);
-        mTitleTv.setPadding(paddingHor, 0, paddingHor, 0);
+        mTitleTv.setPadding(paddingHor, 10, paddingHor, 0);
         addView(mTitleTv, new LinearLayout.LayoutParams(
                 0, ViewGroup.LayoutParams.WRAP_CONTENT, 1f));
         mArrowView = new AppCompatImageView(context);

app/src/main/res/drawable/qmui_list_item_bg_with_border_bottom.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Tencent is pleased to support the open source community by making QMUI_Android available.
+
+ Copyright (C) 2017-2018 THL A29 Limited, a Tencent company. All rights reserved.
+
+ Licensed under the MIT License (the "License"); you may not use this file except in
+ compliance with the License. You may obtain a copy of the License at
+
+ http://opensource.org/licenses/MIT
+
+ Unless required by applicable law or agreed to in writing, software distributed under the License is
+ distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ either express or implied. See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:drawable="@color/qmui_drawable_color_list_separator"/>
+    <item android:drawable="@color/qmui_config_color_white" android:bottom="@dimen/qmui_list_divider_height"/>
+</layer-list>

app/src/main/res/drawable/qmui_list_item_bg_with_border_top.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Tencent is pleased to support the open source community by making QMUI_Android available.
+
+ Copyright (C) 2017-2018 THL A29 Limited, a Tencent company. All rights reserved.
+
+ Licensed under the MIT License (the "License"); you may not use this file except in
+ compliance with the License. You may obtain a copy of the License at
+
+ http://opensource.org/licenses/MIT
+
+ Unless required by applicable law or agreed to in writing, software distributed under the License is
+ distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ either express or implied. See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:drawable="@color/qmui_drawable_color_list_separator"/>
+    <item android:drawable="@color/qmui_config_color_white" android:top="@dimen/qmui_list_divider_height"/>
+</layer-list>

app/src/main/res/layout/activity_bottom_navigation.xml

@@ -14,10 +14,12 @@
         android:layout_marginBottom="@dimen/home_tab_height"
         android:fitsSystemWindows="true"/>
 
-    <com.qmuiteam.qmui.widget.QMUITabSegment
+    <com.qmuiteam.qmui.widget.tab.QMUITabSegment
         android:id="@+id/main_tabs"
         android:layout_gravity="bottom"
-        android:background="?attr/qmui_list_item_bg_with_border_top"
+        android:background="@color/qmui_config_color_white"
+        app:qmui_bottomDividerColor="?attr/qmui_skin_support_color_separator"
+        app:qmui_bottomDividerHeight="1px"
         android:textSize="12sp"
         app:qmui_tab_icon_position="top"
         android:layout_width="match_parent"

app/src/main/res/layout/activity_bottom_navigation2.xml

@@ -20,7 +20,7 @@
         android:layout_width="match_parent"
         android:layout_height="@dimen/home_tab_height"
         android:layout_gravity="bottom"
-        android:background="?attr/qmui_list_item_bg_with_border_top"
+        android:background="@drawable/qmui_list_item_bg_with_border_top"
         app:itemHorizontalTranslationEnabled="false"
         app:labelVisibilityMode="labeled"
         app:menu="@menu/navigation" />

app/src/main/res/layout/activity_cp.xml

@@ -11,7 +11,11 @@
     <com.qmuiteam.qmui.widget.QMUITopBar
         android:id="@+id/topbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/qmui_topbar_height"/>
+        android:layout_height="?attr/qmui_topbar_height"
+        android:fitsSystemWindows="true"
+        app:qmui_layout_collapseMode="pin"
+        android:background="@color/qmui_config_color_transparent"
+        app:qmui_bottomDividerHeight="0px"/>
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"

app/src/main/res/layout/activity_cpxz.xml

@@ -11,7 +11,11 @@
     <com.qmuiteam.qmui.widget.QMUITopBar
         android:id="@+id/topbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/qmui_topbar_height"/>
+        android:layout_height="?attr/qmui_topbar_height"
+        android:fitsSystemWindows="true"
+        app:qmui_layout_collapseMode="pin"
+        android:background="@color/qmui_config_color_transparent"
+        app:qmui_bottomDividerHeight="0px"/>
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"

app/src/main/res/layout/activity_diy.xml

@@ -7,11 +7,16 @@
     tools:context=".modules.home.fragment.from.DiyActivity"
     android:orientation="vertical"
     android:background="@color/app_color_blue"
-    android:fitsSystemWindows="true">
+    android:fitsSystemWindows="true"
+    app:qmui_skin_background="?attr/app_skin_common_background">
     <com.qmuiteam.qmui.widget.QMUITopBar
         android:id="@+id/topbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/qmui_topbar_height"/>
+        android:layout_height="?attr/qmui_topbar_height"
+        android:fitsSystemWindows="true"
+        app:qmui_layout_collapseMode="pin"
+        android:background="@color/qmui_config_color_transparent"
+        app:qmui_bottomDividerHeight="0px"/>
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"

app/src/main/res/layout/activity_diy_update.xml

@@ -11,7 +11,11 @@
     <com.qmuiteam.qmui.widget.QMUITopBar
         android:id="@+id/topbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/qmui_topbar_height"/>
+        android:layout_height="?attr/qmui_topbar_height"
+        android:fitsSystemWindows="true"
+        app:qmui_layout_collapseMode="pin"
+        android:background="@color/qmui_config_color_transparent"
+        app:qmui_bottomDividerHeight="0px"/>
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"

app/src/main/res/layout/activity_file.xml

@@ -9,7 +9,11 @@
     <com.qmuiteam.qmui.widget.QMUITopBar
         android:id="@+id/topbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/qmui_topbar_height"/>
+        android:layout_height="?attr/qmui_topbar_height"
+        android:fitsSystemWindows="true"
+        app:qmui_layout_collapseMode="pin"
+        android:background="@color/qmui_config_color_transparent"
+        app:qmui_bottomDividerHeight="0px"/>
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

app/src/main/res/layout/activity_image_choose.xml

@@ -11,13 +11,16 @@
     <com.qmuiteam.qmui.widget.QMUITopBar
         android:id="@+id/topbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/qmui_topbar_height"/>
+        android:layout_height="?attr/qmui_topbar_height"
+        android:fitsSystemWindows="true"
+        app:qmui_layout_collapseMode="pin"
+        android:background="@color/qmui_config_color_transparent"
+        app:qmui_bottomDividerHeight="0px"/>
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/activity_background">
         <RelativeLayout
-            android:padding="5dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
             <androidx.recyclerview.widget.RecyclerView

app/src/main/res/layout/activity_notice.xml

@@ -11,7 +11,11 @@ android:orientation="vertical">
 <com.qmuiteam.qmui.widget.QMUITopBar
     android:id="@+id/topbar"
     android:layout_width="match_parent"
-    android:layout_height="?attr/qmui_topbar_height"/>
+    android:layout_height="?attr/qmui_topbar_height"
+    android:fitsSystemWindows="true"
+    app:qmui_layout_collapseMode="pin"
+    android:background="@color/qmui_config_color_transparent"
+    app:qmui_bottomDividerHeight="0px"/>
 <ScrollView
     android:layout_width="match_parent"
     android:layout_height="match_parent"

app/src/main/res/layout/activity_sz.xml

@@ -11,7 +11,11 @@
     <com.qmuiteam.qmui.widget.QMUITopBar
         android:id="@+id/topbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/qmui_topbar_height"/>
+        android:layout_height="?attr/qmui_topbar_height"
+        android:fitsSystemWindows="true"
+        app:qmui_layout_collapseMode="pin"
+        android:background="@color/qmui_config_color_transparent"
+        app:qmui_bottomDividerHeight="0px"/>
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -22,7 +26,7 @@
             android:layout_width="match_parent"
             android:layout_height="@dimen/home_tab_height"
             android:layout_gravity="bottom"
-            android:background="?attr/qmui_list_item_bg_with_border_bottom"
+            android:background="@drawable/qmui_list_item_bg_with_border_bottom"
             app:itemHorizontalTranslationEnabled="false"
             app:labelVisibilityMode="labeled"
             app:menu="@menu/system" />

app/src/main/res/layout/activity_wh.xml

@@ -10,7 +10,11 @@
     <com.qmuiteam.qmui.widget.QMUITopBar
         android:id="@+id/topbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/qmui_topbar_height"/>
+        android:layout_height="?attr/qmui_topbar_height"
+        android:fitsSystemWindows="true"
+        app:qmui_layout_collapseMode="pin"
+        android:background="@color/qmui_config_color_transparent"
+        app:qmui_bottomDividerHeight="0px"/>
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -22,7 +26,8 @@
             android:layout_width="match_parent"
             android:layout_height="55dp"
             android:layout_gravity="top"
-            android:background="?attr/qmui_list_item_bg_with_border_bottom"
+            android:background="@drawable/qmui_list_item_bg_with_border_bottom"
+
             app:itemHorizontalTranslationEnabled="false"
             app:labelVisibilityMode="labeled"
             app:menu="@menu/maintenance"/>

app/src/main/res/layout/fragment_home1.xml

@@ -12,7 +12,11 @@ android:orientation="vertical">
 <com.qmuiteam.qmui.widget.QMUITopBar
     android:id="@+id/topbar"
     android:layout_width="match_parent"
-    android:layout_height="?attr/qmui_topbar_height"/>
+    android:layout_height="?attr/qmui_topbar_height"
+    android:fitsSystemWindows="true"
+    app:qmui_layout_collapseMode="pin"
+    android:background="@color/qmui_config_color_transparent"
+    app:qmui_bottomDividerHeight="0px"/>
 
 <ScrollView
     android:layout_width="match_parent"

app/src/main/res/layout/fragment_home2.xml

@@ -4,7 +4,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/qmui_config_color_white">
+    android:background="@color/qmui_config_color_white"
+    app:qmui_skin_background="?attr/app_skin_common_background">
 
     <com.qmuiteam.qmui.widget.QMUIAppBarLayout
         android:layout_width="match_parent"
@@ -39,8 +40,8 @@
                 android:layout_height="?attr/qmui_topbar_height"
                 android:fitsSystemWindows="true"
                 app:qmui_layout_collapseMode="pin"
-                app:qmui_topbar_bg_color="@color/qmui_config_color_transparent"
-                app:qmui_topbar_need_separator="false"/>
+                android:background="@color/qmui_config_color_transparent"
+                app:qmui_bottomDividerHeight="0px"/>
         </com.qmuiteam.qmui.widget.QMUICollapsingTopBarLayout>
     </com.qmuiteam.qmui.widget.QMUIAppBarLayout>
 

app/src/main/res/values/dimens.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <resources>
-    <dimen name="home_tab_height">49dp</dimen>
+    <dimen name="home_tab_height">56dp</dimen>
     <dimen name="common_content_spacing">@dimen/qmui_content_spacing_horizontal</dimen>
 
     <!-- ListView -->

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

@@ -21,9 +21,9 @@
 
         <!-- 配置qmui提供的theme -->
         <item name="qmui_config_color_blue">@color/app_color_blue</item>
-        <item name="qmui_round_btn_bg_color">@color/s_btn_blue_bg</item>
-        <item name="qmui_round_btn_border_color">@color/s_btn_blue_border</item>
-        <item name="qmui_round_btn_text_color">@color/s_btn_blue_text</item>
+<!--        <item name="qmui_round_btn_bg_color">@color/s_btn_blue_bg</item>-->
+<!--        <item name="qmui_round_btn_border_color">@color/s_btn_blue_border</item>-->
+<!--        <item name="qmui_round_btn_text_color">@color/s_btn_blue_text</item>-->
         <item name="qmui_content_spacing_horizontal">20dp</item>
         <item name="qmui_content_padding_horizontal">@dimen/qmui_content_spacing_horizontal</item>
 
@@ -45,15 +45,13 @@
     <style name="QDtextAppearanceListItem">
         <item name="android:textColor">?attr/qmui_config_color_black</item>
         <item name="android:textSize">18sp</item>
-        <item name="android:background">?attr/qmui_s_list_item_bg_with_border_bottom_inset_left
-        </item>
+
     </style>
 
     <style name="QDTextAppearanceListItemSmall">
         <item name="android:textColor">?attr/qmui_config_color_gray_4</item>
         <item name="android:textSize">16sp</item>
-        <item name="android:background">?attr/qmui_s_list_item_bg_with_border_bottom_inset_left
-        </item>
+
     </style>
 
     <style name="QDCommonTitle">
@@ -75,7 +73,6 @@
     </style>
 
     <style name="QDTopBar" parent="QMUI.TopBar">
-        <item name="qmui_topbar_bg_color">?attr/app_primary_color</item>
         <item name="qmui_topbar_title_color">@color/qmui_config_color_white</item>
         <item name="qmui_topbar_subtitle_color">@color/qmui_config_color_white</item>
         <item name="qmui_topbar_text_btn_color_state_list">@color/s_topbar_btn_color</item>
@@ -83,16 +80,16 @@
         <item name="qmui_topbar_image_btn_height">48dp</item>
     </style>
 
-    <style name="QDRadiusButton" parent="@style/Button">
-        <item name="android:layout_height">40dp</item>
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:paddingLeft">?attr/qmui_content_spacing_horizontal</item>
-        <item name="android:paddingRight">?attr/qmui_content_spacing_horizontal</item>
-        <item name="android:background">@drawable/s_radius_button_bg</item>
-        <item name="android:textColor">@color/s_app_color_blue_2</item>
-        <item name="android:textSize">14sp</item>
-        <item name="android:gravity">center</item>
-    </style>
+<!--    <style name="QDRadiusButton" parent="@style/Button">-->
+<!--        <item name="android:layout_height">40dp</item>-->
+<!--        <item name="android:layout_width">wrap_content</item>-->
+<!--        <item name="android:paddingLeft">?attr/qmui_content_spacing_horizontal</item>-->
+<!--        <item name="android:paddingRight">?attr/qmui_content_spacing_horizontal</item>-->
+<!--        <item name="android:background">@drawable/s_radius_button_bg</item>-->
+<!--        <item name="android:textColor">@color/s_app_color_blue_2</item>-->
+<!--        <item name="android:textSize">14sp</item>-->
+<!--        <item name="android:gravity">center</item>-->
+<!--    </style>-->
 
     <style name="button_wrapper_style">
         <item name="android:layout_width">match_parent</item>
@@ -108,7 +105,7 @@
     </style>
 
     <style name="DialogTheme2" parent="QMUI.Dialog">
-        <item name="qmui_dialog_wrapper_style">@style/dialog_wrapper_style_63</item>
+        <item name="qmui_dialog_inset_hor">64dp</item>
         <item name="qmui_dialog_title_style">@style/DialogTheme2TitleStyle</item>
         <item name="qmui_dialog_action_container_style">@style/DialogTheme2ActionContainerStyle
         </item>
@@ -119,9 +116,8 @@
     </style>
 
     <style name="ReleaseDialogTheme" parent="DialogTheme2">
-        <item name="qmui_dialog_wrapper_style">@style/QMUI.Dialog.Wrapper</item>
+        <item name="qmui_dialog_inset_hor">40dp</item>
         <item name="qmui_dialog_message_content_style">@style/ReleaseMessageContentStyle</item>
-
     </style>
 
     <style name="dialog_wrapper_style_63">
@@ -146,7 +142,7 @@
         <item name="qmui_dialog_action_container_justify_content">stretch</item>
         <item name="qmui_dialog_action_height">56dp</item>
         <item name="qmui_dialog_action_space">8dp</item>
-        <item name="qmui_topDividerColor">?attr/qmui_config_color_separator</item>
+        <item name="qmui_topDividerColor">?attr/qmui_skin_support_color_separator</item>
         <item name="qmui_topDividerHeight">1px</item>
     </style>
 
@@ -177,7 +173,7 @@
         <item name="android:gravity">left</item>
     </style>
 
-    <style name="DialogTheme2MenuItemStyle" parent="@style/QMUI.Dialog_MenuItem">
+    <style name="DialogTheme2MenuItemStyle" parent="@style/QMUI.Dialog.MenuItem">
         <item name="android:textSize">16sp</item>
         <item name="android:textColor">?attr/qmui_config_color_gray_1</item>
         <item name="android:paddingLeft">32dp</item>

app/src/main/res/values/themes.xml

@@ -4,4 +4,23 @@
         <item name="fullscreenBackgroundColor">@color/light_blue_600</item>
         <item name="fullscreenTextColor">@color/light_blue_A200</item>
     </style>
+
+    <attr name="app_skin_common_background" format="color|reference" />
+    <attr name="app_skin_common_background_1" format="color|reference" />
+    <attr name="app_skin_common_img_tint_color" format="color|reference" />
+    <attr name="app_skin_home_text_color" format="color|reference" />
+    <attr name="app_skin_common_title_text_color" format="color|reference" />
+    <attr name="app_skin_common_desc_text_color" format="color|reference" />
+    <attr name="app_skin_btn_test_bg" format="color|reference" />
+    <attr name="app_skin_btn_test_border" format="color|reference" />
+    <attr name="app_skin_btn_test_bg_single" format="color|reference" />
+    <attr name="app_skin_btn_test_border_single" format="color|reference" />
+    <attr name="app_skin_progress_bar_bg_color" format="color|reference"/>
+    <attr name="app_skin_progress_bar_progress_color" format="color|reference"/>
+    <attr name="app_skin_progress_bar_text_color" format="color|reference"/>
+    <attr name="app_skin_span_normal_text_color" format="color"/>
+    <attr name="app_skin_span_pressed_text_color" format="color"/>
+    <attr name="app_skin_span_normal_bg_color" format="color"/>
+    <attr name="app_skin_span_pressed_bg_color" format="color"/>
+    <attr name="app_skin_alpha_test" format="float"/>
 </resources>

gradle.properties

@@ -14,4 +14,3 @@ org.gradle.jvmargs=-Xmx1536m
 android.useAndroidX=true
 android.enableJetifier=true
 
-