Skip to content

A
android_freeworld
Commit dc4a0baa authored by fengruiyu's avatar fengruiyu
Browse files
Options

Merge branch 'dev_1.0.0' of http://39.97.65.143:81/android/android_street into fry_dev

parents c3d41506 8bdad791
Hide whitespace changes
Inline Side-by-side
Showing with 280 additions and 340 deletions
app/src/main/AndroidManifest.xml
View file @ dc4a0baa
......@@ -11,8 +11,7 @@
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <!-- 访问网络，进行地图相关业务数据请求，包括地图数据，路线规划，POI检索等 -->
<uses-permission android:name="android.permission.INTERNET" /> <!-- 调用相机，用于实现扫描二维码，预览个性化地图编辑器生成的个性化地图样式（开发者实际开发中地图SDK不需要该权限） -->
<uses-permission android:name="android.permission.CAMERA" /> <!-- 获取手机状态信息 -->
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
<!-- android10以后 后台运行位置 -->
<uses-permission android:name="android.permission.READ_PHONE_STATE" /> <!-- android10以后 后台运行位置 -->
<uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
<application
......@@ -26,6 +25,7 @@
android:supportsRtl="true"
android:theme="@style/AppTheme"
android:usesCleartextTraffic="true">
<activity android:name=".main.vr.DetailedActivity"></activity>
<uses-library
android:name="org.apache.http.legacy"
......@@ -51,12 +51,10 @@
android:value="${SHARE_KEY}" />
<meta-data
android:name="Mob-AppSecret"
android:value="${SHARE_SECRET}" />
<!--百度地图开放平台 -->
android:value="${SHARE_SECRET}" /> <!-- 百度地图开放平台 -->
<meta-data
android:name="com.baidu.lbsapi.API_KEY"
android:value="SD6luBGzUFSVEZ3n9Xjk3xTsvDFmuRCi" />
<!-- 百度地图开放平台 service -->
android:value="SD6luBGzUFSVEZ3n9Xjk3xTsvDFmuRCi" /> <!-- 百度地图开放平台 service -->
<service
android:name="com.baidu.location.f"
android:enabled="true"
......@@ -71,21 +69,20 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name=".login.LoginActivity"></activity>
<activity android:name=".login.LoginActivity" />
<activity
android:name=".main.MainActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:launchMode="singleTask"
android:theme="@style/AppTheme.NoneTranslucent"></activity>
android:theme="@style/AppTheme.NoneTranslucent" />
<activity android:name=".main.my.MoresettingsActivity" />
<activity android:name=".main.my.AboutusActivity" />
<activity android:name=".main.my.PermissionsActivity" />
<activity android:name=".main.my.OpenvipActivity" />
<activity android:name=".main.home.HistoricalimageActivity" />
<activity android:name=".main.my.BindMobileActivity" />
<activity android:name=".splash.GuideActivity"/>
<activity android:name=".main.home.SearchMapActivity"/>
<!-- ShareSDK start -->
<activity android:name=".splash.GuideActivity" />
<activity android:name=".main.home.SearchMapActivity" /> <!-- ShareSDK start -->
<activity
android:name="com.mob.tools.MobUIShell"
android:configChanges="keyboardHidden|orientation|screenSize"
......@@ -165,9 +162,7 @@
android:screenOrientation="behind"
android:windowSoftInputMode="adjustResize|stateHidden" />
<activity android:name=".main.vr.PanoramicActivity" />
<activity android:name=".webview.MintsWebViewActivity">
</activity>
<activity android:name=".webview.MintsWebViewActivity"></activity>
</application>
</manifest>
\ No newline at end of file
app/src/main/java/com/mints/street/adapter/EnterDestinationAdapter.kt
View file @ dc4a0baa
......@@ -23,15 +23,15 @@ import me.tatarka.bindingcollectionadapter2.ItemBinding
* Created by 冯瑞雨 on 2021/7/9.
*/
class EnterDestinationAdapter(val context: Context,val bean :List<VrmapBean.Abroad>?):
AbstractVLayoutBaseAdapter<EnterDestinationAdapterBinding, List<VrmapBean.Abroad>?>(context,bean,1) {
AbstractVLayoutBaseAdapter<EnterDestinationAdapterBinding, List<VrmapBean.Abroad>?>(context,bean,1) {
private var vLayout: VirtualLayoutManager? = null
private var mAdapter: DelegateAdapter? = null
override fun onBindViewHolder(
holder: BindingViewHolder<EnterDestinationAdapterBinding>,
position: Int) {
holder: BindingViewHolder<EnterDestinationAdapterBinding>,
position: Int) {
vLayout = VirtualLayoutManager(context, VirtualLayoutManager.HORIZONTAL)
mAdapter = DelegateAdapter(vLayout,false)
......
app/src/main/java/com/mints/street/adapter/GridMapAdapter.kt
View file @ dc4a0baa
......@@ -27,9 +27,9 @@ class GridMapAdapter(val context: Context, var list: List<VrmapBean.Internal>?)
var a = holder.binding.bg.layoutParams
if (position % 2 == 0) {
holder.binding.bg.setMargin(AppUtils.dp2Px(context, 10F), AppUtils.dp2Px(context, 10F),
AppUtils.dp2Px(context, 10F), 0, null, null, null)
AppUtils.dp2Px(context, 5F), 0, null, null, null)
} else {
holder.binding.bg.setMargin(0, AppUtils.dp2Px(context, 10F), AppUtils.dp2Px(context, 10F),
holder.binding.bg.setMargin(AppUtils.dp2Px(context, 5F), AppUtils.dp2Px(context, 10F), AppUtils.dp2Px(context, 10F),
0, null, null, null)
}
......@@ -61,9 +61,9 @@ class GridMapAdapter(val context: Context, var list: List<VrmapBean.Internal>?)
override fun getItemCount() = list!!.size
override fun onCreateLayoutHelper(): LayoutHelper {
val hp : GridLayoutHelper= GridLayoutHelper(2)
val hp: GridLayoutHelper = GridLayoutHelper(2)
hp.setAutoExpand(false)
return hp
return hp
}
......
app/src/main/java/com/mints/street/adapter/GridPaymentAdapter.kt
View file @ dc4a0baa
......@@ -71,9 +71,9 @@ class GridPaymentAdapter(val context: Context, val list: List<VipBean.ListBean>)
fun getPosition() = mposition
override fun onCreateLayoutHelper(): LayoutHelper {
val hp : GridLayoutHelper= GridLayoutHelper(3)
hp.setAutoExpand(false)
return hp
val hp: GridLayoutHelper = GridLayoutHelper(3)
hp.setAutoExpand(false)
return hp
}
}
......
app/src/main/java/com/mints/street/adapter/GridVrMapAdapter.kt 0 → 100644
View file @ dc4a0baa
package com.mints.street.adapter
import android.content.Context
import android.content.pm.ActivityInfo
import android.view.Window
import android.view.WindowManager
import androidx.recyclerview.widget.RecyclerView
import com.alibaba.android.vlayout.LayoutHelper
import com.alibaba.android.vlayout.LayoutView
import com.alibaba.android.vlayout.layout.GridLayoutHelper
import com.fry.base.adapter.AbstractVLayoutBaseAdapter
import com.fry.base.adapter.BindingViewHolder
import com.fry.base.binding.setMargin
import com.mints.street.R
import com.mints.street.databinding.ItemGridVrmapAdapterBinding
import me.goldze.mvvmhabit.utils.AppUtils
class GridVrMapAdapter(val context: Context, var list: List<String>?) :
AbstractVLayoutBaseAdapter<ItemGridVrmapAdapterBinding, List<String>>(context, list, 2) {
override fun onBindViewHolder(
holder: BindingViewHolder<ItemGridVrmapAdapterBinding>,
position: Int
) {
var a = context.resources.displayMetrics;
val bgLayoutParams = holder.binding.bg.layoutParams
bgLayoutParams.height = (a.widthPixels * 0.5).toInt()
if (position % 2 == 0) {
holder.binding.bg.setMargin(AppUtils.dp2Px(context, 10F), AppUtils.dp2Px(context, 10F),
AppUtils.dp2Px(context, 6F), 0, null, null, null)
} else {
holder.binding.bg.setMargin(AppUtils.dp2Px(context, 6F), AppUtils.dp2Px(context, 10F), AppUtils.dp2Px(context, 10F),
0, null, null, null)
}
}
override fun getItemCount() = list!!.size
override fun onCreateLayoutHelper(): LayoutHelper {
val hp: GridLayoutHelper = GridLayoutHelper(2)
hp.setAutoExpand(false)
return hp
}
override fun getLayoutId(viewType: Int) = R.layout.item_grid_vrmap_adapter
}
\ No newline at end of file
app/src/main/java/com/mints/street/adapter/ItemEnterDestinationAdapter.kt
View file @ dc4a0baa
......@@ -15,17 +15,17 @@ import com.mints.street.databinding.ItemEnterDestinationAdapterBinding
* @param isMultipleLayout 是否是多布局
*/
class ItemEnterDestinationAdapter(
val context: Context,
private val isMultipleLayout: Boolean,
val list: List<VrmapBean.Abroad>?
val context: Context,
private val isMultipleLayout: Boolean,
val list: List<VrmapBean.Abroad>?
) : AbstractVLayoutBaseAdapter<ItemEnterDestinationAdapterBinding, List<VrmapBean.Abroad>?>(
context,
list,
1
context,
list,
1
) {
override fun onBindViewHolder(
holder: BindingViewHolder<ItemEnterDestinationAdapterBinding>,
position: Int
holder: BindingViewHolder<ItemEnterDestinationAdapterBinding>,
position: Int
) {
var a = context.resources.displayMetrics;
val bgLayoutParams = holder.binding.bg.layoutParams
......@@ -42,15 +42,15 @@ class ItemEnterDestinationAdapter(
when (index) {
0 -> {
ImageLoader.ImageBuilder.with(context)
.setUrl(url[index]).setTargetView(holder.binding.image1).start()
.setUrl(url[index]).setTargetView(holder.binding.image1).start()
}
1 -> {
ImageLoader.ImageBuilder.with(context)
.setUrl(url[index]).setTargetView(holder.binding.image2).start()
.setUrl(url[index]).setTargetView(holder.binding.image2).start()
}
2 -> {
ImageLoader.ImageBuilder.with(context)
.setUrl(url[index]).setTargetView(holder.binding.image3).start()
.setUrl(url[index]).setTargetView(holder.binding.image3).start()
}
}
......
app/src/main/java/com/mints/street/main/my/MoresettingsActivity.kt
View file @ dc4a0baa
package com.mints.street.main.my
import android.content.res.ColorStateList
import android.graphics.Color
import android.os.Bundle
import android.view.View
......@@ -11,7 +10,6 @@ import com.fry.base.base.BaseActivity
import com.mints.street.BR
import com.mints.street.R
import com.mints.street.databinding.ActivityMoresettingsBinding
import com.mints.street.main.MainActivity
import com.mints.street.manager.UserManager
import com.mints.street.webview.MintsWebViewActivity
import kotlinx.android.synthetic.main.activity_moresettings.*
......@@ -34,7 +32,7 @@ class MoresettingsActivity : BaseActivity<ActivityMoresettingsBinding, Moresetti
override fun initData() {
super.initData()
StatusBarUtil.setHeightAndPadding(this, binding.btnSwitch)
StatusBarUtil.setHeightAndPadding(this, binding.elView)
initView()
initListener()
......
app/src/main/java/com/mints/street/main/vr/DetailedActivity.kt 0 → 100644
View file @ dc4a0baa
package com.mints.street.main.vr
import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
import android.view.View
import android.widget.TextView
import com.alibaba.android.vlayout.DelegateAdapter
import com.alibaba.android.vlayout.VirtualLayoutManager
import com.fry.base.base.BaseActivity
import com.mints.street.BR
import com.mints.street.R
import com.mints.street.adapter.GridMapAdapter
import com.mints.street.adapter.GridVrMapAdapter
import com.mints.street.databinding.ActivityDetailedBinding
import com.mints.street.databinding.ActivityMoresettingsBinding
import com.mints.street.main.my.MoresettingsViewModel
import kotlinx.android.synthetic.main.activity_detailed.*
import me.goldze.mvvmhabit.utils.KLog
import me.goldze.mvvmhabit.utils.systembar.StatusBarUtil
class DetailedActivity : BaseActivity<ActivityDetailedBinding, DetailedViewModel>(), View.OnClickListener {
override fun initVariableId() = BR.viewModel
override fun initContentView(savedInstanceState: Bundle?) = R.layout.activity_detailed
private var vLayout: VirtualLayoutManager? = null
private var mAdapter: DelegateAdapter? = null
private var gridVrMapAdapter: GridVrMapAdapter? = null
override fun initData() {
super.initData()
initView()
initListener()
}
private fun initListener() {
}
private fun initView() {
//初始化布局管理器
// if (this == null) return
vLayout = VirtualLayoutManager(this!!);
mAdapter = DelegateAdapter(vLayout, false)
binding.listview.layoutManager = vLayout
binding.listview.adapter = mAdapter
if (gridVrMapAdapter == null) {
gridVrMapAdapter = GridVrMapAdapter(this,
listOf("1", "2", "3", "1", "2", "3", "1", "2", "3", "1", "2", "3", "1", "2", "3"))
KLog.e("aaa", "${this.window.decorView.width.toFloat()}")
mAdapter?.addAdapter(gridVrMapAdapter)
mAdapter?.notifyDataSetChanged()
}
}
override fun onClick(v: View?) {
}
}
\ No newline at end of file
app/src/main/java/com/mints/street/main/vr/DetailedViewModel.kt 0 → 100644
View file @ dc4a0baa
package com.mints.street.main.vr
import android.app.Application
import me.goldze.mvvmhabit.base.BaseViewModel
class DetailedViewModel(application: Application) : BaseViewModel(application) {
}
app/src/main/java/com/mints/street/main/vr/VRFragment.kt
View file @ dc4a0baa
......@@ -109,7 +109,7 @@ class VRFragment : BaseFragment<FragmentVrBinding, VRViewModel>() {
//未选中颜色
normalColor = Color.BLACK
//选中颜色
selectedColor = ContextCompat.getColor(context, R.color.main_color)
selectedColor = ContextCompat.getColor(context, R.color.main_blue_lower)
//点击事件
setOnClickListener {
viewPager.currentItem = index
......@@ -129,7 +129,7 @@ class VRFragment : BaseFragment<FragmentVrBinding, VRViewModel>() {
startInterpolator = AccelerateInterpolator()
endInterpolator = DecelerateInterpolator(2.0f)
//线条的颜色
setColors(ContextCompat.getColor(context, R.color.main_color))
setColors(ContextCompat.getColor(context, R.color.main_blue_lower))
}
}
}
......
app/src/main/res/drawable/cursor_bg.xml
View file @ dc4a0baa
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners
android:topLeftRadius="15dp"
android:topRightRadius="20dp" />
android:topLeftRadius="30dp"
android:topRightRadius="30dp" />
<solid android:color="@color/white" />
</shape>
\ No newline at end of file
app/src/main/res/drawable/shape_bg_vrdata.xml
View file @ dc4a0baa
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#80FFFFFF" />
<corners android:radius="5dp" />
<corners android:radius="15dp" />
</shape>
\ No newline at end of file
app/src/main/res/drawable/vr_item_bg.xml 0 → 100644
View file @ dc4a0baa
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners
android:topLeftRadius="15dp"
android:topRightRadius="20dp" />
<solid android:color="@color/white" />
</shape>
\ No newline at end of file
app/src/main/res/layout/activity_detailed.xml 0 → 100644
View file @ dc4a0baa
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
tools:context=".main.vr.DetailedActivity">
<data>
<variable
name="viewModel"
type="com.mints.street.main.vr.DetailedViewModel" />
</data>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<View
android:id="@+id/view_bg"
android:layout_width="match_parent"
android:layout_height="220dp"
android:background="#668BFF" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<com.fry.base.ui.widget.CommonTitleBar
android:id="@+id/ctb_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:ctb_theme="light"
app:ctb_title="街景" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="20dp"
android:paddingLeft="15dp"
android:text="巴黎嫩亮点"
android:textColor="@color/white"
android:textSize="16sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="15dp"
android:paddingTop="5dp"
android:textSize="12sp"
android:text="巴黎嫩作为文化十字路口的历史可以追溯到数千年前。探索其古老的以及和自然奇观。" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/listview"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="20dp"
android:paddingLeft="6dp"
android:paddingRight="6dp"
android:background="@drawable/vr_item_bg"/>
</LinearLayout>
</FrameLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/activity_moresettings.xml
View file @ dc4a0baa
......@@ -17,7 +17,7 @@
<com.mints.street.widget.ElasticScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:overScrollMode="never">
<LinearLayout
......@@ -63,6 +63,10 @@
android:text="退出登录"
android:textColor="@color/white"
android:textSize="16sp" />
<View
android:id="@+id/el_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</LinearLayout>
......
app/src/main/res/layout/item_grid_map_adapter.xml
View file @ dc4a0baa
......@@ -13,7 +13,7 @@
<LinearLayout
android:layout_margin="15dp"
android:id="@+id/bg"
android:layout_width="match_parent"
android:layout_width="100dp"
android:layout_height="230dp"
android:background="@drawable/shape_bg_vrdata"
android:elevation="5dp"
......@@ -28,9 +28,8 @@
android:id="@+id/tv_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="10dp"
android:padding="10dp"
android:text="测试"
android:paddingTop="5dp"
android:textColor="@color/black"
android:textSize="12sp" />
......@@ -41,23 +40,6 @@
android:orientation="horizontal">
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center"
>
<com.mints.street.widget.RatingStar
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_marginStart="10dp"
android:layout_weight="1"
app:starNormal="@mipmap/star_icon"
app:starNumber="5" />
</LinearLayout>
</LinearLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/item_grid_vrmap_adapter.xml 0 → 100644
View file @ dc4a0baa
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android">
<data>
<variable
name="viewModel"
type="com.mints.street.adapter.GridVrMapAdapter" />
</data>
<LinearLayout
android:id="@+id/bg"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_margin="15dp"
android:background="@drawable/shape_bg_vrdata"
android:elevation="5dp"
android:orientation="vertical">
<com.mints.street.widget.XCRoundRectImageView
android:id="@+id/image"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:src="@mipmap/icon_card1" />
<TextView
android:id="@+id/tv_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="10dp"
android:text="测试"
android:textColor="@color/black"
android:textSize="12sp" />
<LinearLayout
android:id="@+id/ly_star"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
</LinearLayout>
</LinearLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/view_data_page1.xml
View file @ dc4a0baa
......@@ -7,38 +7,4 @@
android:paddingLeft="15dp"
android:paddingTop="20dp">
<TextView
android:id="@+id/tv1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:text="无线放大不模糊"
android:textStyle="bold"
android:textColor="#99000000"
android:typeface="serif"
android:textSize="20sp" />
<TextView
android:id="@+id/tv2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv1"
android:textColor="#99000000"
android:layout_marginBottom="15dp"
android:text="地面也能看清楚"
android:textSize="12sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv2"
android:layout_marginBottom="10dp"
android:background="@drawable/shape_bg_openvipcard"
android:paddingLeft="20dp"
android:paddingTop="7dp"
android:paddingRight="20dp"
android:paddingBottom="7dp"
android:text="立即领取"
android:textColor="#CCFFFFFF"
android:textSize="14sp" />
</RelativeLayout>
\ No newline at end of file
app/src/main/res/layout/view_data_page2.xml
View file @ dc4a0baa
......@@ -7,38 +7,5 @@
android:paddingLeft="15dp"
android:paddingTop="20dp">
<TextView
android:id="@+id/tv1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:text="3D高清街景"
android:textStyle="bold"
android:textColor="#99000000"
android:typeface="serif"
android:textSize="20sp" />
<TextView
android:id="@+id/tv2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv1"
android:textColor="#99000000"
android:layout_marginBottom="15dp"
android:text="提供全休个城市高清实景"
android:textSize="12sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv2"
android:layout_marginBottom="10dp"
android:background="@drawable/shape_bg_openvipcard"
android:paddingLeft="20dp"
android:paddingTop="7dp"
android:paddingRight="20dp"
android:paddingBottom="7dp"
android:text="立即领取"
android:textColor="#CCFFFFFF"
android:textSize="14sp" />
</RelativeLayout>
\ No newline at end of file
app/src/main/res/layout/view_data_page3.xml
View file @ dc4a0baa
......@@ -6,39 +6,4 @@
android:gravity="center_vertical"
android:paddingLeft="15dp"
android:paddingTop="20dp">
<TextView
android:id="@+id/tv1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:text="VR全景视角"
android:textStyle="bold"
android:textColor="#99000000"
android:typeface="serif"
android:textSize="20sp" />
<TextView
android:id="@+id/tv2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv1"
android:textColor="#99000000"
android:layout_marginBottom="15dp"
android:text="720度沉浸式体验"
android:textSize="12sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv2"
android:layout_marginBottom="10dp"
android:background="@drawable/shape_bg_openvipcard"
android:paddingLeft="20dp"
android:paddingTop="7dp"
android:paddingRight="20dp"
android:paddingBottom="7dp"
android:text="立即领取"
android:textColor="#CCFFFFFF"
android:textSize="14sp" />
</RelativeLayout>
\ No newline at end of file
app/src/main/res/layout/view_data_page4.xml
View file @ dc4a0baa
......@@ -2,43 +2,8 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@mipmap/icon_card4"
android:background="@mipmap/icon_card3"
android:gravity="center_vertical"
android:paddingLeft="15dp"
android:paddingTop="20dp">
<TextView
android:id="@+id/tv1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:text="2D/3D任意切换"
android:textStyle="bold"
android:textColor="#99000000"
android:typeface="serif"
android:textSize="20sp" />
<TextView
android:id="@+id/tv2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv1"
android:textColor="#99000000"
android:layout_marginBottom="15dp"
android:text="3D立体效果更真实"
android:textSize="12sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv2"
android:layout_marginBottom="10dp"
android:background="@drawable/shape_bg_openvipcard"
android:paddingLeft="20dp"
android:paddingTop="7dp"
android:paddingRight="20dp"
android:paddingBottom="7dp"
android:text="立即领取"
android:textColor="#CCFFFFFF"
android:textSize="14sp" />
</RelativeLayout>
\ No newline at end of file
app/src/main/res/layout/view_data_page5.xml
View file @ dc4a0baa
......@@ -2,43 +2,9 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@mipmap/icon_card5"
android:background="@mipmap/icon_card4"
android:gravity="center_vertical"
android:paddingLeft="15dp"
android:paddingTop="20dp">
<TextView
android:id="@+id/tv1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:text="查询国外地址"
android:textStyle="bold"
android:textColor="#99000000"
android:typeface="serif"
android:textSize="20sp" />
<TextView
android:id="@+id/tv2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv1"
android:textColor="#99000000"
android:layout_marginBottom="15dp"
android:text="无需翻墙也可能看国外街景"
android:textSize="12sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv2"
android:layout_marginBottom="10dp"
android:background="@drawable/shape_bg_openvipcard"
android:paddingLeft="20dp"
android:paddingTop="7dp"
android:paddingRight="20dp"
android:paddingBottom="7dp"
android:text="立即领取"
android:textColor="#CCFFFFFF"
android:textSize="14sp" />
</RelativeLayout>
\ No newline at end of file
app/src/main/res/layout/view_data_page6.xml
View file @ dc4a0baa
......@@ -7,38 +7,4 @@
android:paddingLeft="15dp"
android:paddingTop="20dp">
<TextView
android:id="@+id/tv1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:text="高清地图任意看"
android:textStyle="bold"
android:textColor="#99000000"
android:typeface="serif"
android:textSize="20sp" />
<TextView
android:id="@+id/tv2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv1"
android:textColor="#99000000"
android:layout_marginBottom="15dp"
android:text="卫星/地形等地图高清不卡顿"
android:textSize="12sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv2"
android:layout_marginBottom="10dp"
android:background="@drawable/shape_bg_openvipcard"
android:paddingLeft="20dp"
android:paddingTop="7dp"
android:paddingRight="20dp"
android:paddingBottom="7dp"
android:text="立即领取"
android:textColor="#CCFFFFFF"
android:textSize="14sp" />
</RelativeLayout>
\ No newline at end of file
app/src/main/res/layout/view_data_page7.xml
View file @ dc4a0baa
......@@ -7,38 +7,4 @@
android:paddingLeft="15dp"
android:paddingTop="20dp">
<TextView
android:id="@+id/tv1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:text="历史影像图数据"
android:textStyle="bold"
android:textColor="#99000000"
android:typeface="serif"
android:textSize="20sp" />
<TextView
android:id="@+id/tv2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv1"
android:textColor="#99000000"
android:layout_marginBottom="15dp"
android:text="带你一起见证城市变迁"
android:textSize="12sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv2"
android:layout_marginBottom="10dp"
android:background="@drawable/shape_bg_openvipcard"
android:paddingLeft="20dp"
android:paddingTop="7dp"
android:paddingRight="20dp"
android:paddingBottom="7dp"
android:text="立即领取"
android:textColor="#CCFFFFFF"
android:textSize="14sp" />
</RelativeLayout>
\ No newline at end of file
app/src/main/res/layout/view_data_page8.xml
View file @ dc4a0baa
......@@ -7,38 +7,4 @@
android:paddingLeft="15dp"
android:paddingTop="20dp">
<TextView
android:id="@+id/tv1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:text="全球网红景点走一遍"
android:textStyle="bold"
android:textColor="#99000000"
android:typeface="serif"
android:textSize="20sp" />
<TextView
android:id="@+id/tv2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv1"
android:textColor="#99000000"
android:layout_marginBottom="15dp"
android:text="出行旅游攻略提前看"
android:textSize="12sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv2"
android:layout_marginBottom="10dp"
android:background="@drawable/shape_bg_openvipcard"
android:paddingLeft="20dp"
android:paddingTop="7dp"
android:paddingRight="20dp"
android:paddingBottom="7dp"
android:text="立即领取"
android:textColor="#CCFFFFFF"
android:textSize="14sp" />
</RelativeLayout>
\ No newline at end of file
library_base/src/main/java/com/fry/base/ui/widget/CommonTitleBar.java
View file @ dc4a0baa
......@@ -103,7 +103,7 @@ public class CommonTitleBar extends FrameLayout implements View.OnClickListener
int color = typedArray.getColor(R.styleable.CommonTitleBar_ctb_title_color, -1);
setTitle(title);
setTitleSize(size);
if (color > 0) {
if (color != -1) {
setTitleColor(color);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment