Skip to content

Commit 5687903

Browse files
committed
use viewbinding.
1 parent 75139d6 commit 5687903

7 files changed

Lines changed: 30 additions & 24 deletions

File tree

app/build.gradle

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ android {
3232
applicationId "com.carlos.grabredenvelope"
3333
minSdkVersion 18
3434
targetSdkVersion 28
35-
versionCode 10
36-
versionName "3.0.0"
37-
flavorDimensions "10" //和versionCode相同
35+
versionCode 11
36+
versionName "3.1.0"
37+
flavorDimensions "11" //和versionCode相同
3838
ndk {
3939
//选择要添加的对应 cpu 类型的 .so 库。
4040
abiFilters 'armeabi-v7a', 'x86'
@@ -58,8 +58,8 @@ android {
5858
signingConfig signingConfigs.release
5959
}
6060
debug {
61-
shrinkResources true
62-
minifyEnabled true
61+
shrinkResources false
62+
minifyEnabled false
6363
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
6464
signingConfig signingConfigs.release
6565
}
@@ -79,6 +79,9 @@ android {
7979
}
8080
}
8181

82+
viewBinding {
83+
enabled = true
84+
}
8285

8386
}
8487

@@ -128,8 +131,8 @@ dependencies {
128131

129132
testImplementation 'junit:junit:4.12'
130133

131-
// implementation 'com.carlos.cutils:cutils:0.0.26'
132-
implementation 'com.github.xbdcc:cutils:0.0.28.7-SNAPSHOT'
134+
implementation 'com.carlos.cutils:cutils:0.0.28'
135+
// implementation 'com.github.xbdcc:cutils:0.0.28.7-SNAPSHOT'
133136

134137
//jpush
135138
implementation 'cn.jiguang.sdk:jpush:3.5.8'
@@ -142,7 +145,7 @@ dependencies {
142145
implementation 'io.sentry:sentry-android:1.7.27'
143146
implementation 'com.google.android.material:material:1.0.0'
144147

145-
// implementation 'org.greenrobot:greendao:3.2.2' // add library
148+
implementation 'org.greenrobot:greendao:3.2.2' // add library
146149

147150
}
148151
repositories {

app/src/main/java/com/carlos/grabredenvelope/activity/MainActivity.kt

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import android.os.Bundle
55
import androidx.fragment.app.Fragment
66
import com.carlos.cutils.base.adapter.CBaseMyPagerAdapter
77
import com.carlos.cutils.listener.PermissionListener
8-
import com.carlos.grabredenvelope.R
8+
import com.carlos.grabredenvelope.databinding.ActivityMainBinding
99
import com.carlos.grabredenvelope.fragment.*
1010
import com.carlos.grabredenvelope.util.Update
1111
import kotlinx.android.synthetic.main.activity_main.*
@@ -48,6 +48,8 @@ import kotlinx.android.synthetic.main.activity_main.*
4848
*/
4949
open class MainActivity : BaseActivity() {
5050

51+
private lateinit var binding: ActivityMainBinding
52+
5153
private val WECHAT_SERVICE_NAME = "com.carlos.grabredenvelope/.services.WechatService"
5254

5355
var fragments = mutableListOf<Fragment>(ControlFragment(), GuideFragment(), AboutFragment(),
@@ -57,11 +59,13 @@ open class MainActivity : BaseActivity() {
5759

5860
override fun onCreate(savedInstanceState: Bundle?) {
5961
super.onCreate(savedInstanceState)
60-
setContentView(R.layout.activity_main)
62+
binding = ActivityMainBinding.inflate(layoutInflater)
63+
val view = binding.root
64+
setContentView(view)
6165

6266
val adapter = CBaseMyPagerAdapter(supportFragmentManager, fragments, titles)
63-
viewpager.adapter = adapter
64-
sliding_tabs.setupWithViewPager(viewpager)
67+
binding.viewPager.adapter = adapter
68+
binding.slidingTabs.setupWithViewPager(viewPager)
6569

6670
getPermissions()
6771
checkVersion()
@@ -91,7 +95,7 @@ open class MainActivity : BaseActivity() {
9195
}
9296

9397
fun checkItem(item: Int) {
94-
viewpager.currentItem = item
98+
viewPager.currentItem = item
9599
}
96100

97101
}

app/src/main/java/com/carlos/grabredenvelope/fragment/AboutFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,4 @@ import com.carlos.cutils.base.fragment.CBaseWebFragment
3838
* Github: https://github.com/xbdcc/.
3939
* Created by Carlos on 2019/2/23.
4040
*/
41-
class AboutFragment : CBaseWebFragment("http://xbdcc.cn/GrabRedEnvelope/index.html")
41+
class AboutFragment : CBaseWebFragment("http://xbdcc.cn/GrabRedEnvelope/index.html", false)

app/src/main/java/com/carlos/grabredenvelope/fragment/CodeFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,4 @@ import com.carlos.cutils.base.fragment.CBaseWebFragment
3838
* Github: https://github.com/xbdcc/.
3939
* Created by Carlos on 2019/2/23.
4040
*/
41-
class CodeFragment : CBaseWebFragment("https://github.com/xbdcc/GrabRedEnvelope")
41+
class CodeFragment : CBaseWebFragment("https://github.com/xbdcc/GrabRedEnvelope", false)

app/src/main/res/layout/activity_main.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,22 @@
1212
layout="@layout/include_toolbar" />
1313

1414
<androidx.viewpager.widget.ViewPager
15-
android:id="@+id/viewpager"
15+
android:id="@+id/viewPager"
1616
android:layout_width="match_parent"
1717
android:layout_height="0dp"
18-
android:layout_below="@id/sliding_tabs"
18+
android:layout_below="@id/slidingTabs"
1919
android:background="#ffffff"
2020
android:flipInterval="30"
2121
android:persistentDrawingCache="animation"
2222
app:layout_constraintStart_toStartOf="parent"
23-
app:layout_constraintTop_toBottomOf="@id/sliding_tabs"
23+
app:layout_constraintTop_toBottomOf="@id/slidingTabs"
2424
app:layout_constraintBottom_toBottomOf="parent"/>
2525
<!-- <View-->
2626
<!-- android:id="@+id/v_menu_line"-->
2727
<!-- style="@style/menu_line"-->
2828
<!-- />-->
2929
<com.google.android.material.tabs.TabLayout
30-
android:id="@+id/sliding_tabs"
30+
android:id="@+id/slidingTabs"
3131
android:layout_width="match_parent"
3232
android:layout_height="wrap_content"
3333
android:background="@color/gray_light"

app/src/main/res/layout/include_toolbar.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<com.google.android.material.appbar.AppBarLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:app="http://schemas.android.com/apk/res-auto"
4-
android:id="@+id/appbar"
54
android:layout_width="match_parent"
65
android:layout_height="wrap_content"
76
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">

app/src/main/res/values/strings.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<string name="grab_dingding_envelope">抢钉钉红包</string>
88

99
<string name="how_to_use">
10-
该版本适配微信7.0.3,7.0.4,7.0.5,7.0.8,7.0.9,7.0.10,7.0.11,7.0.12,其他版本下可能无效,最好在已适配的微信版本下使用,长时间后台可能被杀,如果失效请重新开启无障碍服务
10+
该版本适配微信7.0.3,7.0.4,7.0.5,7.0.8,7.0.9,7.0.10,7.0.11,7.0.12,其他版本未适配可能无效。长时间服务后台可能被杀,如果服务被杀需要重新开启无障碍服务
1111
\n\n控制说明:
1212
\n1.微信红包监控开关:点击进入设置找到无障碍服务辅助功能开启【抢微信红包】,开启后下面操作才有效;
1313
\n2.通知监控开关:开启后通知收到微信红包则会自动点击该通知,若开启后无效请确认通知权限是否开启;
@@ -32,10 +32,10 @@
3232

3333
<string name="wechat_description">
3434
使用指南:使用前仔细看APP使用说明。辅助功能开启【抢微信红包】,APP 抢微信红包设置是否监控通知和聊天列表页面,同时可设置延迟时间。代码开源仅供学习使用,请勿用作商业用途。
35-
\n\n如果有遇到说明里除已知bug外的问题, 欢迎通过 GitHub Issue 反馈:https://github.com/xbdcc/GrabRedEnvelope
36-
\n\n主要基于自己手上的Android机测试,因Android机型众多,可能有些机型没设备适配,待后续完善
35+
\n\n如果有遇到说明里除已知bug外的问题, 欢迎通过 GitHub Issue 反馈:https://github.com/xbdcc/GrabRedEnvelope
36+
\n\n有问题也可联系偶尔会使用的微信:xbdcc1
3737
\n\n ——made by 小不点</string>
38-
<string name="dingding_description">待开发。</string>
38+
<string name="dingding_description">基于钉钉5.0.5版本开发,不做版本适配,只监听当前对话页面红包</string>
3939

4040

4141
<string name="sure">确定</string>

0 commit comments

Comments
 (0)