Browse Source

1.去掉calendarview module

王鹏鹏 2 years ago
parent
commit
9a13940f5e

+ 2 - 2
app/build.gradle

@@ -58,7 +58,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             signingConfig signingConfigs.debug
             debuggable true
-            resValue "string", "app_name", "鹰扬科技dev"
+            resValue "string", "app_name", "未来海豚认知平台dev"
             manifestPlaceholders = [ENVIRONMENT: "appdebug",
                                     app_icon   : "@mipmap/ic_launcher", package_name: appId]
         }
@@ -69,7 +69,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             signingConfig signingConfigs.release
             debuggable true
-            resValue "string", "app_name", "鹰扬科技"
+            resValue "string", "app_name", "未来海豚认知平台"
             manifestPlaceholders = [ENVIRONMENT: "appdebug",
                                     app_icon   : "@mipmap/ic_launcher", package_name: appId]
         }

+ 2 - 1
workbenches/src/main/java/com/yingyang/workbenches/entity/PackageInfoBean.kt

@@ -12,5 +12,6 @@ data class PackageInfoBean(
     val packageName: String,
     val packageType: String,
     val price: String,
-    val updateTime: String
+    val updateTime: String,
+    val priceYUAN: String
 )

+ 1 - 1
workbenches/src/main/res/layout/item_service_package_list.xml

@@ -36,7 +36,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/divider_29px"
             android:gravity="center"
-            android:text='@{data.price+"元"}'
+            android:text='@{data.price + data.priceYUAN}'
             android:textColor="@color/color_FFC46D40"
             android:textSize="@dimen/divider_48px"
             app:layout_constraintLeft_toLeftOf="parent"