Jelajahi Sumber

1.修改首页UI

王鹏鹏 2 tahun lalu
induk
melakukan
91e667dd76

+ 1 - 1
app/src/main/java/com/yingyangfly/MainActivity.kt

@@ -11,7 +11,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         if (AccountConfig.SINGLE_MODULE.not()) {
-            JumpUtil.jumpActivity(RouterUrlCommon.home)
+            JumpUtil.jumpActivity(RouterUrlCommon.login)
             finish()
         }
         super.onCreate(savedInstanceState)

+ 10 - 3
home/src/main/res/layout/activity_home.xml

@@ -176,21 +176,28 @@
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
-        <androidx.constraintlayout.widget.ConstraintLayout
+        <androidx.cardview.widget.CardView
             android:id="@+id/leftLayout"
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:layout_marginStart="@dimen/divider_40px"
             android:layout_marginTop="@dimen/divider_55px"
             android:layout_marginBottom="@dimen/divider_48px"
-            android:background="@android:color/black"
+            app:cardCornerRadius="@dimen/divider_28px"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintHorizontal_weight="1"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toLeftOf="@id/rightLayout"
             app:layout_constraintTop_toBottomOf="@+id/titleLayout">
 
-        </androidx.constraintlayout.widget.ConstraintLayout>
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+        </androidx.cardview.widget.CardView>
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/rightLayout"

+ 1 - 0
workbenches/src/main/java/com/yingyang/workbenches/freetraining/FreeTrainActivity.kt

@@ -101,6 +101,7 @@ class FreeTrainActivity : BaseMVVMActivity<ActivityFreeTrainBinding, FreeTrainVi
         viewModel.getFreeTrainList(type, fail = {
             it.toast()
         }, success = {
+            freeTrainList.clear()
             if (it != null) {
                 freeTrainList.addAll(it)
             }

+ 1 - 0
workbenches/src/main/java/com/yingyang/workbenches/leisurebrain/LeisureBrainActivity.kt

@@ -107,6 +107,7 @@ class LeisureBrainActivity :
         viewModel.getSelectAllVideo(videoType, fail = {
             it.toast()
         }, success = {
+            leisureBrainList.clear()
             if (it.isNullOrEmpty().not()) {
                 leisureBrainList.addAll(it)
             }

+ 1 - 0
workbenches/src/main/java/com/yingyang/workbenches/orderlist/OrderListActivity.kt

@@ -36,6 +36,7 @@ class OrderListActivity : BaseMVVMActivity<ActivityOrderListBinding, OrderListVi
         viewModel.getOrderList(fail = {
             it.toast()
         }, success = {
+            orderListList.clear()
             if (it.isNullOrEmpty().not()) {
                 orderListList.addAll(it)
             }

+ 1 - 4
workbenches/src/main/java/com/yingyang/workbenches/servicepackage/ServicePackageActivity.kt

@@ -35,10 +35,6 @@ class ServicePackageActivity :
     private var servicePackageList = mutableListOf<PackageInfoBean>()
     private val servicePackageListAdapter by lazy { ServicePackageListAdapter() }
 
-    private val PERIOD: Long = 10 * 1000
-    private val DELAY = 100
-    private var mDisposable: Disposable? = null
-
     override fun initViews() {
         binding {
             rvTrainingPackage.layoutManager = GridLayoutManager(this@ServicePackageActivity, 3)
@@ -107,6 +103,7 @@ class ServicePackageActivity :
         viewModel.getServicePackageList(packageType, fail = {
             it.toast()
         }, success = {
+            servicePackageList.clear()
             if (it.isNullOrEmpty().not()) {
                 servicePackageList.addAll(it)
             }

+ 1 - 0
workbenches/src/main/java/com/yingyang/workbenches/traincontent/TrainContentFragment.kt

@@ -84,6 +84,7 @@ class TrainContentFragment :
         viewModel.findMyTask(treatmentId, fail = {
             it.toast()
         }, success = {
+            trainContentBeanList.clear()
             if (it.isNullOrEmpty().not()) {
                 trainContentBeanList.addAll(it)
             }