Skip to content

Commit be59f6a

Browse files
committed
style: GsonUtil.kt jsonToObject return T?
fix: UIComponentPlugins.kt findOrCreateFmt args error
1 parent a714605 commit be59f6a

File tree

4 files changed

+7
-8
lines changed

4 files changed

+7
-8
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ dependencyResolutionManagement {
2727
```groovy
2828
dependencies {
2929
// add sdk-ktx to your dependencies
30-
implementation 'com.github.pslilysm:sdk-ktx:2.0.2'
30+
implementation 'com.github.pslilysm:sdk-ktx:2.0.3'
3131
}
3232
```
3333

sdk-library/src/main/java/pers/pslilysm/sdk_library/base/BaseDialog.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ abstract class BaseDialog<VB : ViewBinding> protected constructor(protected val
2525
protected val mBuilder: AlertDialog.Builder
2626
protected var mDialog: AlertDialog? = null
2727

28-
abstract fun initWindowLp(lp: WindowManager.LayoutParams)
28+
protected fun initWindowLp(lp: WindowManager.LayoutParams) {}
2929

3030
init {
3131
mBuilder = AlertDialog.Builder(mBase.getContext())

sdk-library/src/main/java/pers/pslilysm/sdk_library/base/UIComponentPlugins.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ object UIComponentPlugins {
4242
return manager.findFragmentByTag("f$position") as T?
4343
}
4444
}
45-
private val TAG = "CXD-" + UIComponentPlugins::class.java.simpleName
4645

4746
@kotlin.jvm.JvmStatic
4847
fun <T : Fragment?> findOrCreateFmt(
@@ -58,7 +57,7 @@ object UIComponentPlugins {
5857
throw ExceptionUtil.rethrow(e)
5958
}
6059
}
61-
}, args)
60+
}, *args)
6261
}
6362

6463
@kotlin.jvm.JvmStatic

sdk-library/src/main/java/pers/pslilysm/sdk_library/util/GsonUtil.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ object GsonUtil {
3939
* @return a object deserialize of json string
4040
*/
4141
@kotlin.jvm.JvmStatic
42-
fun <T> jsonToObject(json: String?, tClass: Class<T>?): T {
42+
fun <T> jsonToObject(json: String?, tClass: Class<T>): T? {
4343
return sGson.fromJson(json, tClass)
4444
}
4545

@@ -53,14 +53,14 @@ object GsonUtil {
5353
*/
5454
@kotlin.jvm.JvmStatic
5555
fun <T> jsonToSet(json: String?, tClass: Class<T>?): Set<T> {
56-
val list: MutableSet<T> = ArraySet()
56+
val set: MutableSet<T> = ArraySet()
5757
if (!TextUtils.isEmpty(json)) {
5858
val array = JsonParser.parseString(json).asJsonArray
5959
for (elem in array) {
60-
list.add(sGson.fromJson(elem, tClass))
60+
set.add(sGson.fromJson(elem, tClass))
6161
}
6262
}
63-
return list
63+
return set
6464
}
6565

6666
/**

0 commit comments

Comments
 (0)