优化协程

lulululbj · Jan 3, 2019 · dd6e429 · dd6e429
1 parent c06f3e1
commit dd6e429
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 7 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -28,6 +28,7 @@
 
         <activity android:name=".ui.appManager.AppListActivity"/>
         <activity android:name=".ui.appManager.AppDetailActivity"/>
+        <activity android:name=".ui.editor.TextEditorActivity"/>
     </application>
 
 </manifest>
diff --git a/app/src/main/java/luyao/box/adapter/AppAdapter.kt b/app/src/main/java/luyao/box/adapter/AppAdapter.kt
@@ -7,8 +7,8 @@ import android.widget.ImageButton
 import android.widget.PopupMenu
 import com.chad.library.adapter.base.BaseQuickAdapter
 import com.chad.library.adapter.base.BaseViewHolder
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.launch
 import luyao.box.APK_PATH
@@ -46,7 +46,12 @@ class AppAdapter(layoutResId: Int = R.layout.item_app) : BaseQuickAdapter<AppBea
                 R.id.menu_open_app -> AppUtils.openApp(context, appBean.packageName)
                 R.id.menu_uninstall_app -> AppUtils.uninstallApp(context, appBean.packageName) // TODO 卸载之后刷新列表
                 R.id.menu_app_properties -> AppUtils.openAppProperties(context, appBean.packageName)
-                R.id.menu_app_detail -> context.startActivity(Intent(context, AppDetailActivity::class.java).putExtra("packageName",appBean.packageName))
+                R.id.menu_app_detail -> context.startActivity(
+                    Intent(
+                        context,
+                        AppDetailActivity::class.java
+                    ).putExtra("packageName", appBean.packageName)
+                )
                 R.id.menu_save_apk -> saveApk(helper, context, appBean)
                 R.id.menu_share_apk -> shareApk()
                 R.id.menu_open_in_store -> AppUtils.openInStore(context, appBean.packageName)
@@ -57,7 +62,7 @@ class AppAdapter(layoutResId: Int = R.layout.item_app) : BaseQuickAdapter<AppBea
     }
 
     private fun saveApk(helper: BaseViewHolder, context: Context, appBean: AppBean) {
-        GlobalScope.launch(Dispatchers.Main) {
+        CoroutineScope(Dispatchers.Main).launch {
             val progressView = helper.getView<SectorProgressView>(R.id.appProgressView)
             val apkFile = File(appBean.sourceDir)
             val destFile = File("$APK_PATH${appBean.appName}${File.separator}${apkFile.name}")

diff --git a/app/src/main/java/luyao/box/ui/MainActivity.kt b/app/src/main/java/luyao/box/ui/MainActivity.kt
@@ -9,8 +9,8 @@ import com.google.android.material.navigation.NavigationView
 import kotlinx.android.synthetic.main.activity_main.*
 import kotlinx.android.synthetic.main.app_bar_main.*
 import kotlinx.android.synthetic.main.title_layout.*
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import luyao.box.APK_PATH
 import luyao.box.BASE_PATH
@@ -111,8 +111,6 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
     private fun checkPermissions() {
         if (!EasyPermissions.hasPermissions(this, *perms)) {
             EasyPermissions.requestPermissions(this, "权限申请", 1001, *perms)
-        } else {
-            finish()
         }
     }
 
@@ -126,7 +124,7 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
     }
 
     private fun createBaseFile() {
-        GlobalScope.launch(Dispatchers.IO) {
+        CoroutineScope(Dispatchers.IO).launch {
             val baseFolder = File(BASE_PATH)
             if (!baseFolder.exists()) baseFolder.mkdirs()
 

diff --git a/app/src/main/java/luyao/box/ui/editor/TextEditorActivity.kt b/app/src/main/java/luyao/box/ui/editor/TextEditorActivity.kt
@@ -0,0 +1,22 @@
+package luyao.box.ui.editor
+
+import luyao.box.R
+import luyao.box.common.base.BaseActivity
+
+/**
+ * Created by luyao
+ * on 2019/1/3 16:18
+ */
+class TextEditorActivity : BaseActivity() {
+
+
+    override fun getLayoutResId()= R.layout.activity_text_editor
+
+    override fun initView() {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    override fun initData() {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+}
diff --git a/app/src/main/res/layout/activity_text_editor.xml b/app/src/main/res/layout/activity_text_editor.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
+
+    <include layout="@layout/title_layout"/>
+
+    <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:fillViewport="true">
+
+        <EditText
+                android:id="@+id/textEdit"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@null"
+                android:fontFamily="sans-serif-light"
+                android:textSize="14sp"
+                android:ems="10"
+                android:gravity="left|top"
+                android:inputType="textCapSentences|textMultiLine"/>
+    </ScrollView>
+
+</LinearLayout>