diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/HomePageFragment.kt index 5493bed..e50eeb3 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/HomePageFragment.kt @@ -5,18 +5,93 @@ import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment +import com.amap.api.maps.AMap +import com.amap.api.maps.AMapOptions +import com.amap.api.maps.model.CameraPosition +import com.amap.api.maps.model.Marker import com.casic.smart.town.sanxi.R +import kotlinx.android.synthetic.main.fragment_home.view.* -class HomePageFragment : Fragment() { +class HomePageFragment : Fragment(), AMap.OnMapLoadedListener, AMap.OnCameraChangeListener, + AMap.OnMarkerClickListener, AMap.InfoWindowAdapter { private val kTag = "HomePageFragment" + private lateinit var homeView: View + private lateinit var aMap: AMap override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View { - val monitorView = inflater.inflate(R.layout.fragment_home, container, false) + homeView = inflater.inflate(R.layout.fragment_home, container, false) + setMapConfig(savedInstanceState) + return homeView + } - return monitorView + private fun setMapConfig(savedInstanceState: Bundle?) { + homeView.mapView.onCreate(savedInstanceState) + aMap = homeView.mapView.map + aMap.mapType = AMap.MAP_TYPE_SATELLITE + val uiSettings = aMap.uiSettings + uiSettings.isCompassEnabled = true + uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER + uiSettings.isTiltGesturesEnabled = false//不许地图随手势倾斜角度 + + // 地图加载成功监听 + aMap.addOnMapLoadedListener(this) + // 地图缩放监听 + aMap.addOnCameraChangeListener(this) + // marker 点击事件监听 + aMap.addOnMarkerClickListener(this) + // 点击marker弹出自定义popup + aMap.setInfoWindowAdapter(this) + } + + override fun onMapLoaded() { + + } + + override fun onCameraChange(p0: CameraPosition?) { + + } + + override fun onCameraChangeFinish(p0: CameraPosition?) { + + } + + override fun onMarkerClick(p0: Marker?): Boolean { + + return true + } + + override fun getInfoWindow(p0: Marker?): View? { + + return null + } + + /** + * 此方法不能修改整个 InfoWindow 的背景和边框,无论自定义的样式是什么样,SDK 都会在最外层添加一个默认的边框 + * */ + override fun getInfoContents(p0: Marker?): View? = null + + /***以下是地图生命周期管理************************************************************************/ + override fun onResume() { + super.onResume() + homeView.mapView.onResume() + } + + override fun onPause() { + super.onPause() + homeView.mapView.onPause() + } + + override fun onSaveInstanceState(outState: Bundle) { + super.onSaveInstanceState(outState) + homeView.mapView.onSaveInstanceState(outState) + } + + override fun onDestroy() { + super.onDestroy() + homeView.mapView.onDestroy() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/HomePageFragment.kt index 5493bed..e50eeb3 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/HomePageFragment.kt @@ -5,18 +5,93 @@ import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment +import com.amap.api.maps.AMap +import com.amap.api.maps.AMapOptions +import com.amap.api.maps.model.CameraPosition +import com.amap.api.maps.model.Marker import com.casic.smart.town.sanxi.R +import kotlinx.android.synthetic.main.fragment_home.view.* -class HomePageFragment : Fragment() { +class HomePageFragment : Fragment(), AMap.OnMapLoadedListener, AMap.OnCameraChangeListener, + AMap.OnMarkerClickListener, AMap.InfoWindowAdapter { private val kTag = "HomePageFragment" + private lateinit var homeView: View + private lateinit var aMap: AMap override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View { - val monitorView = inflater.inflate(R.layout.fragment_home, container, false) + homeView = inflater.inflate(R.layout.fragment_home, container, false) + setMapConfig(savedInstanceState) + return homeView + } - return monitorView + private fun setMapConfig(savedInstanceState: Bundle?) { + homeView.mapView.onCreate(savedInstanceState) + aMap = homeView.mapView.map + aMap.mapType = AMap.MAP_TYPE_SATELLITE + val uiSettings = aMap.uiSettings + uiSettings.isCompassEnabled = true + uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER + uiSettings.isTiltGesturesEnabled = false//不许地图随手势倾斜角度 + + // 地图加载成功监听 + aMap.addOnMapLoadedListener(this) + // 地图缩放监听 + aMap.addOnCameraChangeListener(this) + // marker 点击事件监听 + aMap.addOnMarkerClickListener(this) + // 点击marker弹出自定义popup + aMap.setInfoWindowAdapter(this) + } + + override fun onMapLoaded() { + + } + + override fun onCameraChange(p0: CameraPosition?) { + + } + + override fun onCameraChangeFinish(p0: CameraPosition?) { + + } + + override fun onMarkerClick(p0: Marker?): Boolean { + + return true + } + + override fun getInfoWindow(p0: Marker?): View? { + + return null + } + + /** + * 此方法不能修改整个 InfoWindow 的背景和边框,无论自定义的样式是什么样,SDK 都会在最外层添加一个默认的边框 + * */ + override fun getInfoContents(p0: Marker?): View? = null + + /***以下是地图生命周期管理************************************************************************/ + override fun onResume() { + super.onResume() + homeView.mapView.onResume() + } + + override fun onPause() { + super.onPause() + homeView.mapView.onPause() + } + + override fun onSaveInstanceState(outState: Bundle) { + super.onSaveInstanceState(outState) + homeView.mapView.onSaveInstanceState(outState) + } + + override fun onDestroy() { + super.onDestroy() + homeView.mapView.onDestroy() } } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_all_well.xml b/app/src/main/res/layout/activity_all_well.xml index 8cd6286..ff02eec 100644 --- a/app/src/main/res/layout/activity_all_well.xml +++ b/app/src/main/res/layout/activity_all_well.xml @@ -8,13 +8,8 @@ - - - - + android:layout_height="match_parent" /> \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/HomePageFragment.kt index 5493bed..e50eeb3 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/HomePageFragment.kt @@ -5,18 +5,93 @@ import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment +import com.amap.api.maps.AMap +import com.amap.api.maps.AMapOptions +import com.amap.api.maps.model.CameraPosition +import com.amap.api.maps.model.Marker import com.casic.smart.town.sanxi.R +import kotlinx.android.synthetic.main.fragment_home.view.* -class HomePageFragment : Fragment() { +class HomePageFragment : Fragment(), AMap.OnMapLoadedListener, AMap.OnCameraChangeListener, + AMap.OnMarkerClickListener, AMap.InfoWindowAdapter { private val kTag = "HomePageFragment" + private lateinit var homeView: View + private lateinit var aMap: AMap override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View { - val monitorView = inflater.inflate(R.layout.fragment_home, container, false) + homeView = inflater.inflate(R.layout.fragment_home, container, false) + setMapConfig(savedInstanceState) + return homeView + } - return monitorView + private fun setMapConfig(savedInstanceState: Bundle?) { + homeView.mapView.onCreate(savedInstanceState) + aMap = homeView.mapView.map + aMap.mapType = AMap.MAP_TYPE_SATELLITE + val uiSettings = aMap.uiSettings + uiSettings.isCompassEnabled = true + uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER + uiSettings.isTiltGesturesEnabled = false//不许地图随手势倾斜角度 + + // 地图加载成功监听 + aMap.addOnMapLoadedListener(this) + // 地图缩放监听 + aMap.addOnCameraChangeListener(this) + // marker 点击事件监听 + aMap.addOnMarkerClickListener(this) + // 点击marker弹出自定义popup + aMap.setInfoWindowAdapter(this) + } + + override fun onMapLoaded() { + + } + + override fun onCameraChange(p0: CameraPosition?) { + + } + + override fun onCameraChangeFinish(p0: CameraPosition?) { + + } + + override fun onMarkerClick(p0: Marker?): Boolean { + + return true + } + + override fun getInfoWindow(p0: Marker?): View? { + + return null + } + + /** + * 此方法不能修改整个 InfoWindow 的背景和边框,无论自定义的样式是什么样,SDK 都会在最外层添加一个默认的边框 + * */ + override fun getInfoContents(p0: Marker?): View? = null + + /***以下是地图生命周期管理************************************************************************/ + override fun onResume() { + super.onResume() + homeView.mapView.onResume() + } + + override fun onPause() { + super.onPause() + homeView.mapView.onPause() + } + + override fun onSaveInstanceState(outState: Bundle) { + super.onSaveInstanceState(outState) + homeView.mapView.onSaveInstanceState(outState) + } + + override fun onDestroy() { + super.onDestroy() + homeView.mapView.onDestroy() } } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_all_well.xml b/app/src/main/res/layout/activity_all_well.xml index 8cd6286..ff02eec 100644 --- a/app/src/main/res/layout/activity_all_well.xml +++ b/app/src/main/res/layout/activity_all_well.xml @@ -8,13 +8,8 @@ - - - - + android:layout_height="match_parent" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_bf_well.xml b/app/src/main/res/layout/activity_bf_well.xml index 8cd6286..ff02eec 100644 --- a/app/src/main/res/layout/activity_bf_well.xml +++ b/app/src/main/res/layout/activity_bf_well.xml @@ -8,13 +8,8 @@ - - - - + android:layout_height="match_parent" /> \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/HomePageFragment.kt index 5493bed..e50eeb3 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/HomePageFragment.kt @@ -5,18 +5,93 @@ import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment +import com.amap.api.maps.AMap +import com.amap.api.maps.AMapOptions +import com.amap.api.maps.model.CameraPosition +import com.amap.api.maps.model.Marker import com.casic.smart.town.sanxi.R +import kotlinx.android.synthetic.main.fragment_home.view.* -class HomePageFragment : Fragment() { +class HomePageFragment : Fragment(), AMap.OnMapLoadedListener, AMap.OnCameraChangeListener, + AMap.OnMarkerClickListener, AMap.InfoWindowAdapter { private val kTag = "HomePageFragment" + private lateinit var homeView: View + private lateinit var aMap: AMap override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View { - val monitorView = inflater.inflate(R.layout.fragment_home, container, false) + homeView = inflater.inflate(R.layout.fragment_home, container, false) + setMapConfig(savedInstanceState) + return homeView + } - return monitorView + private fun setMapConfig(savedInstanceState: Bundle?) { + homeView.mapView.onCreate(savedInstanceState) + aMap = homeView.mapView.map + aMap.mapType = AMap.MAP_TYPE_SATELLITE + val uiSettings = aMap.uiSettings + uiSettings.isCompassEnabled = true + uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER + uiSettings.isTiltGesturesEnabled = false//不许地图随手势倾斜角度 + + // 地图加载成功监听 + aMap.addOnMapLoadedListener(this) + // 地图缩放监听 + aMap.addOnCameraChangeListener(this) + // marker 点击事件监听 + aMap.addOnMarkerClickListener(this) + // 点击marker弹出自定义popup + aMap.setInfoWindowAdapter(this) + } + + override fun onMapLoaded() { + + } + + override fun onCameraChange(p0: CameraPosition?) { + + } + + override fun onCameraChangeFinish(p0: CameraPosition?) { + + } + + override fun onMarkerClick(p0: Marker?): Boolean { + + return true + } + + override fun getInfoWindow(p0: Marker?): View? { + + return null + } + + /** + * 此方法不能修改整个 InfoWindow 的背景和边框,无论自定义的样式是什么样,SDK 都会在最外层添加一个默认的边框 + * */ + override fun getInfoContents(p0: Marker?): View? = null + + /***以下是地图生命周期管理************************************************************************/ + override fun onResume() { + super.onResume() + homeView.mapView.onResume() + } + + override fun onPause() { + super.onPause() + homeView.mapView.onPause() + } + + override fun onSaveInstanceState(outState: Bundle) { + super.onSaveInstanceState(outState) + homeView.mapView.onSaveInstanceState(outState) + } + + override fun onDestroy() { + super.onDestroy() + homeView.mapView.onDestroy() } } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_all_well.xml b/app/src/main/res/layout/activity_all_well.xml index 8cd6286..ff02eec 100644 --- a/app/src/main/res/layout/activity_all_well.xml +++ b/app/src/main/res/layout/activity_all_well.xml @@ -8,13 +8,8 @@ - - - - + android:layout_height="match_parent" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_bf_well.xml b/app/src/main/res/layout/activity_bf_well.xml index 8cd6286..ff02eec 100644 --- a/app/src/main/res/layout/activity_bf_well.xml +++ b/app/src/main/res/layout/activity_bf_well.xml @@ -8,13 +8,8 @@ - - - - + android:layout_height="match_parent" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_cf_well.xml b/app/src/main/res/layout/activity_cf_well.xml index 93453c5..ff02eec 100644 --- a/app/src/main/res/layout/activity_cf_well.xml +++ b/app/src/main/res/layout/activity_cf_well.xml @@ -1,20 +1,15 @@ - - - - + android:layout_height="match_parent" /> \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/HomePageFragment.kt index 5493bed..e50eeb3 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/HomePageFragment.kt @@ -5,18 +5,93 @@ import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment +import com.amap.api.maps.AMap +import com.amap.api.maps.AMapOptions +import com.amap.api.maps.model.CameraPosition +import com.amap.api.maps.model.Marker import com.casic.smart.town.sanxi.R +import kotlinx.android.synthetic.main.fragment_home.view.* -class HomePageFragment : Fragment() { +class HomePageFragment : Fragment(), AMap.OnMapLoadedListener, AMap.OnCameraChangeListener, + AMap.OnMarkerClickListener, AMap.InfoWindowAdapter { private val kTag = "HomePageFragment" + private lateinit var homeView: View + private lateinit var aMap: AMap override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View { - val monitorView = inflater.inflate(R.layout.fragment_home, container, false) + homeView = inflater.inflate(R.layout.fragment_home, container, false) + setMapConfig(savedInstanceState) + return homeView + } - return monitorView + private fun setMapConfig(savedInstanceState: Bundle?) { + homeView.mapView.onCreate(savedInstanceState) + aMap = homeView.mapView.map + aMap.mapType = AMap.MAP_TYPE_SATELLITE + val uiSettings = aMap.uiSettings + uiSettings.isCompassEnabled = true + uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER + uiSettings.isTiltGesturesEnabled = false//不许地图随手势倾斜角度 + + // 地图加载成功监听 + aMap.addOnMapLoadedListener(this) + // 地图缩放监听 + aMap.addOnCameraChangeListener(this) + // marker 点击事件监听 + aMap.addOnMarkerClickListener(this) + // 点击marker弹出自定义popup + aMap.setInfoWindowAdapter(this) + } + + override fun onMapLoaded() { + + } + + override fun onCameraChange(p0: CameraPosition?) { + + } + + override fun onCameraChangeFinish(p0: CameraPosition?) { + + } + + override fun onMarkerClick(p0: Marker?): Boolean { + + return true + } + + override fun getInfoWindow(p0: Marker?): View? { + + return null + } + + /** + * 此方法不能修改整个 InfoWindow 的背景和边框,无论自定义的样式是什么样,SDK 都会在最外层添加一个默认的边框 + * */ + override fun getInfoContents(p0: Marker?): View? = null + + /***以下是地图生命周期管理************************************************************************/ + override fun onResume() { + super.onResume() + homeView.mapView.onResume() + } + + override fun onPause() { + super.onPause() + homeView.mapView.onPause() + } + + override fun onSaveInstanceState(outState: Bundle) { + super.onSaveInstanceState(outState) + homeView.mapView.onSaveInstanceState(outState) + } + + override fun onDestroy() { + super.onDestroy() + homeView.mapView.onDestroy() } } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_all_well.xml b/app/src/main/res/layout/activity_all_well.xml index 8cd6286..ff02eec 100644 --- a/app/src/main/res/layout/activity_all_well.xml +++ b/app/src/main/res/layout/activity_all_well.xml @@ -8,13 +8,8 @@ - - - - + android:layout_height="match_parent" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_bf_well.xml b/app/src/main/res/layout/activity_bf_well.xml index 8cd6286..ff02eec 100644 --- a/app/src/main/res/layout/activity_bf_well.xml +++ b/app/src/main/res/layout/activity_bf_well.xml @@ -8,13 +8,8 @@ - - - - + android:layout_height="match_parent" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_cf_well.xml b/app/src/main/res/layout/activity_cf_well.xml index 93453c5..ff02eec 100644 --- a/app/src/main/res/layout/activity_cf_well.xml +++ b/app/src/main/res/layout/activity_cf_well.xml @@ -1,20 +1,15 @@ - - - - + android:layout_height="match_parent" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 7eba6fd..83e2c8f 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -5,4 +5,8 @@ android:background="@color/white" android:orientation="vertical"> + \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/HomePageFragment.kt index 5493bed..e50eeb3 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/HomePageFragment.kt @@ -5,18 +5,93 @@ import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment +import com.amap.api.maps.AMap +import com.amap.api.maps.AMapOptions +import com.amap.api.maps.model.CameraPosition +import com.amap.api.maps.model.Marker import com.casic.smart.town.sanxi.R +import kotlinx.android.synthetic.main.fragment_home.view.* -class HomePageFragment : Fragment() { +class HomePageFragment : Fragment(), AMap.OnMapLoadedListener, AMap.OnCameraChangeListener, + AMap.OnMarkerClickListener, AMap.InfoWindowAdapter { private val kTag = "HomePageFragment" + private lateinit var homeView: View + private lateinit var aMap: AMap override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View { - val monitorView = inflater.inflate(R.layout.fragment_home, container, false) + homeView = inflater.inflate(R.layout.fragment_home, container, false) + setMapConfig(savedInstanceState) + return homeView + } - return monitorView + private fun setMapConfig(savedInstanceState: Bundle?) { + homeView.mapView.onCreate(savedInstanceState) + aMap = homeView.mapView.map + aMap.mapType = AMap.MAP_TYPE_SATELLITE + val uiSettings = aMap.uiSettings + uiSettings.isCompassEnabled = true + uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER + uiSettings.isTiltGesturesEnabled = false//不许地图随手势倾斜角度 + + // 地图加载成功监听 + aMap.addOnMapLoadedListener(this) + // 地图缩放监听 + aMap.addOnCameraChangeListener(this) + // marker 点击事件监听 + aMap.addOnMarkerClickListener(this) + // 点击marker弹出自定义popup + aMap.setInfoWindowAdapter(this) + } + + override fun onMapLoaded() { + + } + + override fun onCameraChange(p0: CameraPosition?) { + + } + + override fun onCameraChangeFinish(p0: CameraPosition?) { + + } + + override fun onMarkerClick(p0: Marker?): Boolean { + + return true + } + + override fun getInfoWindow(p0: Marker?): View? { + + return null + } + + /** + * 此方法不能修改整个 InfoWindow 的背景和边框,无论自定义的样式是什么样,SDK 都会在最外层添加一个默认的边框 + * */ + override fun getInfoContents(p0: Marker?): View? = null + + /***以下是地图生命周期管理************************************************************************/ + override fun onResume() { + super.onResume() + homeView.mapView.onResume() + } + + override fun onPause() { + super.onPause() + homeView.mapView.onPause() + } + + override fun onSaveInstanceState(outState: Bundle) { + super.onSaveInstanceState(outState) + homeView.mapView.onSaveInstanceState(outState) + } + + override fun onDestroy() { + super.onDestroy() + homeView.mapView.onDestroy() } } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_all_well.xml b/app/src/main/res/layout/activity_all_well.xml index 8cd6286..ff02eec 100644 --- a/app/src/main/res/layout/activity_all_well.xml +++ b/app/src/main/res/layout/activity_all_well.xml @@ -8,13 +8,8 @@ - - - - + android:layout_height="match_parent" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_bf_well.xml b/app/src/main/res/layout/activity_bf_well.xml index 8cd6286..ff02eec 100644 --- a/app/src/main/res/layout/activity_bf_well.xml +++ b/app/src/main/res/layout/activity_bf_well.xml @@ -8,13 +8,8 @@ - - - - + android:layout_height="match_parent" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_cf_well.xml b/app/src/main/res/layout/activity_cf_well.xml index 93453c5..ff02eec 100644 --- a/app/src/main/res/layout/activity_cf_well.xml +++ b/app/src/main/res/layout/activity_cf_well.xml @@ -1,20 +1,15 @@ - - - - + android:layout_height="match_parent" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 7eba6fd..83e2c8f 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -5,4 +5,8 @@ android:background="@color/white" android:orientation="vertical"> + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_statistics.xml b/app/src/main/res/layout/fragment_statistics.xml index b63aabf..9728f7e 100644 --- a/app/src/main/res/layout/fragment_statistics.xml +++ b/app/src/main/res/layout/fragment_statistics.xml @@ -22,7 +22,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerInParent="true" - android:text="首页" + android:text="统计" android:textColor="@color/white" android:textSize="@dimen/sp_18" />