diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 43fd926..5c82789 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -1,5 +1,8 @@ + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c6442a3..d784d9c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -18,7 +18,7 @@ android:icon="@mipmap/logo" android:logo="@mipmap/logo" android:label="@string/app_name" - android:roundIcon="@mipmap/ic_launcher_round" + android:roundIcon="@mipmap/logo" android:supportsRtl="true" android:theme="@style/AppDartTheme" android:networkSecurityConfig="@xml/network_security_config" diff --git a/app/src/main/java/com/novel/read/activity/NovelReadActivity.kt b/app/src/main/java/com/novel/read/activity/NovelReadActivity.kt index 005c3ce..e2f0217 100644 --- a/app/src/main/java/com/novel/read/activity/NovelReadActivity.kt +++ b/app/src/main/java/com/novel/read/activity/NovelReadActivity.kt @@ -279,7 +279,7 @@ class NovelReadActivity : NovelBaseActivity(), DownloadService.OnDownloadListene read_tv_brief.setOnClickListener { val intent = Intent(this, NovelBookDetailActivity::class.java) - intent.putExtra(Constant.Bundle.BookId, Integer.valueOf(mBookId!!)) + intent.putExtra(Constant.Bundle.BookId, Integer.valueOf(mBookId)) startActivity(intent) } @@ -391,12 +391,12 @@ class NovelReadActivity : NovelBaseActivity(), DownloadService.OnDownloadListene tvBookReadMode.text = resources.getString(R.string.book_read_mode_day) val drawable = ContextCompat.getDrawable(this, R.drawable.ic_read_menu_moring) tvBookReadMode.setCompoundDrawablesWithIntrinsicBounds(null, drawable, null, null) - cl_layout.setBackgroundColor(resources.getColor(R.color.nb_read_bg_night)) + cl_layout.setBackgroundColor(ContextCompat.getColor(this,R.color.nb_read_bg_night)) } else { tvBookReadMode.text = resources.getString(R.string.book_read_mode_day) val drawable = ContextCompat.getDrawable(this, R.drawable.ic_read_menu_night) tvBookReadMode.setCompoundDrawablesWithIntrinsicBounds(null, drawable, null, null) - cl_layout.setBackgroundColor(resources.getColor(ReadSettingManager.getInstance().pageStyle.bgColor)) + cl_layout.setBackgroundColor(ContextCompat.getColor(this,ReadSettingManager.getInstance().pageStyle.bgColor)) } } @@ -566,7 +566,7 @@ class NovelReadActivity : NovelBaseActivity(), DownloadService.OnDownloadListene } Log.e(TAG, "onBackPressed: " + mCollBook!!.bookChapters.isEmpty()) - if (!mCollBook!!.isLocal && !isCollected && !mCollBook!!.bookChapters.isEmpty()) { + if (!mCollBook!!.isLocal && !isCollected && mCollBook!!.bookChapters.isNotEmpty()) { val alertDialog = AlertDialog.Builder(this) .setTitle(getString(R.string.add_book)) .setMessage(getString(R.string.like_book)) diff --git a/app/src/main/java/com/novel/read/adapter/HumanAdapter.java b/app/src/main/java/com/novel/read/adapter/HumanAdapter.java index 85f070f..6a958c8 100644 --- a/app/src/main/java/com/novel/read/adapter/HumanAdapter.java +++ b/app/src/main/java/com/novel/read/adapter/HumanAdapter.java @@ -21,7 +21,7 @@ import com.novel.read.utlis.GlideImageLoader; import java.util.List; /** - * create by 赵利君 on 2019/6/19 + * create by zlj on 2019/6/19 * describe: */ public class HumanAdapter extends RecyclerView.Adapter {