diff --git a/app/build.gradle b/app/build.gradle index 67af4b0..2dd018e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -109,5 +109,5 @@ implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' - implementation project(path: ':hatom-video-player') +// implementation project(path: ':hatom-video-player') } \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 67af4b0..2dd018e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -109,5 +109,5 @@ implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' - implementation project(path: ':hatom-video-player') +// implementation project(path: ':hatom-video-player') } \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/base/BaseApplication.kt b/app/src/main/java/com/casic/smart/town/sanxi/base/BaseApplication.kt index a6e9e9c..86ebb7e 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/base/BaseApplication.kt @@ -3,7 +3,6 @@ import android.app.Application import com.casic.smart.town.sanxi.R import com.esri.arcgisruntime.ArcGISRuntimeEnvironment -import com.hikvision.hatomplayer.HatomPlayerSDK import com.pengxh.kt.lite.utils.SaveKeyValues import kotlin.properties.Delegates @@ -24,6 +23,6 @@ ArcGISRuntimeEnvironment.setLicense(getString(R.string.arcgis_license)) //去掉开发版水印 ArcGISRuntimeEnvironment.setApiKey(getString(R.string.arcgis_key)) //appKey 为保留字段,目前只需传入null或空字符串即可。 - HatomPlayerSDK.init(this, "", true) +// HatomPlayerSDK.init(this, "", true) } } \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 67af4b0..2dd018e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -109,5 +109,5 @@ implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' - implementation project(path: ':hatom-video-player') +// implementation project(path: ':hatom-video-player') } \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/base/BaseApplication.kt b/app/src/main/java/com/casic/smart/town/sanxi/base/BaseApplication.kt index a6e9e9c..86ebb7e 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/base/BaseApplication.kt @@ -3,7 +3,6 @@ import android.app.Application import com.casic.smart.town.sanxi.R import com.esri.arcgisruntime.ArcGISRuntimeEnvironment -import com.hikvision.hatomplayer.HatomPlayerSDK import com.pengxh.kt.lite.utils.SaveKeyValues import kotlin.properties.Delegates @@ -24,6 +23,6 @@ ArcGISRuntimeEnvironment.setLicense(getString(R.string.arcgis_license)) //去掉开发版水印 ArcGISRuntimeEnvironment.setApiKey(getString(R.string.arcgis_key)) //appKey 为保留字段,目前只需传入null或空字符串即可。 - HatomPlayerSDK.init(this, "", true) +// HatomPlayerSDK.init(this, "", true) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index b0fcddd..8d97579 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -25,7 +25,7 @@ init { fragmentPages.add(StatisticsPageFragment()) - fragmentPages.add(MonitorPageFragment()) +// fragmentPages.add(MonitorPageFragment()) fragmentPages.add(OrderPageFragment()) fragmentPages.add(MorePageFragment()) } @@ -52,14 +52,14 @@ R.id.nav_statistics -> { mainViewPager.currentItem = 0 } - R.id.nav_monitor -> { +// R.id.nav_monitor -> { +// mainViewPager.currentItem = 1 +// } + R.id.nav_order -> { mainViewPager.currentItem = 1 } - R.id.nav_order -> { - mainViewPager.currentItem = 2 - } R.id.nav_more -> { - mainViewPager.currentItem = 3 + mainViewPager.currentItem = 2 } } false diff --git a/app/build.gradle b/app/build.gradle index 67af4b0..2dd018e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -109,5 +109,5 @@ implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' - implementation project(path: ':hatom-video-player') +// implementation project(path: ':hatom-video-player') } \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/base/BaseApplication.kt b/app/src/main/java/com/casic/smart/town/sanxi/base/BaseApplication.kt index a6e9e9c..86ebb7e 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/base/BaseApplication.kt @@ -3,7 +3,6 @@ import android.app.Application import com.casic.smart.town.sanxi.R import com.esri.arcgisruntime.ArcGISRuntimeEnvironment -import com.hikvision.hatomplayer.HatomPlayerSDK import com.pengxh.kt.lite.utils.SaveKeyValues import kotlin.properties.Delegates @@ -24,6 +23,6 @@ ArcGISRuntimeEnvironment.setLicense(getString(R.string.arcgis_license)) //去掉开发版水印 ArcGISRuntimeEnvironment.setApiKey(getString(R.string.arcgis_key)) //appKey 为保留字段,目前只需传入null或空字符串即可。 - HatomPlayerSDK.init(this, "", true) +// HatomPlayerSDK.init(this, "", true) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index b0fcddd..8d97579 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -25,7 +25,7 @@ init { fragmentPages.add(StatisticsPageFragment()) - fragmentPages.add(MonitorPageFragment()) +// fragmentPages.add(MonitorPageFragment()) fragmentPages.add(OrderPageFragment()) fragmentPages.add(MorePageFragment()) } @@ -52,14 +52,14 @@ R.id.nav_statistics -> { mainViewPager.currentItem = 0 } - R.id.nav_monitor -> { +// R.id.nav_monitor -> { +// mainViewPager.currentItem = 1 +// } + R.id.nav_order -> { mainViewPager.currentItem = 1 } - R.id.nav_order -> { - mainViewPager.currentItem = 2 - } R.id.nav_more -> { - mainViewPager.currentItem = 3 + mainViewPager.currentItem = 2 } } false diff --git a/app/src/main/res/layout/activity_order_not_confirmed_detail.xml b/app/src/main/res/layout/activity_order_not_confirmed_detail.xml index bb5cec1..c652bdb 100644 --- a/app/src/main/res/layout/activity_order_not_confirmed_detail.xml +++ b/app/src/main/res/layout/activity_order_not_confirmed_detail.xml @@ -175,15 +175,6 @@ android:padding="@dimen/dp_20">