刘朕 / security-android · 提交

转到一个项目

作者 liyan
提交 a6bc152d88f808d8ac90b1a33b9276ae27be2e17 1 个父辈 98e13beb

解决合并冲突2

内嵌 并排对比
正在显示 10 个修改的文件 包含 141 行增加 和 6 行删除
... ... @@ -132,6 +132,7 @@
<activity android:name=".ui.mine.activity.ComplaintsAndSuggestionsActivity"/>
<activity android:name=".ui.mine.activity.ComplaintsAndSuggestionsSuccessActivity"/>
<activity android:name=".ui.mine.activity.ClassDutyActivity"/>
<activity android:name=".ui.mine.activity.SignInActivity"/>
</application>
... ...
... ... @@ -13,6 +13,7 @@ class OfflineExerciseActivity :
BaseLifeCycleActivity<OfflineExerciseViewModel, ActivityOfflineExerciseBinding>(
ActivityOfflineExerciseBinding::inflate
) {
override fun initDataObserver() {
}
... ...
package com.br_technology.securitytrain_master.ui.mine.activity
import com.br_technology.securitytrain_master.databinding.ActivitySignInBinding
import com.br_technology.securitytrain_master.ui.mine.viewmodel.SignInViewModel
import com.wjx.android.wanandroidmvvm.base.view.BaseLifeCycleActivity
/**
* Time: 8/3/2021 15:44
* Author: Captain
* Description: 初见时你很迷人
*/
class SignInActivity :
BaseLifeCycleActivity<SignInViewModel, ActivitySignInBinding>(ActivitySignInBinding::inflate) {
override fun initDataObserver() {
}
override fun initData() {
super.initData()
binding.apply {
}
}
}
\ No newline at end of file
... ...
package com.br_technology.securitytrain_master.ui.mine.repository
import androidx.lifecycle.MutableLiveData
import com.br_technology.securitytrain_master.base.common.State
import com.wjx.android.wanandroidmvvm.base.repository.ApiRepository
/**
... ... @@ -7,5 +9,5 @@ import com.wjx.android.wanandroidmvvm.base.repository.ApiRepository
* Author: Captain
* Description: 初见时你很迷人
*/
class ComplaintsAndSuggestionsSuccessRepository : ApiRepository() {
class ComplaintsAndSuggestionsSuccessRepository(val loadState: MutableLiveData<State>) : ApiRepository() {
}
\ No newline at end of file
... ...
package com.br_technology.securitytrain_master.ui.mine.repository
import androidx.lifecycle.MutableLiveData
import com.br_technology.securitytrain_master.base.common.State
import com.wjx.android.wanandroidmvvm.base.repository.ApiRepository
/**
* Time: 8/3/2021 15:45
* Author: Captain
* Description: 初见时你很迷人
*/
class SignInRepository(val loadState: MutableLiveData<State>) : ApiRepository() {
}
\ No newline at end of file
... ...
package com.br_technology.securitytrain_master.ui.mine.viewmodel
import com.br_technology.securitytrain_master.ui.mine.repository.SignInRepository
import com.wjx.android.wanandroidmvvm.base.viewmodel.BaseViewModel
/**
* Time: 8/3/2021 15:45
* Author: Captain
* Description: 初见时你很迷人
*/
class SignInViewModel : BaseViewModel<SignInRepository>() {
}
\ No newline at end of file
... ...
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
android:layout_height="match_parent">
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
<include layout="@layout/layout_tool_bar" />
<com.br_technology.securitytrain_master.view.ViewToolBar
android:id="@+id/tool_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/status_bar"
android:visibility="visible"
app:toolTitle="课程详情" />
<com.br_technology.securitytrain_master.view.MyVideoPlayer
android:id="@+id/video_player"
android:layout_width="match_parent"
android:layout_height="210dp"
android:layout_below="@id/tool_bar" />
<com.google.android.material.tabs.TabLayout
android:id="@+id/tab_layout"
style="@style/SearchTab"
android:layout_width="match_parent"
android:layout_height="?actionBarSize"
android:layout_below="@id/video_player"
android:overScrollMode="never"
app:tabMode="auto"
app:tabSelectedTextColor="@color/color_252"
app:tabTextColor="@color/color_96" />
<androidx.viewpager.widget.ViewPager
android:id="@+id/view_pager"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/tab_layout" />
</RelativeLayout>
\ No newline at end of file
... ...
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white">
<include
android:id="@+id/include"
layout="@layout/layout_tool_bar" />
<com.br_technology.securitytrain_master.view.ViewToolBar
android:id="@+id/tool_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/include"
app:toolTitle="签到" />
<!--地图/>-->
<LinearLayout
android:layout_width="140dp"
android:layout_height="140dp"
android:layout_centerInParent="true"
android:background="@mipmap/sign_in_bg"
android:orientation="vertical">
<TextView
android:text="签到"
android:textSize="16sp"
android:textColor="@color/white"
android:layout_marginTop="38dp"
android:layout_gravity="center_horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<TextView
android:text="08:30"
android:textSize="24sp"
android:textColor="@color/white"
android:layout_gravity="center_horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</LinearLayout>
</RelativeLayout>
\ No newline at end of file
... ...
... ... @@ -20,7 +20,7 @@
<ProgressBar
android:id="@+id/pr_upload_value"
style="@android:style/Widget.ProgressBar.Horizontal"
android:layout_width="229dp"
android:layout_width="210dp"
android:layout_height="20dp"
android:layout_gravity="center_vertical"
android:max="100"
... ...