Skip to content

Commit 1bb8d89

Browse files
TamsireeTamsiree
committed
convert to kotlin.
1 parent c1d7202 commit 1bb8d89

29 files changed

+1650
-1775
lines changed

‎RxDemo/src/main/java/com/tamsiree/rxdemo/activity/ActivityCreateQRCode.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class ActivityCreateQRCode : ActivityBase(), View.OnClickListener {
4242

4343
override fun initView() {
4444
rx_title.setLeftFinish(mContext)
45-
rx_title.title = "动态生成码"
45+
rx_title.setTitle("动态生成码")
4646
ll_refresh.setOnClickListener(this)
4747
}
4848

‎RxDemo/src/main/java/com/tamsiree/rxdemo/activity/ActivityRunTextView.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class ActivityRunTextView : ActivityBase() {
3939
text.setText(26f, 5, -0x899eaa) //设置属性
4040
text.setTextStillTime(3000) //设置停留时长间隔
4141
text.setAnimTime(300) //设置进入和退出的时间间隔
42-
text.setOnItemClickListener { position -> RxToast.success(mContext, "点击了 : " + titleList[position], Toast.LENGTH_SHORT, true).show() }
42+
text.setOnItemClickListener { position -> RxToast.success(mContext, "点击了 : " + titleList[position], Toast.LENGTH_SHORT, true)?.show() }
4343
val views: MutableList<View> = ArrayList()
4444
setUPMarqueeView(views, 11)
4545
upview1.setViews(views)

‎RxDemo/src/main/java/com/tamsiree/rxdemo/activity/ActivityRxCaptcha.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ class ActivityRxCaptcha : ActivityBase() {
3434
rx_title.setLeftFinish(mContext)
3535
swipeCaptchaView.onCaptchaMatchCallback = object : OnCaptchaMatchCallback {
3636
override fun matchSuccess(rxSwipeCaptcha: RxSwipeCaptcha) {
37-
RxToast.success(mContext, "验证通过！", Toast.LENGTH_SHORT).show()
37+
RxToast.success(mContext, "验证通过！", Toast.LENGTH_SHORT)?.show()
3838
//swipeCaptcha.createCaptcha();
3939
dragBar.isEnabled = false
4040
}
4141

4242
override fun matchFailed(rxSwipeCaptcha: RxSwipeCaptcha) {
4343
Log.d("zxt", "matchFailed() called with: rxSwipeCaptcha = [$rxSwipeCaptcha]")
44-
RxToast.error(mContext, "验证失败:拖动滑块将悬浮头像正确拼合", Toast.LENGTH_SHORT).show()
44+
RxToast.error(mContext, "验证失败:拖动滑块将悬浮头像正确拼合", Toast.LENGTH_SHORT)?.show()
4545
rxSwipeCaptcha.resetCaptcha()
4646
dragBar.progress = 0
4747
}

‎RxDemo/src/main/java/com/tamsiree/rxdemo/activity/ActivityRxToast.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ class ActivityRxToast : ActivityBase() {
2121

2222
override fun initView() {
2323
rx_title.setOnClickListener { finish() }
24-
button_error_toast.setOnClickListener { RxToast.error(mContext, "这是一个提示错误的Toast！", Toast.LENGTH_SHORT, true).show() }
25-
button_success_toast.setOnClickListener { RxToast.success(mContext, "这是一个提示成功的Toast!", Toast.LENGTH_SHORT, true).show() }
26-
button_info_toast.setOnClickListener { RxToast.info(mContext, "这是一个提示信息的Toast.", Toast.LENGTH_SHORT, true).show() }
27-
button_warning_toast.setOnClickListener { RxToast.warning(mContext, "这是一个提示警告的Toast.", Toast.LENGTH_SHORT, true).show() }
28-
button_normal_toast_wo_icon.setOnClickListener { RxToast.normal(mContext, "这是一个普通的没有ICON的Toast").show() }
24+
button_error_toast.setOnClickListener { RxToast.error(mContext, "这是一个提示错误的Toast！", Toast.LENGTH_SHORT, true)?.show() }
25+
button_success_toast.setOnClickListener { RxToast.success(mContext, "这是一个提示成功的Toast!", Toast.LENGTH_SHORT, true)?.show() }
26+
button_info_toast.setOnClickListener { RxToast.info(mContext, "这是一个提示信息的Toast.", Toast.LENGTH_SHORT, true)?.show() }
27+
button_warning_toast.setOnClickListener { RxToast.warning(mContext, "这是一个提示警告的Toast.", Toast.LENGTH_SHORT, true)?.show() }
28+
button_normal_toast_wo_icon.setOnClickListener { RxToast.normal(mContext, "这是一个普通的没有ICON的Toast")?.show() }
2929
button_normal_toast_w_icon.setOnClickListener {
3030
val icon = resources.getDrawable(R.drawable.clover)
31-
RxToast.normal(mContext, "这是一个普通的包含ICON的Toast", icon).show()
31+
RxToast.normal(mContext, "这是一个普通的包含ICON的Toast", icon)?.show()
3232
}
3333
}
3434

‎RxDemo/src/main/java/com/tamsiree/rxdemo/activity/ActivitySlidingDrawerSingle.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class ActivitySlidingDrawerSingle : ActivityBase() {
6161
pb_web_base?.visibility = View.VISIBLE
6262
}
6363

64-
override fun onReceivedTitle(title: String?) {
64+
override fun onReceivedTitle(title: String) {
6565
// rx_title.title = title
6666
}
6767

‎RxFeature/src/main/java/com/tamsiree/rxfeature/activity/ActivityCodeTool.kt‎

Lines changed: 30 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -3,49 +3,26 @@ package com.tamsiree.rxfeature.activity
33
import android.graphics.Color
44
import android.os.Bundle
55
import android.view.View
6-
import android.widget.EditText
7-
import android.widget.ImageView
8-
import android.widget.LinearLayout
9-
import androidx.core.widget.NestedScrollView
106
import com.tamsiree.rxfeature.R
117
import com.tamsiree.rxfeature.tool.RxBarCode
128
import com.tamsiree.rxfeature.tool.RxQRCode
139
import com.tamsiree.rxkit.*
1410
import com.tamsiree.rxkit.view.RxToast
1511
import com.tamsiree.rxui.activity.ActivityBase
16-
import com.tamsiree.rxui.view.RxTitle
1712
import com.tamsiree.rxui.view.ticker.RxTickerUtils
18-
import com.tamsiree.rxui.view.ticker.RxTickerView
13+
import kotlinx.android.synthetic.main.activity_code_tool.*
1914

2015
/**
2116
* @author tamsiree
2217
*/
2318
class ActivityCodeTool : ActivityBase() {
24-
private var mRxTitle: RxTitle? = null
25-
private var mEtQrCode: EditText? = null
26-
private var mIvCreateQrCode: ImageView? = null
27-
private var mIvQrCode: ImageView? = null
28-
private var mActivityCodeTool: LinearLayout? = null
29-
private var mLlCode: LinearLayout? = null
30-
private var mLlQrRoot: LinearLayout? = null
31-
private var mEtBarCode: EditText? = null
32-
private var mIvCreateBarCode: ImageView? = null
33-
private var mIvBarCode: ImageView? = null
34-
private var mLlBarCode: LinearLayout? = null
35-
private var mLlBarRoot: LinearLayout? = null
36-
private var mLlScaner: LinearLayout? = null
37-
private var mLlQr: LinearLayout? = null
38-
private var mLlBar: LinearLayout? = null
39-
private var mRxTickerViewMade: RxTickerView? = null
40-
private var mRxTickerViewScan: RxTickerView? = null
41-
private var nestedScrollView: NestedScrollView? = null
19+
4220
override fun onCreate(savedInstanceState: Bundle?) {
4321
super.onCreate(savedInstanceState)
4422
RxBarTool.noTitle(this)
4523
RxBarTool.setTransparentStatusBar(this)
4624
setContentView(R.layout.activity_code_tool)
4725
RxDeviceTool.setPortrait(this)
48-
4926
}
5027

5128
override fun onResume() {
@@ -54,26 +31,8 @@ class ActivityCodeTool : ActivityBase() {
5431
}
5532

5633
override fun initView() {
57-
mRxTitle = findViewById(R.id.rx_title)
58-
mEtQrCode = findViewById(R.id.et_qr_code)
59-
mIvCreateQrCode = findViewById(R.id.iv_create_qr_code)
60-
mIvQrCode = findViewById(R.id.iv_qr_code)
61-
mActivityCodeTool = findViewById(R.id.activity_code_tool)
62-
mLlCode = findViewById(R.id.ll_code)
63-
mLlQrRoot = findViewById(R.id.ll_qr_root)
64-
nestedScrollView = findViewById(R.id.nestedScrollView)
65-
mEtBarCode = findViewById(R.id.et_bar_code)
66-
mIvCreateBarCode = findViewById(R.id.iv_create_bar_code)
67-
mIvBarCode = findViewById(R.id.iv_bar_code)
68-
mLlBarCode = findViewById(R.id.ll_bar_code)
69-
mLlBarRoot = findViewById(R.id.ll_bar_root)
70-
mLlScaner = findViewById(R.id.ll_scaner)
71-
mLlQr = findViewById(R.id.ll_qr)
72-
mLlBar = findViewById(R.id.ll_bar)
73-
mRxTickerViewScan = findViewById(R.id.ticker_scan_count)
74-
mRxTickerViewScan?.setCharacterList(NUMBER_LIST)
75-
mRxTickerViewMade = findViewById(R.id.ticker_made_count)
76-
mRxTickerViewMade?.setCharacterList(NUMBER_LIST)
34+
ticker_scan_count.setCharacterList(NUMBER_LIST)
35+
ticker_made_count.setCharacterList(NUMBER_LIST)
7736
updateMadeCodeCount()
7837
}
7938

@@ -82,64 +41,64 @@ class ActivityCodeTool : ActivityBase() {
8241
}
8342

8443
private fun updateScanCodeCount() {
85-
mRxTickerViewScan!!.setText(RxDataTool.stringToInt(RxSPTool.getContent(mContext.baseContext!!, RxConstants.SP_SCAN_CODE)).toString() + "", true)
44+
ticker_scan_count!!.setText(RxDataTool.stringToInt(RxSPTool.getContent(mContext.baseContext!!, RxConstants.SP_SCAN_CODE)).toString() + "", true)
8645
}
8746

8847
private fun updateMadeCodeCount() {
89-
mRxTickerViewMade!!.setText(RxDataTool.stringToInt(RxSPTool.getContent(mContext.baseContext!!, RxConstants.SP_MADE_CODE)).toString() + "", true)
48+
ticker_made_count.setText(RxDataTool.stringToInt(RxSPTool.getContent(mContext.baseContext!!, RxConstants.SP_MADE_CODE)).toString() + "", true)
9049
}
9150

9251
private fun initEvent() {
93-
mRxTitle!!.isLeftIconVisibility = true
94-
mRxTitle!!.titleColor = Color.WHITE
95-
mRxTitle!!.titleSize = RxImageTool.dp2px(20f)
96-
mRxTitle!!.setLeftFinish(mContext)
97-
mRxTickerViewScan!!.animationDuration = 500
98-
mIvCreateQrCode!!.setOnClickListener {
99-
val str = mEtQrCode!!.text.toString()
52+
rx_title.setLeftIconVisibility(true)
53+
rx_title.setTitleColor(Color.WHITE)
54+
rx_title.setTitleSize(RxImageTool.dp2px(20f))
55+
rx_title.setLeftFinish(mContext)
56+
ticker_scan_count!!.animationDuration = 500
57+
iv_create_qr_code.setOnClickListener {
58+
val str = et_qr_code.text.toString()
10059
if (RxDataTool.isNullString(str)) {
10160
RxToast.error("二维码文字内容不能为空！")
10261
} else {
103-
mLlCode!!.visibility = View.VISIBLE
62+
ll_code!!.visibility = View.VISIBLE
10463

10564
//二维码生成方式一 推荐此方法
106-
RxQRCode.builder(str).backColor(-0x1).codeColor(-0x1000000).codeSide(600).codeLogo(resources.getDrawable(R.drawable.faviconhandsome)).codeBorder(1).into(mIvQrCode)
65+
RxQRCode.builder(str).backColor(-0x1).codeColor(-0x1000000).codeSide(600).codeLogo(resources.getDrawable(R.drawable.faviconhandsome)).codeBorder(1).into(iv_qr_code)
10766

10867
//二维码生成方式二 默认宽和高都为800 背景为白色 二维码为黑色
109-
// RxQRCode.createQRCode(str,mIvQrCode);
110-
mIvQrCode!!.visibility = View.VISIBLE
68+
// RxQRCode.createQRCode(str,iv_qr_code);
69+
iv_qr_code!!.visibility = View.VISIBLE
11170
RxToast.success("二维码已生成!")
11271
RxSPTool.putContent(mContext.baseContext!!, RxConstants.SP_MADE_CODE, (RxDataTool.stringToInt(RxSPTool.getContent(mContext.baseContext!!, RxConstants.SP_MADE_CODE)) + 1).toString())
11372
updateMadeCodeCount()
11473
nestedScrollView!!.computeScroll()
11574
}
11675
}
117-
mIvCreateBarCode!!.setOnClickListener {
118-
val str1 = mEtBarCode!!.text.toString()
76+
iv_create_bar_code!!.setOnClickListener {
77+
val str1 = et_bar_code!!.text.toString()
11978
if (RxDataTool.isNullString(str1)) {
12079
RxToast.error("条形码文字内容不能为空！")
12180
} else {
122-
mLlBarCode!!.visibility = View.VISIBLE
81+
ll_bar_code!!.visibility = View.VISIBLE
12382

12483
//条形码生成方式一 推荐此方法
125-
RxBarCode.builder(str1).backColor(0x00000000).codeColor(-0x1000000).codeWidth(1000).codeHeight(300).into(mIvBarCode)
84+
RxBarCode.builder(str1).backColor(0x00000000).codeColor(-0x1000000).codeWidth(1000).codeHeight(300).into(iv_bar_code)
12685

12786
//条形码生成方式二 默认宽为1000 高为300 背景为白色 二维码为黑色
128-
//mIvBarCode.setImageBitmap(RxBarCode.createBarCode(str1, 1000, 300));
129-
mIvBarCode!!.visibility = View.VISIBLE
87+
//iv_bar_code.setImageBitmap(RxBarCode.createBarCode(str1, 1000, 300));
88+
iv_bar_code!!.visibility = View.VISIBLE
13089
RxToast.success("条形码已生成!")
13190
RxSPTool.putContent(mContext.baseContext!!, RxConstants.SP_MADE_CODE, (RxDataTool.stringToInt(RxSPTool.getContent(mContext.baseContext!!, RxConstants.SP_MADE_CODE)) + 1).toString())
13291
updateMadeCodeCount()
13392
}
13493
}
135-
mLlScaner!!.setOnClickListener { RxActivityTool.skipActivity(mContext, ActivityScanerCode::class.java) }
136-
mLlQr!!.setOnClickListener {
137-
mLlQrRoot!!.visibility = View.VISIBLE
138-
mLlBarRoot!!.visibility = View.GONE
94+
ll_scaner!!.setOnClickListener { RxActivityTool.skipActivity(mContext, ActivityScanerCode::class.java) }
95+
ll_qr!!.setOnClickListener {
96+
ll_qr_root!!.visibility = View.VISIBLE
97+
ll_bar_root!!.visibility = View.GONE
13998
}
140-
mLlBar!!.setOnClickListener {
141-
mLlBarRoot!!.visibility = View.VISIBLE
142-
mLlQrRoot!!.visibility = View.GONE
99+
ll_bar!!.setOnClickListener {
100+
ll_bar_root!!.visibility = View.VISIBLE
101+
ll_qr_root!!.visibility = View.GONE
143102
}
144103
}
145104

‎RxKit/src/main/java/com/tamsiree/rxkit/RxDeviceTool.kt‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,7 @@ object RxDeviceTool {
8686
@JvmStatic
8787
fun getScreenDensity(context: Context): Float {
8888
return context.resources.displayMetrics.density
89-
}//品牌类型 例如： Galaxy nexus
90-
//品牌 例如：samsung
89+
}
9190

9291
/**
9392
* 获取手机唯一标识序列号
@@ -117,13 +116,11 @@ object RxDeviceTool {
117116
*/
118117
@JvmStatic
119118
fun getIMEI(context: Context): String? {
120-
val deviceId: String?
121-
deviceId = if (isPhone(context)) {
119+
return if (isPhone(context)) {
122120
getDeviceIdIMEI(context)
123121
} else {
124122
getAndroidId(context)
125123
}
126-
return deviceId
127124
}
128125

129126
/**
@@ -184,6 +181,7 @@ object RxDeviceTool {
184181
* @param context
185182
* @return
186183
*/
184+
@SuppressLint("HardwareIds")
187185
@JvmStatic
188186
fun getLine1Number(context: Context): String? {
189187
val tm = context.getSystemService(Context.TELEPHONY_SERVICE) as TelephonyManager
@@ -296,6 +294,7 @@ object RxDeviceTool {
296294
* @param context
297295
* @return
298296
*/
297+
@SuppressLint("HardwareIds")
299298
@JvmStatic
300299
fun getSimSerialNumber(context: Context): String? {
301300
val tm = context.getSystemService(Context.TELEPHONY_SERVICE) as TelephonyManager
@@ -324,6 +323,7 @@ object RxDeviceTool {
324323
* @param context
325324
* @return
326325
*/
326+
@SuppressLint("HardwareIds")
327327
@JvmStatic
328328
fun getSubscriberId(context: Context): String? {
329329
val tm = context.getSystemService(Context.TELEPHONY_SERVICE) as TelephonyManager
@@ -356,6 +356,7 @@ object RxDeviceTool {
356356
* @param context
357357
* @return
358358
*/
359+
@SuppressLint("HardwareIds")
359360
@JvmStatic
360361
fun getAndroidId(context: Context): String {
361362
return Settings.Secure.getString(context.contentResolver, Settings.Secure.ANDROID_ID)
@@ -392,6 +393,7 @@ object RxDeviceTool {
392393
*/
393394
@JvmStatic
394395
val serialNumber: String?
396+
@SuppressLint("PrivateApi", "HardwareIds")
395397
get() {
396398
var serial: String? = null
397399
try {
@@ -455,7 +457,7 @@ object RxDeviceTool {
455457
* @return
456458
*/
457459
@JvmStatic
458-
fun checkPermission(context: Context, permission: String?): Boolean {
460+
fun checkPermission(context: Context, permission: String): Boolean {
459461
var result = false
460462
if (Build.VERSION.SDK_INT >= 23) {
461463
result = try {

‎RxKit/src/main/java/com/tamsiree/rxkit/RxImageTool.kt‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ import android.graphics.*
66
import android.graphics.Bitmap.CompressFormat
77
import android.graphics.drawable.BitmapDrawable
88
import android.graphics.drawable.Drawable
9-
import android.media.ExifInterface
109
import android.media.ThumbnailUtils
1110
import android.util.DisplayMetrics
1211
import android.util.Log
1312
import android.view.WindowManager
1413
import android.widget.ImageView
14+
import androidx.exifinterface.media.ExifInterface
1515
import com.tamsiree.rxkit.RxDataTool.Companion.isNullString
1616
import com.tamsiree.rxkit.RxFileTool.Companion.closeIO
1717
import com.tamsiree.rxkit.RxFileTool.Companion.createOrExistsFile
@@ -507,9 +507,6 @@ object RxImageTool {
507507
*/
508508
@JvmStatic
509509
fun getBitmap(resId: Int): Bitmap? {
510-
if (RxTool.getContext() == null) {
511-
return null
512-
}
513510
val `is` = RxTool.getContext().resources.openRawResource(resId)
514511
return BitmapFactory.decodeStream(`is`)
515512
}
@@ -524,9 +521,6 @@ object RxImageTool {
524521
*/
525522
@JvmStatic
526523
fun getBitmap(resId: Int, maxWidth: Int, maxHeight: Int): Bitmap? {
527-
if (RxTool.getContext() == null) {
528-
return null
529-
}
530524
val options = BitmapFactory.Options()
531525
options.inJustDecodeBounds = true
532526
val `is` = RxTool.getContext().resources.openRawResource(resId)
@@ -801,7 +795,7 @@ object RxImageTool {
801795
* @return 旋转角度
802796
*/
803797
@JvmStatic
804-
fun getRotateDegree(filePath: String?): Int {
798+
fun getRotateDegree(filePath: String): Int {
805799
var degree = 0
806800
try {
807801
val exifInterface = ExifInterface(filePath)

‎RxKit/src/main/java/com/tamsiree/rxkit/RxNetTool.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ object RxNetTool {
118118
}
119119
} else {
120120
netType = NETWORK_NO
121-
RxToast.error(context, "当前无网络连接").show()
121+
RxToast.error(context, "当前无网络连接")?.show()
122122
}
123123
return netType
124124
}

0 commit comments

Comments
 (0)