运单相关页面

mylibrary/build.gradle

@@ -7,29 +7,29 @@ plugins {
 android {
     compileSdkVersion rootProject.ext.android["compileSdkVersion"]
 
-//    defaultConfig {
-//        minSdkVersion rootProject.ext.android["minSdkVersion"]
-//        targetSdkVersion rootProject.ext.android["targetSdkVersion"]
-//        versionCode rootProject.ext.android["versionCode"]
-//        versionName rootProject.ext.android["versionName"]
-//
-//        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-//        consumerProguardFiles "consumer-rules.pro"
-//    }
+    defaultConfig {
+        minSdkVersion rootProject.ext.android["minSdkVersion"]
+        targetSdkVersion rootProject.ext.android["targetSdkVersion"]
+        versionCode rootProject.ext.android["versionCode"]
+        versionName rootProject.ext.android["versionName"]
 
-//    buildTypes {
-//        release {
-//            minifyEnabled false
-//            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-//        }
-//    }
-//    compileOptions {
-//        sourceCompatibility JavaVersion.VERSION_11
-//        targetCompatibility JavaVersion.VERSION_11
-//    }
-//    kotlinOptions {
-//        jvmTarget = '11'
-//    }
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles "consumer-rules.pro"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = '11'
+    }
 }
 
 dependencies {

mylibrary/src/main/java/com/dahe/mylibrary/base/BaseActivity.java

@@ -180,6 +180,7 @@ public abstract class BaseActivity<VB extends ViewBinding> extends AppCompatActi
     @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
     protected void setTitleBar(String title, View.OnClickListener listener, boolean isVisible, String right, View.OnClickListener rightListener) {
         mToolbar = (Toolbar) findViewById(R.id.common_toolbar);
+        mToolbar.setBackgroundColor(Color.TRANSPARENT);
         if (!TextUtils.isEmpty(title))
             ((TextView) findViewById(R.id.common_toolBar_title)).setText(title);
         TextView mTextRight = (TextView) findViewById(R.id.common_toolBar_text_right);

mylibrary/src/main/res/layout/common_toolbar.xml

@@ -29,7 +29,7 @@
         android:layout_gravity="right"
         android:layout_marginRight="10dp"
         android:gravity="center"
-        android:textColor="@color/white"
+        android:textColor="@color/black"
         android:textSize="@dimen/text_14sp"
         android:visibility="gone" />