From 7d57e01bfea2c7775b24527ab92aba1a728f8f3f Mon Sep 17 00:00:00 2001 From: chenglifeng Date: Sat, 14 Sep 2024 08:52:38 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E6=9E=84=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 5 +- .../com/project/survey/extend/FloatExt.kt | 19 + .../com/project/survey/extend/ToastExt.kt | 12 + .../java/com/project/survey/extend/ViewExt.kt | 27 ++ .../survey/logic/viewmodel/BaseViewModel.kt | 26 ++ .../survey/logic/viewmodel/LoginViewModel.kt | 14 + .../java/com/project/survey/network/Api.kt | 4 + .../project/survey/network/RetrofitClient.kt | 59 ++++ .../com/project/survey/ui/MainActivity.kt | 91 +++-- .../com/project/survey/ui/SplashActivity.kt | 7 +- .../survey/ui/base/BaseBindingActivity.kt | 35 +- .../survey/ui/base/BaseBindingFragment.kt | 43 +++ .../survey/ui/base/BaseFragmentBinding.java | 6 + .../project/survey/ui/home/HomeFragment.kt | 43 ++- .../survey/ui/home/InstrumentFragment.kt | 88 ++--- .../com/project/survey/ui/home/MeFragment.kt | 33 +- .../BingCeCoordinateSystemActivity.java | 2 +- .../survey/ui/interfacee/ImmersionAction.kt | 6 + .../project/survey/ui/login/LoginActivity.kt | 20 +- .../survey/ui/project/ProjectListActivity.kt | 6 + .../project/survey/util/ActivityNavUtil.kt | 13 + .../com/project/survey/util/param/Param.java | 15 + .../project/survey/util/param/ParamUtil.kt | 82 +++++ .../survey/widget/SectionItemWidget.kt | 38 ++ .../icon_home_selected.png | Bin .../icon_home_unselected.png} | Bin .../icon_instrument_selected.png | Bin .../icon_instrument_unselected.png} | Bin .../icon_me_selected.png | Bin .../icon_me_unselected.png} | Bin app/src/main/res/drawable/bg_badge.xml | 12 + app/src/main/res/drawable/bg_section_r_8.xml | 9 + .../main/res/drawable/bg_section_r_8_top.xml | 11 + ...xml => icon_dedicated_control_network.xml} | 0 ...work.xml => icon_head_control_network.xml} | 0 .../{initiated.xml => icon_initiated.xml} | 0 .../{stakeout.xml => icon_lofting.xml} | 0 ...urement.xml => icon_point_measurement.xml} | 0 .../{processed.xml => icon_processed.xml} | 0 .../res/drawable/icon_to_be_processed.xml | 36 ++ app/src/main/res/drawable/img_login_top.xml | 12 + app/src/main/res/layout/activity_login.xml | 21 +- app/src/main/res/layout/activity_main.xml | 13 +- app/src/main/res/layout/fragment_home.xml | 325 ++++++++---------- .../main/res/layout/fragment_instrument.xml | 301 +++++++--------- .../main/res/layout/widget_section_item.xml | 44 +++ .../main/res/mipmap-anydpi/ic_launcher.xml | 6 + .../res/mipmap-anydpi/ic_launcher_round.xml | 6 + app/src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 0 -> 1404 bytes .../res/mipmap-hdpi/ic_launcher_round.webp | Bin 0 -> 2898 bytes app/src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 0 -> 982 bytes .../res/mipmap-mdpi/ic_launcher_round.webp | Bin 0 -> 1772 bytes .../main/res/mipmap-xhdpi/ic_launcher.webp | Bin 0 -> 1900 bytes .../res/mipmap-xhdpi/ic_launcher_round.webp | Bin 0 -> 3918 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 7718 -> 0 bytes .../main/res/mipmap-xxhdpi/ic_launcher.webp | Bin 0 -> 2884 bytes .../res/mipmap-xxhdpi/ic_launcher_round.webp | Bin 0 -> 5914 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin 0 -> 3844 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin 0 -> 7778 bytes app/src/main/res/values/attr.xml | 5 + app/src/main/res/values/color.xml | 8 + app/src/main/res/values/dimens.xml | 7 + app/src/main/res/values/strings.xml | 4 + 63 files changed, 983 insertions(+), 531 deletions(-) create mode 100644 app/src/main/java/com/project/survey/extend/FloatExt.kt create mode 100644 app/src/main/java/com/project/survey/extend/ToastExt.kt create mode 100644 app/src/main/java/com/project/survey/extend/ViewExt.kt create mode 100644 app/src/main/java/com/project/survey/logic/viewmodel/BaseViewModel.kt create mode 100644 app/src/main/java/com/project/survey/logic/viewmodel/LoginViewModel.kt create mode 100644 app/src/main/java/com/project/survey/network/Api.kt create mode 100644 app/src/main/java/com/project/survey/network/RetrofitClient.kt create mode 100644 app/src/main/java/com/project/survey/ui/base/BaseBindingFragment.kt create mode 100644 app/src/main/java/com/project/survey/ui/interfacee/ImmersionAction.kt create mode 100644 app/src/main/java/com/project/survey/util/ActivityNavUtil.kt create mode 100644 app/src/main/java/com/project/survey/util/param/Param.java create mode 100644 app/src/main/java/com/project/survey/util/param/ParamUtil.kt create mode 100644 app/src/main/java/com/project/survey/widget/SectionItemWidget.kt rename app/src/main/res/{mipmap-xxhdpi => drawable-xhdpi}/icon_home_selected.png (100%) rename app/src/main/res/{mipmap-xxhdpi/icon_home_selected_not.png => drawable-xhdpi/icon_home_unselected.png} (100%) rename app/src/main/res/{mipmap-xxhdpi => drawable-xhdpi}/icon_instrument_selected.png (100%) rename app/src/main/res/{mipmap-xxhdpi/icon_instrument_selected_not.png => drawable-xhdpi/icon_instrument_unselected.png} (100%) rename app/src/main/res/{mipmap-xxhdpi => drawable-xhdpi}/icon_me_selected.png (100%) rename app/src/main/res/{mipmap-xxhdpi/icon_me_selected_not.png => drawable-xhdpi/icon_me_unselected.png} (100%) create mode 100644 app/src/main/res/drawable/bg_badge.xml create mode 100644 app/src/main/res/drawable/bg_section_r_8.xml create mode 100644 app/src/main/res/drawable/bg_section_r_8_top.xml rename app/src/main/res/drawable/{dedicated_control_network.xml => icon_dedicated_control_network.xml} (100%) rename app/src/main/res/drawable/{head_control_network.xml => icon_head_control_network.xml} (100%) rename app/src/main/res/drawable/{initiated.xml => icon_initiated.xml} (100%) rename app/src/main/res/drawable/{stakeout.xml => icon_lofting.xml} (100%) rename app/src/main/res/drawable/{ic_point_measurement.xml => icon_point_measurement.xml} (100%) rename app/src/main/res/drawable/{processed.xml => icon_processed.xml} (100%) create mode 100644 app/src/main/res/drawable/icon_to_be_processed.xml create mode 100644 app/src/main/res/drawable/img_login_top.xml create mode 100644 app/src/main/res/layout/widget_section_item.xml create mode 100644 app/src/main/res/mipmap-anydpi/ic_launcher.xml create mode 100644 app/src/main/res/mipmap-anydpi/ic_launcher_round.xml create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp delete mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher.png create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp diff --git a/app/build.gradle b/app/build.gradle index cc4d3df..7d67553 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -176,7 +176,10 @@ dependencies { implementation "com.github.zagum:Android-SwitchIcon:1.4.0"//必须的 implementation 'io.github.inflationx:calligraphy3:3.1.1' // implementation 'io.github.inflationx:viewpump:2.0.3' - implementation 'com.gyf.immersionbar:immersionbar:3.0.0-beta05' + // 沉浸状态栏：https://github.com/gyf-dev/ImmersionBar + implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2' // 基础依赖包，必须要依赖 + implementation 'com.geyifeng.immersionbar:immersionbar-ktx:3.2.2' // kotlin扩展（可选） + implementation 'com.github.getActivity:ShapeView:9.2' implementation 'com.sherlockshi.widget:sherlockspinner:1.0.2' implementation 'com.zhy:flowlayout-lib:1.0.3' diff --git a/app/src/main/java/com/project/survey/extend/FloatExt.kt b/app/src/main/java/com/project/survey/extend/FloatExt.kt new file mode 100644 index 0000000..2218771 --- /dev/null +++ b/app/src/main/java/com/project/survey/extend/FloatExt.kt @@ -0,0 +1,19 @@ +package com.project.survey.extend + +import blankj.utilcode.util.ConvertUtils + +fun Float.dp2px(): Int { + return ConvertUtils.dp2px(this) +} + +fun Float.px2dp(): Int { + return ConvertUtils.px2dp(this) +} + +fun Float.sp2px(): Int { + return ConvertUtils.sp2px(this) +} + +fun Float.px2sp(): Int { + return ConvertUtils.px2sp(this) +} \ No newline at end of file diff --git a/app/src/main/java/com/project/survey/extend/ToastExt.kt b/app/src/main/java/com/project/survey/extend/ToastExt.kt new file mode 100644 index 0000000..d596411 --- /dev/null +++ b/app/src/main/java/com/project/survey/extend/ToastExt.kt @@ -0,0 +1,12 @@ +package com.project.survey.extend + +import androidx.annotation.StringRes +import blankj.utilcode.util.ToastUtils + +fun toast(text: CharSequence?) { + ToastUtils.showShort(text) +} + +fun toast(@StringRes resId: Int) { + ToastUtils.showShort(resId) +} \ No newline at end of file diff --git a/app/src/main/java/com/project/survey/extend/ViewExt.kt b/app/src/main/java/com/project/survey/extend/ViewExt.kt new file mode 100644 index 0000000..f7b947b --- /dev/null +++ b/app/src/main/java/com/project/survey/extend/ViewExt.kt @@ -0,0 +1,27 @@ +package com.project.survey.extend + +import android.view.View + + +/** + * 防止重复点击 + */ +var lastTime = 0L +fun View.setOnClickNoRepeatListener(interval: Long = 300, onClick: (View) -> Unit) { + setOnClickListener { + val currentTime = System.currentTimeMillis() + if (lastTime != 0L && (currentTime - lastTime < interval)) { + return@setOnClickListener + } + lastTime = currentTime + onClick(it) + } +} + +fun View.isVisibleOrInvisible(visible: Boolean){ + this.visibility = if (visible) View.VISIBLE else View.INVISIBLE +} + +fun View.isVisibleOrGone(visible: Boolean){ + this.visibility = if (visible) View.VISIBLE else View.GONE +} \ No newline at end of file diff --git a/app/src/main/java/com/project/survey/logic/viewmodel/BaseViewModel.kt b/app/src/main/java/com/project/survey/logic/viewmodel/BaseViewModel.kt new file mode 100644 index 0000000..5da15ab --- /dev/null +++ b/app/src/main/java/com/project/survey/logic/viewmodel/BaseViewModel.kt @@ -0,0 +1,26 @@ +package com.project.survey.logic.viewmodel + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext + +open class BaseViewModel : ViewModel() { + + val errorResponse = MutableLiveData() + + fun launch(block: suspend CoroutineScope.() -> Unit) { + viewModelScope.launch { + withContext(Dispatchers.IO) { + try { + block() + } catch (e: Exception) { + errorResponse.postValue(e.message) + } + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/project/survey/logic/viewmodel/LoginViewModel.kt b/app/src/main/java/com/project/survey/logic/viewmodel/LoginViewModel.kt new file mode 100644 index 0000000..00414f3 --- /dev/null +++ b/app/src/main/java/com/project/survey/logic/viewmodel/LoginViewModel.kt @@ -0,0 +1,14 @@ +package com.project.survey.logic.viewmodel + +import com.project.survey.network.RetrofitClient + +class LoginViewModel : BaseViewModel(){ + + val api = RetrofitClient.createApiService() + + fun test(){ + launch { + + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/project/survey/network/Api.kt b/app/src/main/java/com/project/survey/network/Api.kt new file mode 100644 index 0000000..2ec4943 --- /dev/null +++ b/app/src/main/java/com/project/survey/network/Api.kt @@ -0,0 +1,4 @@ +package com.project.survey.network + +interface Api { +} \ No newline at end of file diff --git a/app/src/main/java/com/project/survey/network/RetrofitClient.kt b/app/src/main/java/com/project/survey/network/RetrofitClient.kt new file mode 100644 index 0000000..81e0102 --- /dev/null +++ b/app/src/main/java/com/project/survey/network/RetrofitClient.kt @@ -0,0 +1,59 @@ +package com.project.survey.network + +import com.bingce.http.HttpsTrustUtil +import com.project.survey.BuildConfig +import okhttp3.OkHttpClient +import okhttp3.logging.HttpLoggingInterceptor +import retrofit2.Retrofit +import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory +import retrofit2.converter.gson.GsonConverterFactory +import java.util.concurrent.TimeUnit + +object RetrofitClient { + + fun createApiService(): Api { + return createService() + } + + inline fun createService(): T { + return createRetrofit().create(T::class.java) + } + + + fun createRetrofit(): Retrofit { + return Retrofit.Builder() + .baseUrl("") + .client(createOkHttpClient()) + .addConverterFactory(GsonConverterFactory.create()) + .addCallAdapterFactory(RxJava2CallAdapterFactory.create()) //retrofit默认支持Call返回类型，改为支持Observable返回类型 + .build() + } + + private fun createOkHttpClient(): OkHttpClient { + return OkHttpClient.Builder() + .connectTimeout(60L, TimeUnit.SECONDS) + .readTimeout(60L, TimeUnit.SECONDS) + .writeTimeout(60L, TimeUnit.SECONDS) + .addInterceptor { chain -> + val originalRequest = chain.request() + val updateRequest = originalRequest.newBuilder() + .header("Content-Type", "application/json;charset=UTF-8") + .header("User-Agent", "ANDROID") + .header("System-Type", "APP_TOKEN") + .build() + return@addInterceptor chain.proceed(updateRequest) + } + .addInterceptor(HttpLoggingInterceptor().apply { + level = if (BuildConfig.DEBUG) + HttpLoggingInterceptor.Level.BODY + else + HttpLoggingInterceptor.Level.NONE + }) + .sslSocketFactory( + HttpsTrustUtil.createSSLSocketFactory(), + HttpsTrustUtil.TrustAllManager() + ) + .hostnameVerifier(HttpsTrustUtil.TrustAllHostnameVerifier()) + .build() + } +} \ No newline at end of file diff --git a/app/src/main/java/com/project/survey/ui/MainActivity.kt b/app/src/main/java/com/project/survey/ui/MainActivity.kt index f4071e0..cb26b05 100644 --- a/app/src/main/java/com/project/survey/ui/MainActivity.kt +++ b/app/src/main/java/com/project/survey/ui/MainActivity.kt @@ -1,7 +1,6 @@ package com.project.survey.ui import androidx.fragment.app.Fragment -import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter import androidx.viewpager.widget.ViewPager import blankj.utilcode.util.AppUtils @@ -10,7 +9,6 @@ import com.bingce.ui.TabEntity import com.bingce.utils.AppUtil import com.bingce.utils.RegisterUtil import com.bingce.utils.SdkUtils -import com.flyco.tablayout.listener.CustomTabEntity import com.flyco.tablayout.listener.OnTabSelectListener import com.project.survey.R import com.project.survey.databinding.ActivityMainBinding @@ -18,16 +16,21 @@ import com.project.survey.ui.base.BaseBindingActivity import com.project.survey.ui.home.HomeFragment import com.project.survey.ui.home.InstrumentFragment import com.project.survey.ui.home.MeFragment +import com.project.survey.util.ActivityNavUtil - +/** + * 主页 + */ class MainActivity : BaseBindingActivity() { - private val mFragments = mutableListOf() - - override fun getBinding(): ActivityMainBinding { - return ActivityMainBinding.inflate(layoutInflater) + companion object { + fun start() { + ActivityNavUtil.startActivity {} + } } + override fun getBinding(): ActivityMainBinding = ActivityMainBinding.inflate(layoutInflater) + override fun initView() { verifySdk() initTabFragment() @@ -49,35 +52,33 @@ class MainActivity : BaseBindingActivity() { ) } + override fun initData() { + } + private fun initTabFragment() { //设置tab - val mTabEntities = ArrayList() - mTabEntities.add( - TabEntity( - "首页", - R.mipmap.icon_home_selected, - R.mipmap.icon_home_selected_not - ) - ) - mTabEntities.add( - TabEntity( - "仪器", - R.mipmap.icon_instrument_selected, - R.mipmap.icon_instrument_selected_not + mBinding.tabLayout.setTabData( + arrayListOf( + TabEntity( + getString(R.string.tab_home_page), + R.drawable.icon_home_selected, + R.drawable.icon_home_unselected + ), + TabEntity( + getString(R.string.tab_instrument), + R.drawable.icon_instrument_selected, + R.drawable.icon_instrument_unselected + ), + TabEntity( + getString(R.string.tab_mine), + R.drawable.icon_me_selected, + R.drawable.icon_me_unselected + ) ) ) - mTabEntities.add( - TabEntity( - "我的", - R.mipmap.icon_me_selected, - R.mipmap.icon_me_selected_not - ) - ) - mBinding.tabLayout.setTabData(mTabEntities) - mBinding.tabLayout.setOnTabSelectListener(object : OnTabSelectListener { override fun onTabSelect(position: Int) { - mBinding.vp.setCurrentItem(position) + mBinding.vp.currentItem = position } override fun onTabReselect(position: Int) { @@ -85,10 +86,17 @@ class MainActivity : BaseBindingActivity() { }) //设置viewPager - mFragments.add(HomeFragment()) - mFragments.add(InstrumentFragment()) - mFragments.add(MeFragment()) - mBinding.vp.adapter = MyPagerAdapter(supportFragmentManager) + val fragments = arrayListOf( + HomeFragment(), + InstrumentFragment(), + MeFragment() + ) + mBinding.vp.adapter = object : FragmentPagerAdapter(supportFragmentManager) { + override fun getCount(): Int = fragments.size + + override fun getItem(position: Int): Fragment = fragments[position] + + } mBinding.vp.offscreenPageLimit = 3 mBinding.vp.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrolled( @@ -108,20 +116,5 @@ class MainActivity : BaseBindingActivity() { }) } - override fun initData() { - } - - private inner class MyPagerAdapter : FragmentPagerAdapter { - constructor(fm: FragmentManager) : super(fm) - - constructor(fm: FragmentManager, behavior: Int) : super(fm, behavior) - - override fun getItem(position: Int): Fragment { - return mFragments[position] - } - override fun getCount(): Int { - return mFragments.size - } - } } \ No newline at end of file diff --git a/app/src/main/java/com/project/survey/ui/SplashActivity.kt b/app/src/main/java/com/project/survey/ui/SplashActivity.kt index 22b90aa..7fd55e0 100644 --- a/app/src/main/java/com/project/survey/ui/SplashActivity.kt +++ b/app/src/main/java/com/project/survey/ui/SplashActivity.kt @@ -1,6 +1,5 @@ package com.project.survey.ui -import android.content.Intent import com.project.survey.databinding.ActivitySplashBinding import com.project.survey.ui.base.BaseBindingActivity @@ -9,12 +8,10 @@ import com.project.survey.ui.base.BaseBindingActivity */ class SplashActivity : BaseBindingActivity() { - override fun getBinding(): ActivitySplashBinding { - return ActivitySplashBinding.inflate(layoutInflater) - } + override fun getBinding(): ActivitySplashBinding = ActivitySplashBinding.inflate(layoutInflater) override fun initView() { - startActivity(Intent(this, MainActivity::class.java)) + MainActivity.start() finish() } diff --git a/app/src/main/java/com/project/survey/ui/base/BaseBindingActivity.kt b/app/src/main/java/com/project/survey/ui/base/BaseBindingActivity.kt index 974bce1..b41ac9f 100644 --- a/app/src/main/java/com/project/survey/ui/base/BaseBindingActivity.kt +++ b/app/src/main/java/com/project/survey/ui/base/BaseBindingActivity.kt @@ -8,16 +8,22 @@ import androidx.annotation.StringRes import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatDelegate import androidx.appcompat.widget.Toolbar +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData import androidx.viewbinding.ViewBinding import blankj.utilcode.util.Utils import com.project.survey.App import com.project.survey.R +import com.project.survey.ui.interfacee.ImmersionAction import com.project.survey.util.Tools +import com.project.survey.util.param.ParamUtil import org.polaric.colorful.Colorful abstract class BaseBindingActivity : AppCompatActivity() { - protected val mBinding get() = _binding!! - private var _binding: VB? = null + + private lateinit var _binding: VB + protected val mBinding: VB + get() = _binding private var toolBar: Toolbar? = null @@ -27,9 +33,11 @@ abstract class BaseBindingActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - setContentView(getContentView()) - //设置背景色 - mBinding.root.setBackgroundColor(Tools.getColor(R.color.bg_content)) + ParamUtil.initParam(this) + _binding = getBinding() + setContentView(mBinding.root) +// //设置背景色 +// mBinding.root.setBackgroundColor(Tools.getColor(R.color.bg_content)) initToolBar() initView() @@ -50,23 +58,6 @@ abstract class BaseBindingActivity : AppCompatActivity() { window.clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN); } - private fun getContentView(): View { -// val baseBinding = ActivityBaseBindingBinding.inflate(layoutInflater) -// val layoutParams = LinearLayout.LayoutParams( -// ViewGroup.LayoutParams.MATCH_PARENT, -// ViewGroup.LayoutParams.MATCH_PARENT -// ) - _binding = getBinding() -// baseBinding.llParent.addView(mBinding.root, layoutParams) -// baseBinding.llParent.setBackgroundColor( -// ContextCompat.getColor( -// this, -// R.color.bg_content_new -// ) -// ) - return mBinding.root - } - protected open fun initToolBar() { toolBar = findViewById(R.id.toolbar) setSupportActionBar(toolBar) diff --git a/app/src/main/java/com/project/survey/ui/base/BaseBindingFragment.kt b/app/src/main/java/com/project/survey/ui/base/BaseBindingFragment.kt new file mode 100644 index 0000000..1bcfaaa --- /dev/null +++ b/app/src/main/java/com/project/survey/ui/base/BaseBindingFragment.kt @@ -0,0 +1,43 @@ +package com.project.survey.ui.base + +import android.content.Context +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.fragment.app.Fragment +import androidx.viewbinding.ViewBinding +import com.project.survey.util.param.ParamUtil + +abstract class BaseBindingFragment : Fragment() { + + private lateinit var _binding: VB + protected val binding: VB + get() = _binding + + abstract fun getBinding(inflater: LayoutInflater, container: ViewGroup?): VB + abstract fun initView() + abstract fun initData() + abstract fun initListener() + + override fun onAttach(context: Context) { + super.onAttach(context) + ParamUtil.initParam(this) + } + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + _binding = getBinding(inflater, container) + return _binding.root + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + initView() + initListener() + initData() + } +} \ No newline at end of file diff --git a/app/src/main/java/com/project/survey/ui/base/BaseFragmentBinding.java b/app/src/main/java/com/project/survey/ui/base/BaseFragmentBinding.java index 1380b3b..768b6f7 100644 --- a/app/src/main/java/com/project/survey/ui/base/BaseFragmentBinding.java +++ b/app/src/main/java/com/project/survey/ui/base/BaseFragmentBinding.java @@ -1,5 +1,6 @@ package com.project.survey.ui.base; +import android.content.Context; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; @@ -14,6 +15,11 @@ import androidx.viewbinding.ViewBinding; public abstract class BaseFragmentBinding extends Fragment { protected VB mBinding; + @Override + public void onAttach(@NonNull Context context) { + super.onAttach(context); + } + @Nullable @Override public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { diff --git a/app/src/main/java/com/project/survey/ui/home/HomeFragment.kt b/app/src/main/java/com/project/survey/ui/home/HomeFragment.kt index a8ad65f..224a5a8 100644 --- a/app/src/main/java/com/project/survey/ui/home/HomeFragment.kt +++ b/app/src/main/java/com/project/survey/ui/home/HomeFragment.kt @@ -3,47 +3,54 @@ package com.project.survey.ui.home import android.view.LayoutInflater import android.view.ViewGroup import com.project.survey.databinding.FragmentHomeBinding +import com.project.survey.extend.setOnClickNoRepeatListener import com.project.survey.ui.approval.ApprovalActivity -import com.project.survey.ui.base.BaseFragmentBinding +import com.project.survey.ui.base.BaseBindingFragment import com.project.survey.ui.controlnet.ControlNetFirstListActivity import com.project.survey.ui.controlnet.ControlNetSpeciaListActivity import com.project.survey.ui.lofting.LoftingListActivity import com.project.survey.ui.pointmeasure.PointMeasureListActivity -class HomeFragment : BaseFragmentBinding() { - override fun getViewBinding( - inflater: LayoutInflater, - container: ViewGroup? - ): FragmentHomeBinding { +/** + * 首页 + */ +class HomeFragment : BaseBindingFragment() { + + override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentHomeBinding { return FragmentHomeBinding.inflate(inflater, container, false) } override fun initView() { - mBinding.tvPointMeasure.setOnClickListener { - //点测量 + binding.tvProject.text = "哈哈哈哈哈" + } + + override fun initData() { + binding.itemToBeProcessed.setBadge(4) + } + + override fun initListener() { + //点测量 + binding.itemPointMeasure.setOnClickNoRepeatListener { PointMeasureListActivity.launch(requireContext()) } - mBinding.tvLofting.setOnClickListener { - //放样 + //放样 + binding.itemLofting.setOnClickNoRepeatListener { LoftingListActivity.launch(requireContext()) } - mBinding.rlApprovalWait.setOnClickListener { + binding.itemToBeProcessed.setOnClickNoRepeatListener { ApprovalActivity.launch(requireContext(), ApprovalActivity.TYPE_WAIT) } - mBinding.tvApprovalProcessed.setOnClickListener { + binding.itemProcessed.setOnClickNoRepeatListener { ApprovalActivity.launch(requireContext(), ApprovalActivity.TYPE_PROCESSED) } - mBinding.tvApprovalInitated.setOnClickListener { + binding.itemInitiated.setOnClickNoRepeatListener { ApprovalActivity.launch(requireContext(), ApprovalActivity.TYPE_INITIATED) } - mBinding.tvControlNetFirst.setOnClickListener { + binding.itemControlNetFirst.setOnClickNoRepeatListener { ControlNetFirstListActivity.launch(requireContext()) } - mBinding.tvControlNetSpecial.setOnClickListener { + binding.itemControlNetSpecial.setOnClickNoRepeatListener { ControlNetSpeciaListActivity.launch(requireContext()) } } - - override fun initData() { - } } \ No newline at end of file diff --git a/app/src/main/java/com/project/survey/ui/home/InstrumentFragment.kt b/app/src/main/java/com/project/survey/ui/home/InstrumentFragment.kt index 70b81c9..fe08959 100644 --- a/app/src/main/java/com/project/survey/ui/home/InstrumentFragment.kt +++ b/app/src/main/java/com/project/survey/ui/home/InstrumentFragment.kt @@ -4,8 +4,6 @@ import android.content.Intent import android.view.LayoutInflater import android.view.ViewGroup import blankj.utilcode.util.AppUtils -import blankj.utilcode.util.ToastUtils -import blankj.utilcode.util.Utils import com.bingce.device.Device import com.bingce.device.enums.ConnectTypeEnum import com.bingce.device.enums.DeviceTypeEnum @@ -15,16 +13,23 @@ import com.bingce.rtk.command.RTK import com.bingce.rtk.config.GnssConfigManager import com.project.survey.R import com.project.survey.databinding.FragmentInstrumentBinding -import com.project.survey.ui.base.BaseFragmentBinding +import com.project.survey.extend.setOnClickNoRepeatListener +import com.project.survey.extend.toast +import com.project.survey.ui.base.BaseBindingFragment import com.project.survey.ui.instrument.basestationtranslation.RtkBaseCorrectActivity import com.project.survey.ui.instrument.coordinatesystem.BingCeCoordinateSystemActivity import com.project.survey.ui.instrument.mobilestationmode.GnssConfigSetActivity import com.project.survey.ui.instrument.mobilestationmode.base.RtkPointCorrectActivity import com.project.survey.ui.instrument.satellitosis.SatelliteStatusActivity import com.project.survey.ui.instrument.setupstation.InstrumentSetFragmentSetupStationTypeUtils +import com.project.survey.util.ActivityNavUtil -class InstrumentFragment : BaseFragmentBinding() { - override fun getViewBinding( +/** + * 仪器 + */ +class InstrumentFragment : BaseBindingFragment() { + + override fun getBinding( inflater: LayoutInflater, container: ViewGroup? ): FragmentInstrumentBinding { @@ -32,24 +37,32 @@ class InstrumentFragment : BaseFragmentBinding() { } override fun initView() { - mBinding.tvConnectTSActivity.setOnClickListener { - //全站仪联机 + + } + + override fun initData() { + binding.tvProject.text = "哈哈哈哈哈" + } + + override fun initListener() { + //全站仪联机 + binding.itemConnectTotalStation.setOnClickNoRepeatListener { ConnectTSActivity.start(requireContext()) } - mBinding.tvConnectRtkActivity.setOnClickListener { - //RTK联机 + //RTK联机 + binding.itemConnectRTK.setOnClickNoRepeatListener { ConnectRtkActivity.start(this) } - mBinding.tvSatelliteStatusActivity.setOnClickListener { - //卫星状态 - startActivity(Intent(requireContext(), SatelliteStatusActivity::class.java)) + //卫星状态 + binding.itemSatelliteStatus.setOnClickNoRepeatListener { + ActivityNavUtil.startActivity { } } - mBinding.tvTotalStationSetupStation.setOnClickListener { - //全站仪设站 + //全站仪设站 + binding.itemTotalStationSetupStation.setOnClickListener { InstrumentSetFragmentSetupStationTypeUtils.chooseSetupStationType(this) } - mBinding.tvMobileStationMode.setOnClickListener { - //移动站模式 + //移动站模式 + binding.itemMobileStationMode.setOnClickListener { if (Device.getInstance().isDeviceConnected || AppUtils.isAppDebug()) { if (RTK.getInstance().isSupportRoverSetting) { GnssConfigManager.reset() //重置配置，防止未退出重新连接其他品牌型号导致配置集未改变的问题 @@ -57,14 +70,14 @@ class InstrumentFragment : BaseFragmentBinding() { roverIntent.putExtra("sysMode", 0) startActivity(roverIntent) } else { - ToastUtils.showShort(R.string.device_not_support_this_mode) + toast(R.string.device_not_support_this_mode) } } else { - ToastUtils.showShort(R.string.rtk_not_connected) + toast(R.string.rtk_not_connected) } } - mBinding.tvBaseStationMode.setOnClickListener { - //基准站模式 + //基准站模式 + binding.itemBaseStationMode.setOnClickListener { if (Device.getInstance().isDeviceConnected || AppUtils.isAppDebug()) { if (RTK.getInstance().isSupportBaseSetting) { GnssConfigManager.reset() //重置配置，防止未退出重新连接其他品牌型号导致配置集未改变的问题 @@ -72,50 +85,41 @@ class InstrumentFragment : BaseFragmentBinding() { baseIntent.putExtra("sysMode", 1) startActivity(baseIntent) } else { - ToastUtils.showShort(R.string.device_not_support_this_mode) + toast(R.string.device_not_support_this_mode) } } else { - ToastUtils.showShort(R.string.rtk_not_connected) + toast(R.string.rtk_not_connected) } } - mBinding.tvBaseStationTranslation.setOnClickListener { - //基站平移 + //基站平移 + binding.itemBaseStationTranslation.setOnClickListener { startBaseStationTranslation() } - mBinding.tvCoordinateSystem.setOnClickListener { - //坐标系统 + //坐标系统 + binding.itemCoordinateSystem.setOnClickListener { BingCeCoordinateSystemActivity.viewAndModifyCurrentCoordinateSystem(requireContext()) } - mBinding.tvPointCorrection.setOnClickListener { - //点校正 - startActivity(Intent(Utils.getApp(), RtkPointCorrectActivity::class.java)) + //点校正 + binding.itemPointCorrection.setOnClickListener { + ActivityNavUtil.startActivity { } } - - } private fun startBaseStationTranslation() { if (!AppUtils.isAppDebug()) { if (Device.getInstance().deviceType == DeviceTypeEnum.DEVICE_TYPE_TS) { - ToastUtils.showShort(R.string.please_choose_rtk_instrument) + toast(R.string.please_choose_rtk_instrument) return } if (Device.getInstance().connectType == ConnectTypeEnum.CONNECT_TYPE_PHONE_LOCATION) { - ToastUtils.showShort(R.string.rtk_native_unnecessary) + toast(R.string.rtk_native_unnecessary) return } if (!Device.getInstance().isDeviceConnected) { - ToastUtils.showShort(R.string.please_connect_bluetooth) + toast(R.string.please_connect_bluetooth) return } } - val intent504 = Intent( - Utils.getApp(), - RtkBaseCorrectActivity::class.java - ) - startActivity(intent504) - } - - override fun initData() { + ActivityNavUtil.startActivity { } } } \ 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 e341f19..0f83490 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 @@ -1,33 +1,34 @@ package com.project.survey.ui.home -import android.content.Intent import android.view.LayoutInflater import android.view.ViewGroup import com.project.survey.databinding.FragmentMeBinding -import com.project.survey.ui.base.BaseFragmentBinding +import com.project.survey.extend.setOnClickNoRepeatListener +import com.project.survey.ui.base.BaseBindingFragment import com.project.survey.ui.login.LoginActivity import com.project.survey.ui.project.ProjectListActivity -class MeFragment : BaseFragmentBinding() { - override fun getViewBinding( - inflater: LayoutInflater, - container: ViewGroup? - ): FragmentMeBinding { +/** + * 我的 + */ +class MeFragment : BaseBindingFragment() { + + override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentMeBinding { return FragmentMeBinding.inflate(inflater, container, false) } override fun initView() { - - mBinding.llLogin.setOnClickListener { - startActivity(Intent(context, LoginActivity::class.java)) - } - - mBinding.llSwitchProject.setOnClickListener { - startActivity(Intent(requireContext(), ProjectListActivity::class.java)) - } - } override fun initData() { } + + override fun initListener() { + binding.llLogin.setOnClickNoRepeatListener { + LoginActivity.start() + } + binding.llSwitchProject.setOnClickNoRepeatListener { + ProjectListActivity.start() + } + } } \ No newline at end of file diff --git a/app/src/main/java/com/project/survey/ui/instrument/coordinatesystem/BingCeCoordinateSystemActivity.java b/app/src/main/java/com/project/survey/ui/instrument/coordinatesystem/BingCeCoordinateSystemActivity.java index 3310b35..902c20d 100644 --- a/app/src/main/java/com/project/survey/ui/instrument/coordinatesystem/BingCeCoordinateSystemActivity.java +++ b/app/src/main/java/com/project/survey/ui/instrument/coordinatesystem/BingCeCoordinateSystemActivity.java @@ -31,7 +31,7 @@ public class BingCeCoordinateSystemActivity extends AutoLandscapeBingCeActivity ActivityCoordinateSystemBinding binding = ActivityCoordinateSystemBinding.inflate(getLayoutInflater()); setContentView(binding.getRoot()); Toolbar mToolbar = findViewById(R.id.toolbar); - mToolbar.setTitle(R.string.coordinate_system); +// mToolbar.setTitle(R.string.coordinate_system); setSupportActionBar(mToolbar); if (getSupportActionBar() != null) getSupportActionBar().setDisplayHomeAsUpEnabled(true); diff --git a/app/src/main/java/com/project/survey/ui/interfacee/ImmersionAction.kt b/app/src/main/java/com/project/survey/ui/interfacee/ImmersionAction.kt new file mode 100644 index 0000000..b57a78d --- /dev/null +++ b/app/src/main/java/com/project/survey/ui/interfacee/ImmersionAction.kt @@ -0,0 +1,6 @@ +package com.project.survey.ui.interfacee + +interface ImmersionAction { + + fun immersion() +} \ No newline at end of file diff --git a/app/src/main/java/com/project/survey/ui/login/LoginActivity.kt b/app/src/main/java/com/project/survey/ui/login/LoginActivity.kt index df9e7b2..576be9c 100644 --- a/app/src/main/java/com/project/survey/ui/login/LoginActivity.kt +++ b/app/src/main/java/com/project/survey/ui/login/LoginActivity.kt @@ -2,20 +2,28 @@ package com.project.survey.ui.login import android.content.Intent import android.view.View +import com.gyf.immersionbar.ImmersionBar import com.project.survey.R import com.project.survey.ui.base.BaseBindingActivity import com.project.survey.databinding.ActivityLoginBinding +import com.project.survey.util.ActivityNavUtil import com.project.survey.util.Tools class LoginActivity : BaseBindingActivity() { - private var isOutLogin = false//默认集团登录 - - override fun getBinding(): ActivityLoginBinding { - return ActivityLoginBinding.inflate(layoutInflater) + companion object{ + fun start(){ + ActivityNavUtil.startActivity { } + } } + override fun getBinding(): ActivityLoginBinding = ActivityLoginBinding.inflate(layoutInflater) + + private var isOutLogin = false//默认集团登录 + override fun initView() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + mBinding.tvShowOutLogin.setOnClickListener { //切换到外部登录 isOutLogin = true @@ -47,7 +55,6 @@ class LoginActivity : BaseBindingActivity() { * 内部登录 */ private fun loginByInner() { - startActivity(Intent(this, LoginInputCodeActivity::class.java)) } @@ -83,4 +90,7 @@ class LoginActivity : BaseBindingActivity() { } + + + } \ No newline at end of file diff --git a/app/src/main/java/com/project/survey/ui/project/ProjectListActivity.kt b/app/src/main/java/com/project/survey/ui/project/ProjectListActivity.kt index c9f393e..73a35ba 100644 --- a/app/src/main/java/com/project/survey/ui/project/ProjectListActivity.kt +++ b/app/src/main/java/com/project/survey/ui/project/ProjectListActivity.kt @@ -6,6 +6,7 @@ import com.flyco.tablayout.listener.CustomTabEntity import com.project.survey.R import com.project.survey.ui.base.BaseBindingActivity import com.project.survey.databinding.ActivityProjectListBinding +import com.project.survey.util.ActivityNavUtil class ProjectListActivity : BaseBindingActivity() { override fun getBinding(): ActivityProjectListBinding { @@ -42,4 +43,9 @@ class ProjectListActivity : BaseBindingActivity() { override fun initData() { } + companion object { + fun start(){ + ActivityNavUtil.startActivity { } + } + } } \ No newline at end of file diff --git a/app/src/main/java/com/project/survey/util/ActivityNavUtil.kt b/app/src/main/java/com/project/survey/util/ActivityNavUtil.kt new file mode 100644 index 0000000..2dc5d63 --- /dev/null +++ b/app/src/main/java/com/project/survey/util/ActivityNavUtil.kt @@ -0,0 +1,13 @@ +package com.project.survey.util + +import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity +import blankj.utilcode.util.ActivityUtils + +object ActivityNavUtil { + + inline fun startActivity(block: Bundle.() -> Unit) { + ActivityUtils.startActivity(Bundle().apply(block), T::class.java) + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/project/survey/util/param/Param.java b/app/src/main/java/com/project/survey/util/param/Param.java new file mode 100644 index 0000000..a75dad3 --- /dev/null +++ b/app/src/main/java/com/project/survey/util/param/Param.java @@ -0,0 +1,15 @@ +package com.project.survey.util.param; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * des 参数解析注解 + */ +@Target(ElementType.FIELD) +@Retention(RetentionPolicy.RUNTIME) +public @interface Param { + String value() default ""; +} diff --git a/app/src/main/java/com/project/survey/util/param/ParamUtil.kt b/app/src/main/java/com/project/survey/util/param/ParamUtil.kt new file mode 100644 index 0000000..efd7cf5 --- /dev/null +++ b/app/src/main/java/com/project/survey/util/param/ParamUtil.kt @@ -0,0 +1,82 @@ +package com.project.survey.util.param + +import android.app.Activity +import android.os.Bundle +import android.text.TextUtils +import androidx.fragment.app.Fragment + +/** + * 页面跳转传参 注解+反射获取页面入参 + */ +object ParamUtil { + /** + * Fragment + */ + fun initParam(fragment: Fragment) { + val javaClass = fragment.javaClass + fragment.arguments?.apply { + setParam(fragment, this) + } + } + + /** + * Activity + */ + fun initParam(activity: Activity) { + activity.intent.extras?.apply { + setParam(activity, this) + } + } + + private fun setParam(obj: Any, intent: Bundle) { + val javaClass = obj.javaClass + val fields = javaClass.declaredFields + for (item in fields) { + if (item.isAnnotationPresent(Param::class.java)) { + item.getAnnotation(Param::class.java)?.let { + val key: String = if (TextUtils.isEmpty(it.value)) item.name else it.value + if (intent.containsKey(key)) { + val type = item.type + when (type) { + Boolean::class.javaPrimitiveType -> { + intent.getBoolean(key, false) + } + Int::class.javaPrimitiveType -> { + intent.getInt(key, 0) + } + Long::class.javaPrimitiveType -> { + intent.getLong(key, 0L) + } + String::class.java -> { + intent.getString(key) + } + Double::class.javaPrimitiveType -> { + intent.getDouble(key, 0.0) + } + Byte::class.javaPrimitiveType -> { + intent.getByte(key, "".toByte()) + } + Char::class.javaPrimitiveType -> { + intent.getChar(key, '\u0000') + } + Float::class.javaPrimitiveType -> { + intent.getFloat(key, 0f) + } + else -> { + intent.getParcelable(key) + } + }?.apply { + item.isAccessible = true + try { + item[obj] = this + } catch (e: IllegalAccessException) { + e.printStackTrace() + } + item.isAccessible = false + } + } + } + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/project/survey/widget/SectionItemWidget.kt b/app/src/main/java/com/project/survey/widget/SectionItemWidget.kt new file mode 100644 index 0000000..852c577 --- /dev/null +++ b/app/src/main/java/com/project/survey/widget/SectionItemWidget.kt @@ -0,0 +1,38 @@ +package com.project.survey.widget + +import android.content.Context +import android.util.AttributeSet +import android.view.LayoutInflater +import androidx.appcompat.widget.LinearLayoutCompat +import com.project.survey.R +import com.project.survey.databinding.WidgetSectionItemBinding +import com.project.survey.extend.isVisibleOrGone + +class SectionItemWidget @JvmOverloads constructor( + context: Context, + val attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : LinearLayoutCompat(context, attrs, defStyleAttr) { + + private val binding: WidgetSectionItemBinding + + init { + binding = WidgetSectionItemBinding.inflate(LayoutInflater.from(context), this, true) + val typeArray = context.obtainStyledAttributes(attrs, R.styleable.SectionItemWidget) + + val icon = typeArray.getResourceId(R.styleable.SectionItemWidget_siw_icon, -1) + binding.ivIcon.setImageResource(icon) + + binding.tvName.text = typeArray.getString(R.styleable.SectionItemWidget_siw_name) + + typeArray.recycle() + } + + /** + * 设置未读数 + */ + fun setBadge(count: Int): SectionItemWidget = apply { + binding.tvBadge.isVisibleOrGone(count > 0) + binding.tvBadge.text = "$count" + } +} \ No newline at end of file diff --git a/app/src/main/res/mipmap-xxhdpi/icon_home_selected.png b/app/src/main/res/drawable-xhdpi/icon_home_selected.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/icon_home_selected.png rename to app/src/main/res/drawable-xhdpi/icon_home_selected.png diff --git a/app/src/main/res/mipmap-xxhdpi/icon_home_selected_not.png b/app/src/main/res/drawable-xhdpi/icon_home_unselected.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/icon_home_selected_not.png rename to app/src/main/res/drawable-xhdpi/icon_home_unselected.png diff --git a/app/src/main/res/mipmap-xxhdpi/icon_instrument_selected.png b/app/src/main/res/drawable-xhdpi/icon_instrument_selected.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/icon_instrument_selected.png rename to app/src/main/res/drawable-xhdpi/icon_instrument_selected.png diff --git a/app/src/main/res/mipmap-xxhdpi/icon_instrument_selected_not.png b/app/src/main/res/drawable-xhdpi/icon_instrument_unselected.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/icon_instrument_selected_not.png rename to app/src/main/res/drawable-xhdpi/icon_instrument_unselected.png diff --git a/app/src/main/res/mipmap-xxhdpi/icon_me_selected.png b/app/src/main/res/drawable-xhdpi/icon_me_selected.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/icon_me_selected.png rename to app/src/main/res/drawable-xhdpi/icon_me_selected.png diff --git a/app/src/main/res/mipmap-xxhdpi/icon_me_selected_not.png b/app/src/main/res/drawable-xhdpi/icon_me_unselected.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/icon_me_selected_not.png rename to app/src/main/res/drawable-xhdpi/icon_me_unselected.png diff --git a/app/src/main/res/drawable/bg_badge.xml b/app/src/main/res/drawable/bg_badge.xml new file mode 100644 index 0000000..7cfb7a1 --- /dev/null +++ b/app/src/main/res/drawable/bg_badge.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_section_r_8.xml b/app/src/main/res/drawable/bg_section_r_8.xml new file mode 100644 index 0000000..79a07a8 --- /dev/null +++ b/app/src/main/res/drawable/bg_section_r_8.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_section_r_8_top.xml b/app/src/main/res/drawable/bg_section_r_8_top.xml new file mode 100644 index 0000000..f723d96 --- /dev/null +++ b/app/src/main/res/drawable/bg_section_r_8_top.xml @@ -0,0 +1,11 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/dedicated_control_network.xml b/app/src/main/res/drawable/icon_dedicated_control_network.xml similarity index 100% rename from app/src/main/res/drawable/dedicated_control_network.xml rename to app/src/main/res/drawable/icon_dedicated_control_network.xml diff --git a/app/src/main/res/drawable/head_control_network.xml b/app/src/main/res/drawable/icon_head_control_network.xml similarity index 100% rename from app/src/main/res/drawable/head_control_network.xml rename to app/src/main/res/drawable/icon_head_control_network.xml diff --git a/app/src/main/res/drawable/initiated.xml b/app/src/main/res/drawable/icon_initiated.xml similarity index 100% rename from app/src/main/res/drawable/initiated.xml rename to app/src/main/res/drawable/icon_initiated.xml diff --git a/app/src/main/res/drawable/stakeout.xml b/app/src/main/res/drawable/icon_lofting.xml similarity index 100% rename from app/src/main/res/drawable/stakeout.xml rename to app/src/main/res/drawable/icon_lofting.xml diff --git a/app/src/main/res/drawable/ic_point_measurement.xml b/app/src/main/res/drawable/icon_point_measurement.xml similarity index 100% rename from app/src/main/res/drawable/ic_point_measurement.xml rename to app/src/main/res/drawable/icon_point_measurement.xml diff --git a/app/src/main/res/drawable/processed.xml b/app/src/main/res/drawable/icon_processed.xml similarity index 100% rename from app/src/main/res/drawable/processed.xml rename to app/src/main/res/drawable/icon_processed.xml diff --git a/app/src/main/res/drawable/icon_to_be_processed.xml b/app/src/main/res/drawable/icon_to_be_processed.xml new file mode 100644 index 0000000..da1ac72 --- /dev/null +++ b/app/src/main/res/drawable/icon_to_be_processed.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/img_login_top.xml b/app/src/main/res/drawable/img_login_top.xml new file mode 100644 index 0000000..3afc395 --- /dev/null +++ b/app/src/main/res/drawable/img_login_top.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index bbfe580..885f7c1 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -3,27 +3,14 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - android:focusable="true" - android:focusableInTouchMode="true" android:orientation="vertical" - android:paddingHorizontal="@dimen/sw_22dp"> + android:paddingHorizontal="@dimen/margin_side"> - - - + android:layout_marginTop="100dp" + android:src="@drawable/img_login_top" /> + tl:tl_underline_height="0.5dp" /> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 25a2088..8b3fd71 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -1,230 +1,195 @@ + app:layout_constraintTop_toTopOf="parent" + tools:text="某工程" /> - - - + + - - - - - - - - - - + + + + + + + + + app:layout_constraintTop_toBottomOf="@+id/layoutFirst"> - - + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + app:layout_constraintTop_toBottomOf="@+id/layoutSecond"> - - + + + + - - - - - - - - + app:layout_constraintEnd_toStartOf="@id/viewSpacer3" + app:layout_constraintHorizontal_weight="1" + app:layout_constraintStart_toEndOf="@id/itemControlNetFirst" + app:layout_constraintTop_toTopOf="@id/itemControlNetFirst" + app:siw_icon="@drawable/icon_dedicated_control_network" + app:siw_name="@string/dedicated_control_network" /> + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_instrument.xml b/app/src/main/res/layout/fragment_instrument.xml index 39c2850..50821eb 100644 --- a/app/src/main/res/layout/fragment_instrument.xml +++ b/app/src/main/res/layout/fragment_instrument.xml @@ -1,209 +1,174 @@ + app:layout_constraintTop_toTopOf="parent" + tools:text="某工程" /> - - - + + + + + + - - - - - - - - - - - - + + + + app:layout_constraintTop_toBottomOf="@+id/layoutFirst"> - - + + + + + + + + + + - - - - - - - - - - + + - - - - - - - - - - + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_weight="1" + app:layout_constraintStart_toEndOf="@id/itemCoordinateSystem" + app:layout_constraintTop_toTopOf="@id/itemBaseStationTranslation" + app:siw_icon="@drawable/point_correction" + app:siw_name="@string/point_correction" /> + + \ No newline at end of file diff --git a/app/src/main/res/layout/widget_section_item.xml b/app/src/main/res/layout/widget_section_item.xml new file mode 100644 index 0000000..00662c7 --- /dev/null +++ b/app/src/main/res/layout/widget_section_item.xml @@ -0,0 +1,44 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi/ic_launcher.xml b/app/src/main/res/mipmap-anydpi/ic_launcher.xml new file mode 100644 index 0000000..6f3b755 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi/ic_launcher.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml new file mode 100644 index 0000000..6f3b755 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..c209e78ecd372343283f4157dcfd918ec5165bb3 GIT binary patch literal 1404 zcmV-?1%vuhNk&F=1pok7MM6+kP&il$0000G0000-002h-06|PpNX!5L00Dqw+t%{r zzW2vH!KF=w&cMnnN@{whkTw+#mAh0SV?YL=)3MimFYCWp#fpdtz~8$hD5VPuQgtcN zXl<@<#Cme5f5yr2h%@8TWh?)bSK`O z^Z@d={gn7J{iyxL_y_%J|L>ep{dUxUP8a{byupH&!UNR*OutO~0{*T4q5R6@ApLF! z5{w?Z150gC7#>(VHFJZ-^6O@PYp{t!jH(_Z*nzTK4 zkc{fLE4Q3|mA2`CWQ3{8;gxGizgM!zccbdQoOLZc8hThi-IhN90RFT|zlxh3Ty&VG z?Fe{#9RrRnxzsu|Lg2ddugg7k%>0JeD+{XZ7>Z~{=|M+sh1MF7~ zz>To~`~LVQe1nNoR-gEzkpe{Ak^7{{ZBk2i_<+`Bq<^GB!RYG+z)h;Y3+<{zlMUYd zrd*W4w&jZ0%kBuDZ1EW&KLpyR7r2=}fF2%0VwHM4pUs}ZI2egi#DRMYZPek*^H9YK zay4Iy3WXFG(F14xYsoDA|KXgGc5%2DhmQ1gFCkrgHBm!lXG8I5h*uf{rn48Z!_@ z4Bk6TJAB2CKYqPjiX&mWoW>OPFGd$wqroa($ne7EUK;#3VYkXaew%Kh^3OrMhtjYN?XEoY`tRPQsAkH-DSL^QqyN0>^ zmC>{#F14jz4GeW{pJoRpLFa_*GI{?T93^rX7SPQgT@LbLqpNA}<@2wH;q493)G=1Y z#-sCiRNX~qf3KgiFzB3I>4Z%AfS(3$`-aMIBU+6?gbgDb!)L~A)je+;fR0jWLL-Fu z4)P{c7{B4Hp91&%??2$v9iRSFnuckHUm}or9seH6 z>%NbT+5*@L5(I9j@06@(!{ZI?U0=pKn8uwIg&L{JV14+8s2hnvbRrU|hZCd}IJu7*;;ECgO%8_*W Kmw_-CKmY()leWbG literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..b2dfe3d1ba5cf3ee31b3ecc1ced89044a1f3b7a9 GIT binary patch literal 2898 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..4f0f1d64e58ba64d180ce43ee13bf9a17835fbca GIT binary patch literal 982 zcmV;{11bDcNk&G_0{{S5MM6+kP&il$0000G0000l001ul06|PpNU8t;00Dqo+t#w^ z^1csucXz7-Qrhzl9HuHB%l>&>1tG2^vb*E&k^T3$FG1eQZ51g$uv4V+kI`0<^1Z@N zk?Jjh$olyC%l>)Xq;7!>{iBj&BjJ`P&$fsCfpve_epJOBkTF?nu-B7D!hO=2ZR}

C%4 zc_9eOXvPbC4kzU8YowIA8cW~Uv|eB&yYwAObSwL2vY~UYI7NXPvf3b+c^?wcs~_t{ ze_m66-0)^{JdOMKPwjpQ@Sna!*?$wTZ~su*tNv7o!gXT!GRgivP}ec?5>l1!7<(rT zds|8x(qGc673zrvYIz;J23FG{9nHMnAuP}NpAED^laz3mAN1sy+NXK)!6v1FxQ;lh zOBLA>$~P3r4b*NcqR;y6pwyhZ3_PiDb|%n1gGjl3ZU}ujInlP{eks-#oA6>rh&g+!f`hv#_%JrgYPu z(U^&XLW^QX7F9Z*SRPpQl{B%x)_AMp^}_v~?j7 zapvHMKxSf*Mtyx8I}-<*UGn3)oHd(nn=)BZ`d$lDBwq_GL($_TPaS{UeevT(AJ`p0 z9%+hQb6z)U9qjbuXjg|dExCLjpS8$VKQ55VsIC%@{N5t{NsW)=hNGI`J=x97_kbz@ E0Of=7!TQj4N+cqN`nQhxvX7dAV-`K|Ub$-q+H-5I?Tx0g9jWxd@A|?POE8`3b8fO$T))xP* z(X?&brZw({`)WU&rdAs1iTa0x6F@PIxJ&&L|dpySV!ID|iUhjCcKz(@mE z!x@~W#3H<)4Ae(4eQJRk`Iz3<1)6^m)0b_4_TRZ+cz#eD3f8V;2r-1fE!F}W zEi0MEkTTx}8i1{`l_6vo0(Vuh0HD$I4SjZ=?^?k82R51bC)2D_{y8mi_?X^=U?2|F{Vr7s!k(AZC$O#ZMyavHhlQ7 zUR~QXuH~#o#>(b$u4?s~HLF*3IcF7023AlwAYudn0FV~|odGH^05AYPEfR)8p`i{n zwg3zPVp{+wOsxKc>)(pMupKF!Y2HoUqQ3|Yu|8lwR=?5zZuhG6J?H`bSNk_wPoM{u zSL{c@pY7+c2kck>`^q1^^gR0QB7Y?KUD{vz-uVX~;V-rW)PDcI)$_UjgVV?S?=oLR zf4}zz{#*R_{LkiJ#0RdQLNC^2Vp%JPEUvG9ra2BVZ92(p9h7Ka@!yf9(lj#}>+|u* z;^_?KWdzkM`6gqPo9;;r6&JEa)}R3X{(CWv?NvgLeOTq$cZXqf7|sPImi-7cS8DCN zGf;DVt3Am`>hH3{4-WzH43Ftx)SofNe^-#|0HdCo<+8Qs!}TZP{HH8~z5n`ExcHuT zDL1m&|DVpIy=xsLO>8k92HcmfSKhflQ0H~9=^-{#!I1g(;+44xw~=* zxvNz35vfsQE)@)Zsp*6_GjYD};Squ83<_?^SbALb{a`j<0Gn%6JY!zhp=Fg}Ga2|8 z52e1WU%^L1}15Ex0fF$e@eCT(()_P zvV?CA%#Sy08_U6VPt4EtmVQraWJX` zh=N|WQ>LgrvF~R&qOfB$!%D3cGv?;Xh_z$z7k&s4N)$WYf*k=|*jCEkO19{h_(%W4 zPuOqbCw`SeAX*R}UUsbVsgtuG?xs(#Ikx9`JZoQFz0n*7ZG@Fv@kZk`gzO$HoA9kN z8U5{-yY zvV{`&WKU2$mZeoBmiJrEdzUZAv1sRxpePdg1)F*X^Y)zp^Y*R;;z~vOv-z&)&G)JQ{m!C9cmziu1^nHA z`#`0c>@PnQ9CJKgC5NjJD8HM3|KC(g5nnCq$n0Gsu_DXk36@ql%npEye|?%RmG)

FJ$wK}0tWNB{uH;AM~i literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..948a3070fe34c611c42c0d3ad3013a0dce358be0 GIT binary patch literal 1900 zcmV-y2b1_xNk&Fw2LJ$9MM6+kP&il$0000G0001A003VA06|PpNH75a00DqwTbm-~ zullQTcXxO9ki!OCRx^i?oR|n!<8G0=kI^!JSjFi-LL*`V;ET0H2IXfU0*i>o6o6Gy zRq6Ap5(_{XLdXcL-MzlN`ugSdZY_`jXhcENAu)N_0?GhF))9R;E`!bo9p?g?SRgw_ zEXHhFG$0{qYOqhdX<(wE4N@es3VIo$%il%6xP9gjiBri+2pI6aY4 zJbgh-Ud|V%3O!IcHKQx1FQH(_*TK;1>FQWbt^$K1zNn^cczkBs=QHCYZ8b&l!UV{K z{L0$KCf_&KR^}&2Fe|L&?1I7~pBENnCtCuH3sjcx6$c zwqkNkru);ie``q+_QI;IYLD9OV0ZxkuyBz|5<$1BH|vtey$> z5oto4=l-R-Aaq`Dk0}o9N0VrkqW_#;!u{!bJLDq%0092{Ghe=F;(kn} z+sQ@1=UlX30+2nWjkL$B^b!H2^QYO@iFc0{(-~yXj2TWz?VG{v`Jg zg}WyYnwGgn>{HFaG7E~pt=)sOO}*yd(UU-D(E&x{xKEl6OcU?pl)K%#U$dn1mDF19 zSw@l8G!GNFB3c3VVK0?uyqN&utT-D5%NM4g-3@Sii9tSXKtwce~uF zS&Jn746EW^wV~8zdQ1XC28~kXu8+Yo9p!<8h&(Q({J*4DBglPdpe4M_mD8AguZFn~ ztiuO~{6Bx?SfO~_ZV(GIboeR9~hAym{{fV|VM=77MxDrbW6`ujX z<3HF(>Zr;#*uCvC*bpoSr~C$h?_%nXps@A)=l_;({Fo#6Y1+Zv`!T5HB+)#^-Ud_; zBwftPN=d8Vx)*O1Mj+0oO=mZ+NVH*ptNDC-&zZ7Hwho6UQ#l-yNvc0Cm+2$$6YUk2D2t#vdZX-u3>-Be1u9gtTBiMB^xwWQ_rgvGpZ6(C@e23c!^K=>ai-Rqu zhqT`ZQof;9Bu!AD(i^PCbYV%yha9zuoKMp`U^z;3!+&d@Hud&_iy!O-$b9ZLcSRh? z)R|826w}TU!J#X6P%@Zh=La$I6zXa#h!B;{qfug}O%z@K{EZECu6zl)7CiNi%xti0 zB{OKfAj83~iJvmpTU|&q1^?^cIMn2RQ?jeSB95l}{DrEPTW{_gmU_pqTc)h@4T>~& zluq3)GM=xa(#^VU5}@FNqpc$?#SbVsX!~RH*5p0p@w z;~v{QMX0^bFT1!cXGM8K9FP+=9~-d~#TK#ZE{4umGT=;dfvWi?rYj;^l_Zxywze`W z^Cr{55U@*BalS}K%Czii_80e0#0#Zkhlij4-~I@}`-JFJ7$5{>LnoJSs??J8kWVl6|8A}RCGAu9^rAsfCE=2}tHwl93t0C?#+jMpvr7O3`2=tr{Hg$=HlnjVG^ewm|Js0J*kfPa6*GhtB>`fN!m#9J(sU!?(OSfzY*zS(FJ<-Vb zfAIg+`U)YaXv#sY(c--|X zEB+TVyZ%Ie4L$gi#Fc++`h6%vzsS$pjz9aLt+ZL(g;n$Dzy5=m=_TV(3H8^C{r0xd zp#a%}ht55dOq?yhwYPrtp-m1xXp;4X;)NhxxUpgP%XTLmO zcjaFva^}dP3$&sfFTIR_jC=2pHh9kpI@2(6V*GQo7Ws)`j)hd+tr@P~gR*2gO@+1? zG<`_tB+LJuF|SZ9tIec;h%}}6WClT`L>HSW?E{Hp1h^+mlbf_$9zA>!ug>NALJsO{ mU%z=YwVD?}XMya)Bp;vlyE5&E_6!fzx9pwrdz474!~g(M6R?N? literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..1b9a6956b3acdc11f40ce2bb3f6efbd845cc243f GIT binary patch literal 3918 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 diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..28d4b77f9f036a47549d47db79c16788749dca10 GIT binary patch literal 2884 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�(p-{x$&=IACIfoAR!za)F-^da-t3#0Dycnp zwO~NVXwXCl;jE<}>%@xz|=8fIJAB?>+E{7)|4l${4ngA3G|=r z2Dyv;VVWSgZx9Wj>qUjleGl3Ei9K4>h!(lPS%8VOG>Xu0%6VDz^O=bjJmuP7>DeUv zrbI}MlHB^^d?{zv6d=@_ZD2lg1&G7UjnVN{1}9WkaM3H~btX0GtSzB+tZ^qRgWo4m z!GmimlG$=wgXCnr6j@m<1gAL46#T~5Bnm=2{^@>|t&`9mkEPddj zAvG~@Tv~TAm2i%VW}R-g(Z0)z-Y|szHr@rk>4MAyG*Ma*7Yh#H7(!-5>DZ@8r;_dx z{prSe<>~099F8vsYd2xff7uAS%7{S)f(|@me3t2$iy&NEc7OUEchp@9A|X;;IA>8!oX+y(BKJ$EzV* znR$z;!L$s7uy@{OT~nG#B!NRraT8(X##Ho!0r_o@gg0CA-9H^;-uE&?$2$nHv_00o z%cbuUc-tCx$Uh&EZ4Nf4Zgqv)Y6>usG3>GeQnxx_Z6+PcbX-+ysbt1hQ`K1LDpOE? zrAhIZhSN9yVIAOa22gn577tbc&i3|3V8NWy&!tw##`}9*x}gtI^h1DzZRA>UuaJG) zaZ7j)dq!O}{?#8Y7~7i6fHh4{`pL?>-18|p!S75Y#^DM>-S3)vuZG+Q7l@ek zQP~#cBpWgg#mApc_sPYjpw8odQuRokmTkzcNl`^CcKB7e&;zViV;{Y{o^Y$%7i0m# z62%#1Lq!RC?}lK>%mp}T!3Xv;L*0v*>USLm``N%>w>@fwC+#T&Tx2bN4w(20JB}oU zuSa6v^kXi0xPs?pbaOHnyiqq6By1EZY9OZ^^QA>{q-Hsd&m`pbQ%8121aWG-F5xf zlZ%;B{;C>X19|`^_?dVyCq>n+41w7|!tUS!{9rHlbhX=SZO5CQ^;!Du_E7*`GiR^Q w)2!4MKjfSAeNo!9>IaV6aUZ*?W>} zs4%E?srLW`CJh0GCIK@hTkrW7A15Iu%N&?Q^$0+!{Tv&|t^Y@u%!L zglTg&?Q5q#ijZ;&HBQ?FNPp;k3J5!&{^+SGq?AX~SiOM9jJMRpyP?RCr@z38AQyy&WRMaC;n4una$~nJKSp?q|s8F00c9?Q! zY_ovvjTFm+DeQM^LXJ#v0}6HRt3R1%5PT*}W!k8BEM;Jrj8dIceFo2fhzTqaB3KKk zGlCLI)gU25(#u6ch6GeB1k@eHq7l{EHXv0n6xE#ws#ri}08kkCf8hUt{|Ejb`2YW* zvg}0nSSX1m=76s?sZhRY$K=3dpJ+y*eDULGnL2}4>4nvW^7_<~wIM_5fjvwt4h1|g z)g0Z6ZFq9j<~9~b8((~TN{Z?ZQfw|is&Xp~AC61sj;xItKyCHdI|tCMC_LbXF>~vR z=w6V3^H=W4CbAgR4#xw}ETTwu2guW~=Crl@SMXv85jQ=%y!s^?m4PI0My7MWICO;- z175jm%&PcPWh8QdOU(#8bp4!N7ET-+)N}N2zk2)8ch|4Q&lPFNQgT-thu053`r*h3 z_8dI@G;`zn;lH$zX3RzIk`E8~`J=BBdR}qD%n@vVG1834)!pS1Y?zVkJGtsa(sB~y zNfMYKsOJb%5J(0ivK8d+l2D2y&5X!cg3BG!AJ}910|_${nF}sC1QF^nLIhzXk-Y#x z0)&1iK!O;Og0Ky!;`b~v%b$`S4E&fB)1NB4v@8wr( z&+NX4e^&o)ecb=)dd~C!{(1e6t?&9j{l8%U*k4)?`(L3;Qjw z#w7FS+U(94MaJKS!J9O8^$)36_J8;thW#2$y9i{bB{?M{QS_inZIJ!jwqAbfXYVd$ zQ5fC$6Nc9hFi8m^;oI-%C#BS|c8vy+@{jx6hFcf^_;2VRgkoN(0h!_VSGmgNPRsxI z8$rTo0LaYq-H5i&gtj81=&xU?H-Y2==G@uQV7E`@+2E9XQW@{&j`?EOktk|Ho{HU>ZqDzvgjwBmdex z&uZNd2C1h{{}2k6Ys9$*nFP3;K%u!MhW`uZy7Sn`1M1zs@Es&;z*Z>Gsh@-3Fe6pE zQD2@cqF((NrRevgvLsvM_8;;iNyJ5nyPyy?e!kvKjGj`6diRFBEe49Oa7wwkJFV7Z z$YT&DWloYu-H?3<0BKn9L&JYDT-SK~*6c5pi18P26$JESKRYj{T7Zk6KiRJcbvOO*{P56Q6s8msbeI3>|j>K9}Q9UBeq*inXKemCm`-<5|-$ZyN4u$(3 z&HcvqehFD%5Yrmykg-^d`=BSa8(i=>ZoC77^mWY{evp(km@aHqhUECBz76YiR+VYK zY_avFC~V3$=`6C4JhfHAQ@DZtUOwH`L;oYX6zK0-uI^?hS$ALfq}A7evR;ohJHij} zHSZdW?EKv9U1s4oD*<(0oQ*;MaQ6@cvGL zuHCPgm_NhVsgp^sfr*ia^Db}swo1?O(_Q2)y+S$CBm+g=9wCOUPbz(x)_GbaKa@A7 zuI&!ynLiZRT#V%_y_-D`0Z5lT*auoe{(U5NylTzFSJW()W-#F6*&A`LNO1bV#Y;QJ zSbLBnp|B^dtK|KIWC|No>JjWBWE@n7O)x{&^E(WMeMvp57#qA8m* zeTow*U@_86B#Fm*rxyYu5PRWaWHx8y> z*qmHEp(AMDl0v)ij(AY8fnH=~ZwwjVAbu*m5;xPfidh@ov6d8g zfJsi&!QyK53Es%sC39ts;54V68koALD4b|%tNHW0bIkZAJKa=W&FomJSEDT>W1xIX z1x%Z>AvNIsSPLcn3RTcHXb@KB?cuM)=x6fcIx>&(GxqZ8w3p#jJ(GVgc*`c0HG}dv zIop&Qim!K1NFwic%07KcjWgHBPUkq7f~lj;TPqVGTiT#cUeim>;nY`>h@a*S{qQex zQ`z62WK|Mj)Y{tfF{;T4P;c8$Q|KU?Joh zIkA^z%X7z|r>4aTh@|StTi!-r1D!g=zb#3d#{{&K3CqE$Iz-UH<%37c zRfkO`&uM%#AD3PHv`g5t0e^O%nVL0d{Xlx^EjEC3#skF@`zl-7PF^0oxW)1!C!JxR zWvuAHH?)61FKA1QeT*_sY7;_Id#!GmV4n`MO{~sv}VLSK` zXRw=Y=Clz*00B(5y^K;gCZMAzjT5+c3IC=)l(9VIDdatpxj3y89WwI|bH&$!ZEvp` zPR!T@#!(|KfI-w?!&+7$N3F6>tD{YO4Qg$d_`nNEdfVCha9vaPn0jI0`)`@*72hq! zpU5ND^P*RoEkbD5o#az(-g=Y)L>HH>Oc%}$ zT3Rs_ih0;4+Lv4Y;@Iv(;fUbQ=i-G(#>vghec~*j(I#r|5mqFiJBpzi&hzEcD{u$< zRsm0BVYn=pT;0>R(itW|*D&;O%bOc7et9ACaH#J>z3A1A~6fdP>pmbM%xzm4>|;c_?B+%sl;Qs2{t!60$^u zH1t@9^6>;?!FuusnISi$f5CL&;z?EqJN$FBuWDA#D5`cy_UvCFIVvf{c?4N0teh;d zET$7aVbj08KTQS!x?Nd1Is8q8qFzs}a=!@nJ;7FSfCY^T@D-gpw`w<6e#X3+;O}1h z$%I!M)0bg|EKUA04Qjn@+x{Rj8vt6Wn!R|3A92z}^$KfF5(#CWr4y#~re1CN4i4w0 z#GsypBR{xA3Er7sgAi(|}1-W?s~n$7?K|9WL8kpVfw-;#b9 z+mn;=ep!162U5R>_t}fOt~tE?s#m( zO-S$7>Ay6*hHdZ)7_oU915WYYCIX;hFI-U2EWYX!pllONr@Q--2o~`!isi6vTPLJ4@(|o=%NHYjo0_S&q*UQIROw@*N-By@PaQ&;YxFZ0aR zX&}LeOEz);#m~Hwm^VAY8DK}b$F4bo{jMN?d!lxKPhNklzr^Cd`0f4oJr^z=I|l`* zm8AHm*fPV`0=lF3Pnnp}&J0N1X@}-D94YvmUabFrLGSnTz7Mu^21F#O5tN#CuY9Vh zUZBH=ez%h*wkf0hBtXJh1SN3d+IF{gzT7lp)j}n?03lt;XSQRAh7qd&v;RwTYDuQ# zbI2*r<>?x-G0@hM{;%{VBD7nLKt~D`T~-HAt5;h%i0_=Ifs=yHma5dhJ+QMG?Ux(a z|E?1CMy1!~oA`FP!k~iG=t&5#>bVdz=peT8HMB6Y)#7PpETtNryT^+Rv3vpJaF^zP z{H}0-LyV9Fu21ID%wO9f1IKlFr1p4c{o-?03vyB-tr5duk^&L$;m_|f$vs`^Sl{j2 z95}oY{LlY+=ZS%J+tZoXCd0*sSU7w^gjovXn+g7uyra5{cU49@yHf#Z^Jl-$9cIfo z+AJuxH$VLb=#+uBbVmUjnx zxb1pZ@-O9=AIk4@S)m6fJ2?{HrNYwwnL3a45muuNjr;6$O`bGEM0T4A2_S$t=86*- zcO+0mywg*j#A4mU}enR_!cGmIYQ;qwfchWtFEXL)AK%*;=j znYne+hS4EMy3S)C*mZ1KI>!+)0V@9!N6H$Y}~MJ{rYuf zz^KljIWvFi-?#?V@LPR&c6Nn{!=XM z>}-h$S76;$H{E{Y%@^zlmOl^efBwa%UU+jJD9UVukQ3ti_kH-?H*RC0?M1W%FCvMB zM_+v6fk$6X2sx)-p~B3&Kl{nscK}pNLM*qjtpaf9>AU{-iPKQZR8yCg!TY}Qg*(;) z)gdvCcB%kppZc$VdvsK@)3l1{&DG!d_6OHOS`y=ITLEVu`unSKA2E%JD*DVX{LJ}K z9l>hMRDqxQh0lnpGHpVYneX}eA3Pt|2v%=q;rt)``R|#bDyB)OXY&vI_@|*}h}G?^ z@aZ4_!7cQPX`!fW_?{oT1NTwHs#l5L-0`E|y@48<3Q^HFf8=Idi zpJYD%1MkII!~|7I^WGo)IF=?{>ACnjJ_WUi39C}!Q{QnheVJqeKKqq5^o5CBde(g9 zvw$X6^jz_^E2$wSw4!q5*RG(C2_^XO$HBn_55vbl44OnTTRwRaePP0vo{K)U1#99& z<>rq7V&V(<&@I%MFoN5zrY}sz=(*-L&}1QQ*a%`u25h{cFj===17eB_uGuzG&byQ< zrm8BJZl4r_E$3k|Wo6FW0-6M7>qac5uFQsQcmkLWGfeH74S3Z_rJ!jgN++!@i=HW8 zkyjI(oPH-+-N#Qc^-mpNO`bc6r=2-<%&Wy5K1vfFJB(L_IkpS6fY^NmuL8qsgj>MD zn~BHH9WM~32_3vd=W&B)k7F9q%stJx+b_L_X-4zr^LVUMCmyCTA3sWtkvsmME?Xiy z?xOSfB=_$oY06~J-HcCq&)qcW{j;uP;?Dm}=hkq?zh&n!;m((-G-u_t|6x399Q;>A zgNpxoJNj{u|MFDH7Rhq@FCAl0dE|ddnl!oh9{Lq?@JDoR6L;C941IK`ISfdE$4S zE0AUQ8+2|Ncl_q5QkSp#AODp~(^mfP&%Au@@|TBQwoP`UU+V{6u8|)6ZA{~uKmQ*M zmrMTDU8S~8Eqi{^v0Ug&5Upcm#y7Z1(RbgZAG8jB$eRwCspQ)>5;U)oGZ&E5aeR*K z8Yt`Y0$G))Yd(Y3KH}tA4`-_QmNke5hU_|nq=xtyjwW(_o?itz>B>WM&^63bNdQ)k@-IgDHW*RW$Xo9#RzrTrCn7L2H{9Amq|qNg@#eZY=|P zCoI?2s+L)zsM%WX(NbVEY^`C>lFjIBYmJ6@DKJ0ZT4&F&WHW!dwa%QzOG!?jY_2(S zDcEzZbz*2Q!43|z))9yOP9X1Xt%DXzwY(3tl-TR=Qb_MbZYRrooh;dYYmS!U_as1(=YVB?Q_A|tNu5Ut&_q3jbfDM zoFxT^uEuH`nX3*sB%K?GuHUkweYReBwnHqh3P)~`+s3+Tj!rDA1e)8vuBv5J*IsxC zkd^~b(aGzArj08{>cnzOuy04C+C`}gb|Yz-1avxeWzev3NzcHbz_&4W@QCr$z3~w=8Ua- z`;vfG1~BP8CyLb=F7t1am~ph_#|O%$khSJ9%Vtcn)YmpgQxF?xM^_Vb+5fnpB^W0I`f%X8gb9#X{Q-yJG0{Z56aWeI&zPxnf5pdJA38bM`cYnS#x)% z`n1tFf$i)W-hGm(f9mde^=X@NcV_lFb=P`4&CI&H=IArijGwdCk&X@uQ$5xmj!~^? z#$ROCI)V-~t%L%GS#wo@U27ddR`4`3)WoB{R-4snfNrfee|kI8^bu#yDgYqOwas9# zmcb`3!kRJ`Cr=_tq)8aMt{aGtUZsqwVlj6DgCGre>AEt&x8H_in!x@uwgExIh|-mA zjdaC(29~CTVSaaF7HPbql&*9Uo8P@f)>LqCXclr}peS7_1BQ28u9PO8Eq1@`l3q9o zkfKCaO2?T?ZyA6loW<#9_c^O=m<&h}CA!ineAD@=(gbq`vyT|tiJ6#^B1$P;;qax` z55k&Q?wEh#87niLo*+n4L@65J(Nz~=Ya%7^(miLb(E>A3B@|Jjl;FU&D>o|9#7PJH z?|ago!o;WC^h=|T7PVBg(DAB}72cyUS zb(f>Bwbr!F1eTCO5fpj<{PqhY5>143p?~5ZA5H40);=@M#MYvrB6gqHbU_!GSY??i z%s=>-ciA4*zOOZHds0a(kWewZ4h(k8h(ua7HX)Au&mY~H8KY6(_cb$_&fA@QjIW-*heP3%$d!m5^AdnT}`12qA^c@!g3DOwZ5WwE2?)-yU z!)Vx#Mtxt?FzFTwK!77sy7)sMzUd->w4^bxtpM2j!b1pjgyk zGKwWGeb4)^zjy{9Es&PU1}gwg?|J#L$KJB7ett9@4M%-nGtIQr0>Fl@8-yh`-+1ed zS6r}(MeSvgSoFmH*_WPu@i?}!AB~2?;i&IxrkNg~cQ9Som98tcq)k^|eeER|Zl77t za-TVUc;DNvzVXJ%w52+#weN?+;i#{f#!Oc&z?81*N>^e~ltRS%ZI@lR{rs()HmqG! zx*}ZrI-EZ}ckJMiy>A^oofwDfC~IH)z8{VHKGT@#E5I(Ll&+MnMCl>~AV7+>Gi%mF zkU1QlKASdR0B80!YhP<$Ywi0?W2Ux45oPfxv9QolWzJPD^weBfvo4SONxP35106sAmh(e+vAs0GboFD@PvNs)jNPvarhW}0YliZEg{Gazv z+JDIpoojRVPr<*C|BTq<`6ga{5q^8^!|0cxe=rZ!zxH3%f5ZO0cQ*Z<^$Yt2{|Ek0 zyT|*F+CO@K;(owBKtGg!S^xj-Z~rga2m6nxKl9J=fBSuNKW_dLKWhJKeg^-Xe`^1? z`TyJj)8E!#>_3Y?uKrwqq3LJ#SGU>AzUO|6`nR^u&3FNN_jGOc zw)Nw`wr3yIKhgcee6IaN=ws>M{6677%)hPwx&HzC(f&u~&)6@b2kNRzBDQAP0*H73 zq%McOmRk{B3i47qRe=DA*$&odrbEJZ*pV9XXa&p@wlW~@Yfs>V{yiTtplMhgM*-Bz zsSnlq&pG;z0OUN%$~$3=g1UF+G*>+17eRbBf3=y79J}KR8owon@$1Z7MIrvvWWH)34nK2SD)GsrJ{l z1Cl#oVo3A8qY3e=aF)qzms~FG#2$LzT=gs&aVMOj>(%{y<&O0cG!nCiESl~x=^dF{ zKvj8F1K8Ng171wwM5Fh4KoQw`_c6#y$(5cAm7e}~nJ#A*fx+c9;y#&W!#VukR)ugk zKp3=+;Ut+IYn%m+r4d*<`L2h%aDnX5}^!5R|H;(34AoVWjRx(msBZvk;rCI*|~ zdOijqI@9Z{Vu!~jvHW{lBa$rnl4+!s_5sfK3bCGk-B%iDe&@-}+%fOKU|(9?V1 zHE8&@4z)Kx!RAvAs z!Wic9=o#(bg?kc-G68-m(jZ`^=XGUXb)}t(%&~sjFnV^sEX%hSy6UKC4iOhgV=BHV z2w`4g7Y=s#Vu2B_?#VQ|hP39@eArgfX>-0S+dd&^mx0*wp}>)x;c4RUgxz%;oNe?& z-7-lJ@Y^2^C;=qJsxx5|xF)*pTGhch2B&kxtn;f!7=gznk}I3}Dh}(CoMXgA5-p&kS202!l?!fT3t|HG*rIP~mS* z$Wjo}jq3}z$Qq!9yrtd3fM0N629ZM?LU$nv@Tv9b7I;D|;0H2dsA~g7Z7zp1| zB)XmrkMgF6OQr|R)HHD^TE{Y#j!~SR?b`Xt3Qs`B+x<hxexYeAjMUWdZ-*n9%(1)Wb(n2U<><7&9dwGJmrob)4%H? zlQ%z+L-^$dFhhH|@u$%97Qz?*Ynh2VG@q|?8vY&L74&fs&_b&3$x&Oyjl~LQDRRap zJU4U*R+(2Dd!G+lh8!V{pT_UJn+^1Qg6$` zqkNm(a#hWyc6SP+p5=C4HL8-m`pO`5o~`-LI?_h5CsH?F_%?nDodmz&pWR20WTpJE z?N|wSzLjMUK8E)a2tI}Lf;+;*M|h3Y(U#>)g1>zk9|Hd}oZAa2 zLYBWBoSW!Ts!RwXr^8h+U*@{9{zqS^iH)Op<;r`Uw~nc}<^$V~_i%$GFjaG?X1@E|M`h)nekvFKt`Dh-f>@|0-`Xoq)o` zx;JmzDfOV9qCx|EVpogEe0LK~tGS?5$$L_i6P$P6wIsCQaP_;d{{N=iV@+8LI}o#( zvo*Ejy=IIn{rdIQh1&q-{EuohpVOjJ^Q3lD*YTp37$^RRgn8ihpdu5{Ct%5-KO!VL zcNB6dUajXI9jkm-P|i3~GB-A(X`P1Oqqb$tcku)UJw0w3GeUijb__#QT4j%64z%EeB7S?jlWwx_7&+EEvB|6N=kV}DwnyAlX=?j`) zmU#!$*^@NIu#n_d7;WoJV@*Fbv9|yJO4;n|BNF2xy(54RyB>t~8lUOUW$&2%Nwi1y zx6JxW88>U2$#qhl^6KUbtmg9}D0o5vYDT7kWJthLGkpGnN4T>{St^_EU>4;DmLF9o zr|LqsA8_MoNLQ=}w?8u!ziSZ@PC#Y<#9uJFo-ozVo6D;<8j^1$c|qAE3ZTE5i~zmE z$BU5lw6l=EWsg^y^;8>r9qH{xfL|~PZYK#md$zZ0?o11gV<*WSW~cgy2GYGQir%wf zt4iW8D+;s*;RGrmd(-T<@2&j(Cb9xhV*l-x`TpK`xq|7p?5R%5*s!69?2c!cC*VY* z2DE^9pvOPLU!1e}wA8S8opcTJ3`NB>hY=JQnL~QFXR4K8A$BqJnoEB$wn-%u@E6Mh zCfMF4kusv3N!(aHC}4)Xs^xoOwXd%e^6pi5|DZo=Q25j+6HlJ^7FodH6y1bMROR^q zGu6)fopS`h%Sw<;ZH%TEPf+#81-#_v+@8nlR0jLcIDKQtLleOC)6yLZgC!D9X3GgS zohwU{v$jl=quD#Go^hB{`@Qw*a%`(^jyT~=q^bWgGzRj;|12J55HWdCWV}EB|K=%N z3Nq-qxJJ`>^|1MNN+q}zTB&ooE3j==AgK@^UW<^oSbeALa2peF)Th6{@sj0KyMNHZ zksk1+MXN2tv+22A%cQOGpS9)77(uP9mh+!5T5ERLvF@b}$+WvXM45Z?-kCa)fb~f1 znVbTD$Gx-0Zxc`0D@YgHakge6SL0H`-vN_x?AP0>iGH0_EE&=v83hMJgaKAI0jJXm zVxVz;X<$v6WW7}fxROO7vr#YLP;;lij5VrX{;>7kK6TtOH&6|Ar^xo>00%+u$C4@# z>!jOt6*3><171+WxoZnKDTzJtDRw+T030;yI}~uV@9fCnei^I*j>Bp&mzP2d=FPb_ zCM*l_+$LDR3B*a!A$g#>xsrZvw0lckxmMg>0aQd7tPyN=t{dgXb;Ie+T8{fZH=gdu zM7Rg9c(kg(Jg0?ARRRl=AONFKrvFj)lTY$KfT%6^6s`mk*ABGhsce*LsoD>K{z_M2 ziPpnu+lw22PfF!CoId^6n*G4H(Ix+#+N{C(da7t1BYMGEaE#PdpOLxsVD5riQXHp@OX;`S`8VnpM~)I920w~<3|mo0 zf8~Az`*?2?H&gZ&*K&bRkV@qzvMlRHXys8*Ze2+1c?5o!^+$&MHxB@4Ee5cke52R! zmn7AZtY6ST%ixgU5)%$%QcwHj7Es-Qu^kLAPwy%7pGBw_4Q9#da^W2$}axNHr03)_nw z5?yuNmXrI5HgS46)c5&}B)Tts49oU92>3xBLLy}FMUW=84DQbVq^;7_e7|(Sdz|&J z73N+M`rc2rt*oSWu#7S{*s~nH6HRHJS1SmzeXk|;CA)FI4bat3<%}nkB%;;?=F>B7ms9QSxv#@+69;@>QaR?REYX4&)=itG>rM{<{A79Rmk)`5ON#GL`*KX%}Ihk3w(RtM-WLt z?f&FLF}4N^yE!(pZ&Yj&Bc`~K0@4_}*0Om?wN|}4WJ>WL;G^H2*QpgEkGA~OET-Km zkwz|5{6dnz1U<2Pe9DNL>3g5FEIvp1jzP&2K#z~j%g6!7B;^zF+o95?fV{3mnB8*RMhCDNp>Am-3e@jNfMj?jHV$MWjk!DDKP zkAz$Y?Sr)!GUOX}qTQ5aMh|wq1uq}~joWyKl=b_LboM#wi{CMuz5x6BKlA-qy++cM01D3b7`uD z#l6M4pI;JCypO8JZ6?U&wNxR!{4oB_ zlV!x9+-&Qy6{%MQ{~yoZGkKiTSC`YS_j22~G;xUV855g2&C(zm^V!(wpcm@zn{%!g z4}JGo(sGZ1O~to-}le

UmY2RIYtNPVDpE$%vda+HD#3m z&VuXJ{BK&Qe+rBa7eq}Q(bq|tn(RrJAk|ztj2(i{d>nmQnM?;HF2k&9sA6up5tmjl z7lySlzMbifH17-m-Lwa_F&e7nOH?ESi3#ckR3tsM+jsck3`oG!uMS}|eAwVXv>}qxwq?QY%QJ0}r@^;fhuUA9W z*BVl>TGo&N004@xSiwDUXUvp51sVmqO3m)=B55aPwf@0=e}cN+$-BdKxY`YrT_4)0 z_d10#i44Q*rFr8MC>*)v$EJvz``(pb{e&*6k+b zsMz%($|1+8hn8c2?P(l@;Rb&CsZeYoCI3?2!LqjbwPXW3z4G$Qfj=cT5Yb%vY0(AX oeb?AaKtwrnc|$|zzw9vfvn^aJJ!zd)XFXqqy0000001=f@-~a#s literal 0 HcmV?d00001 diff --git a/app/src/main/res/values/attr.xml b/app/src/main/res/values/attr.xml index 31a94cd..5b0a918 100644 --- a/app/src/main/res/values/attr.xml +++ b/app/src/main/res/values/attr.xml @@ -28,4 +28,9 @@ true + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/color.xml b/app/src/main/res/values/color.xml index f9e1047..04c52f4 100644 --- a/app/src/main/res/values/color.xml +++ b/app/src/main/res/values/color.xml @@ -17,5 +17,13 @@ #10000000 #e5e5e5 + #396BD0 + #5B5A5E + #333333 + #FFFFFF + #F9FAFB + #FFFFFF + #EBEBEB + #FFFFFF \ No newline at end of file diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index c4efc82..75595e3 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -1,6 +1,13 @@ + 20dp + 20dp + + 14sp + 13sp + + -1559.52dp -1558.08dp -1556.63dp diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 96da30f..407f6a2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -340,4 +340,8 @@ 备注里包含关键词的所有记录都将被筛选 排序 + 首页 + 仪器 + 我的 + \ No newline at end of file