Skip to content

Commit 6834cf0

Browse files
committed
维护ArgGis模块
1 parent f32d2f4 commit 6834cf0

File tree

4 files changed

+53
-44
lines changed

4 files changed

+53
-44
lines changed

RxDemo/src/main/java/com/tamsiree/rxdemo/ApplicationRxDemo.kt

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -23,34 +23,34 @@ class ApplicationRxDemo : Application() {
2323
override fun onCreate() {
2424
super.onCreate()
2525
RxTool.init(this)
26-
.debugLog(true)
27-
.debugLogFile(false)
28-
.crashLogFile(true)
29-
.crashProfile()//以下为崩溃配置
30-
.backgroundMode(TCrashProfile.BACKGROUND_MODE_SILENT) //default: TCrashProfile.BACKGROUND_MODE_SHOW_CUSTOM
31-
.enabled(true) //default: true
32-
.showErrorDetails(true) //default: true
33-
.showRestartButton(true) //default: true
34-
.logErrorOnRestart(true) //default: true
35-
.trackActivities(true) //default: false
36-
.minTimeBetweenCrashesMs(2000) //default: 3000
37-
.errorDrawable(R.drawable.crash_logo) //default: bug image
38-
.restartActivity(ActivitySVG::class.java) //default: null (your app's launch activity)
39-
.errorActivity(ActivityCrash::class.java) //default: null (default error activity)
40-
.eventListener(object : TCrashTool.EventListener {
41-
override fun onRestartAppFromErrorActivity() {
42-
RxToast.normal("onRestartAppFromErrorActivity")
43-
}
26+
.debugLog(true)
27+
.debugLogFile(false)
28+
.crashLogFile(true)
29+
.crashProfile()//以下为崩溃配置
30+
.backgroundMode(TCrashProfile.BACKGROUND_MODE_SILENT) //default: TCrashProfile.BACKGROUND_MODE_SHOW_CUSTOM
31+
.enabled(true) //default: true
32+
.showErrorDetails(true) //default: true
33+
.showRestartButton(true) //default: true
34+
.logErrorOnRestart(true) //default: true
35+
.trackActivities(true) //default: false
36+
.minTimeBetweenCrashesMs(2000) //default: 3000
37+
.errorDrawable(R.drawable.crash_logo) //default: bug image
38+
.restartActivity(ActivitySVG::class.java) //default: null (your app's launch activity)
39+
.errorActivity(ActivityCrash::class.java) //default: null (default error activity)
40+
.eventListener(object : TCrashTool.EventListener {
41+
override fun onRestartAppFromErrorActivity() {
42+
RxToast.normal("onRestartAppFromErrorActivity")
43+
}
4444

45-
override fun onCloseAppFromErrorActivity() {
46-
RxToast.normal("onCloseAppFromErrorActivity")
47-
}
45+
override fun onCloseAppFromErrorActivity() {
46+
RxToast.normal("onCloseAppFromErrorActivity")
47+
}
4848

49-
override fun onLaunchErrorActivity() {
50-
RxToast.normal("onLaunchErrorActivity")
51-
}
49+
override fun onLaunchErrorActivity() {
50+
RxToast.normal("onLaunchErrorActivity")
51+
}
5252

53-
}) //default: null
54-
.apply()
53+
}) //default: null
54+
.apply()
5555
}
5656
}

RxDemo/src/main/java/com/tamsiree/rxdemo/activity/ActivityMain.kt

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,10 @@ class ActivityMain : ActivityBase() {
2727

2828
private val mTabEntities = ArrayList<TabLayoutModel>()
2929
private val mIconUnselectIds = intArrayOf(
30-
R.drawable.ic_contact_gray, R.drawable.ic_home_unselect, R.drawable.ic_colleague_unselect)
31-
private val mIconSelectIds = intArrayOf(R.drawable.ic_contact_blue, R.drawable.ic_home, R.drawable.ic_colleague_select)
30+
R.drawable.ic_contact_gray, R.drawable.ic_home_unselect, R.drawable.ic_colleague_unselect
31+
)
32+
private val mIconSelectIds =
33+
intArrayOf(R.drawable.ic_contact_blue, R.drawable.ic_home, R.drawable.ic_colleague_select)
3234

