diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ad45347..efc6232 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -454,6 +454,10 @@ android:label="@string/coordinate_system" android:screenOrientation="portrait" android:windowSoftInputMode="adjustResize|stateHidden" /> + \ No newline at end of file diff --git a/app/src/main/java/com/project/survey/ui/home/AboutActivity.kt b/app/src/main/java/com/project/survey/ui/home/AboutActivity.kt new file mode 100644 index 0000000..7f4da92 --- /dev/null +++ b/app/src/main/java/com/project/survey/ui/home/AboutActivity.kt @@ -0,0 +1,34 @@ +package com.project.survey.ui.home + +import blankj.utilcode.util.AppUtils +import com.project.survey.R +import com.project.survey.databinding.ActivityAboutBinding +import com.project.survey.ui.base.BaseBindingActivity +import com.project.survey.util.ActivityNavUtil + +/** + * 关于 + */ +class AboutActivity : BaseBindingActivity() { + + companion object { + fun start() { + ActivityNavUtil.startActivity {} + } + } + + override fun getBinding() = ActivityAboutBinding.inflate(layoutInflater) + + override fun initView() { + immersionToolbar(mBinding.toolbar, R.string.about) + } + + override fun initData() { + mBinding.tvVersion.text = "工程测量综合管理系统 V${AppUtils.getAppVersionName()}" + } + + override fun initListener() { + + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/project/survey/ui/home/MeFragment.kt b/app/src/main/java/com/project/survey/ui/home/MeFragment.kt index f3f146c..a65be47 100644 --- a/app/src/main/java/com/project/survey/ui/home/MeFragment.kt +++ b/app/src/main/java/com/project/survey/ui/home/MeFragment.kt @@ -17,6 +17,7 @@ import com.project.survey.logic.viewmodel.MainViewModel import com.project.survey.model.ProjectBean import com.project.survey.ui.MainActivity import com.project.survey.ui.base.BaseBindingFragment +import com.project.survey.ui.login.ForgetPwdInputCodeActivity import com.project.survey.ui.login.LoginActivity import com.project.survey.ui.project.ProjectListActivity import com.project.survey.util.ActivityNavUtil @@ -79,9 +80,12 @@ class MeFragment : BaseBindingFragment() { mBinding.llSwitchProject.setOnClickNoRepeatListener { ProjectListActivity.start() } - // TODO: + mBinding.llChangePwd.setOnClickNoRepeatListener { + ForgetPwdInputCodeActivity.start() + } + // 关于 mBinding.llAbout.setOnClickNoRepeatListener { -// viewModel.sendSMS("17379748209") + AboutActivity.start() } } } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml new file mode 100644 index 0000000..366d516 --- /dev/null +++ b/app/src/main/res/layout/activity_about.xml @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/buildSrc/src/main/java/com/bingce/kotlin/com/bingce/SurveyorVersionUtils.kt b/buildSrc/src/main/java/com/bingce/kotlin/com/bingce/SurveyorVersionUtils.kt index d01fe43..00496f6 100644 --- a/buildSrc/src/main/java/com/bingce/kotlin/com/bingce/SurveyorVersionUtils.kt +++ b/buildSrc/src/main/java/com/bingce/kotlin/com/bingce/SurveyorVersionUtils.kt @@ -18,7 +18,8 @@ class SurveyorVersionUtils(project: Project) { val second = cale.get(Calendar.SECOND); versionCode = (year - 2000) * 100000 + month * 1000 + day * 10 - versionName = "" + (year - 2010) + "." + month + "." + day + "." + hour + "." + minute +// versionName = "" + (year - 2010) + "." + month + "." + day + "." + hour + "." + minute + versionName = "1.0." + String.format("%02d%02d", month, day) //检测mapping folder val properties = ConfigProperties(project)