3335
private val modelFVPList: MutableList<ModelFVP> = ArrayList()
3436

@@ -38,14 +40,14 @@ class ActivityMain : ActivityBase() {
3840
RxDeviceTool.setPortrait(this)
3941

4042
RxPermissionsTool
41-
.with(mContext)
42-
.addPermission(Manifest.permission.ACCESS_FINE_LOCATION)
43-
.addPermission(Manifest.permission.ACCESS_COARSE_LOCATION)
44-
.addPermission(Manifest.permission.READ_EXTERNAL_STORAGE)
45-
.addPermission(Manifest.permission.CAMERA)
46-
.addPermission(Manifest.permission.CALL_PHONE)
47-
.addPermission(Manifest.permission.READ_PHONE_STATE)
48-
.initPermission()
43+
.with(mContext)
44+
.addPermission(Manifest.permission.ACCESS_FINE_LOCATION)
45+
.addPermission(Manifest.permission.ACCESS_COARSE_LOCATION)
46+
.addPermission(Manifest.permission.READ_EXTERNAL_STORAGE)
47+
.addPermission(Manifest.permission.CAMERA)
48+
.addPermission(Manifest.permission.CALL_PHONE)
49+
.addPermission(Manifest.permission.READ_PHONE_STATE)
50+
.initPermission()
4951
}
5052

5153
override fun initView() {
@@ -79,12 +81,18 @@ class ActivityMain : ActivityBase() {
7981
override fun onTabReselect(position: Int) {
8082
if (position == 0) {
8183
//mTabLayout1.showMsg(0, mRandom.nextInt(100) + 1);
82-
// UnreadMsgUtils.show(mTabLayout_2.getMsgView(0), mRandom.nextInt(100) + 1);
84+
//UnreadMsgUtils.show(mTabLayout_2.getMsgView(0), mRandom.nextInt(100) + 1);
8385
}
8486
}
8587
})
8688
view_pager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener {
87-
override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) {}
89+
override fun onPageScrolled(
90+
position: Int,
91+
positionOffset: Float,
92+
positionOffsetPixels: Int
93+
) {
94+
}
95+
8896
override fun onPageSelected(position: Int) {
8997
tab_layout1!!.currentTab = position
9098
}
@@ -112,6 +120,7 @@ class ActivityMain : ActivityBase() {
112120
companion object {
113121
//双击返回键 退出
114122
//----------------------------------------------------------------------------------------------
115-
private const val TIME_INTERVAL = 2000 // # milliseconds, desired time passed between two back presses.
123+
private const val TIME_INTERVAL =
124+
2000 // # milliseconds, desired time passed between two back presses.
116125
}
117126
}

build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
buildscript {
33

44
ext {
5-
kotlin_version = '1.4.10'
5+
kotlin_version = "1.5.0"
66
}
77
repositories {
88
// 添加阿里云 maven 地址
@@ -18,7 +18,7 @@ buildscript {
1818
maven { url 'https://esri.bintray.com/arcgis' }
1919
}
2020
dependencies {
21-
classpath 'com.android.tools.build:gradle:4.0.1'
21+
classpath 'com.android.tools.build:gradle:4.2.1'
2222
classpath 'org.greenrobot:greendao-gradle-plugin:3.3.0'
2323

2424
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -46,10 +46,10 @@ allprojects {
4646
// maven { url 'https://maven.aliyun.com/nexus/content/repositories/gradle-plugin' }
4747

4848
google()
49-
jcenter()
49+
jcenter() // Warning: this repository is going to shut down soon
5050
maven { url "https://jitpack.io" }
5151
mavenCentral()
52-
maven { url 'https://esri.bintray.com/arcgis' }
52+
maven { url 'https://esri.jfrog.io/artifactory/arcgis' }
5353
}
5454
}
5555

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip

0 commit comments

Comments
 (0)