细节优化

Author: bihe0832

BasePhotos/src/main/java/com/bihe0832/android/base/photos/PhotosSelectFragment.kt

@@ -69,53 +69,70 @@ open class PhotosSelectFragment : CommonListFragment() {
             if (position < mDataList.size && mDataList.get(position) is IconTextData) {
                 when ((mDataList[position] as IconTextData).mIconID) {
                     ID_CAMERA -> {
-                        PermissionManager.checkPermission(context, false, object : PermissionManager.OnPermissionResult {
-                            override fun onFailed(msg: String) {
-                            }
-
-                            override fun onSuccess() {
-                                activity!!.takePhoto(activity!!.getDefaultPhoto())
-                            }
-
-                            override fun onUserCancel() {
-                            }
-
-                            override fun onUserDeny() {
-                            }
-
-                        }, *takePhotoPermission)
+                        takePhoto()
                     }
 
                     ID_PHOTO -> {
-                        PermissionManager.checkPermission(context, false, object : PermissionManager.OnPermissionResult {
-                            override fun onFailed(msg: String) {
-                            }
-
-                            override fun onSuccess() {
-                                activity!!.choosePhoto()
-                            }
-
-                            override fun onUserCancel() {
-                            }
-
-                            override fun onUserDeny() {
-                            }
-
-                        }, *selectPhotoPermission)
+                        choosePhoto()
                     }
 
                     ID_CLOUD -> {
-                        ZixieContext.showWaiting()
+                        cloudPhoto()
                     }
 
                     ID_CUSTOM -> {
-                        ZixieContext.showWaiting()
+                        customPhoto()
                     }
                 }
             }
         }
     }
 
+    open fun takePhoto() {
+        PermissionManager.checkPermission(context, false, object : PermissionManager.OnPermissionResult {
+            override fun onFailed(msg: String) {
+            }
+
+            override fun onSuccess() {
+                activity!!.takePhoto(activity!!.getDefaultPhoto())
+            }
+
+            override fun onUserCancel() {
+            }
+
+            override fun onUserDeny() {
+            }
+
+        }, *takePhotoPermission)
+    }
+
+    open fun choosePhoto() {
+        PermissionManager.checkPermission(context, false, object : PermissionManager.OnPermissionResult {
+            override fun onFailed(msg: String) {
+            }
+
+            override fun onSuccess() {
+                activity!!.choosePhoto()
+            }
+
+            override fun onUserCancel() {
+            }
+
+            override fun onUserDeny() {
+            }
+
+        }, *selectPhotoPermission)
+    }
+
+    open fun cloudPhoto() {
+        ZixieContext.showWaiting()
+    }
+
+
+    open fun customPhoto() {
+        ZixieContext.showWaiting()
+    }
+
     override fun getLayoutManagerForList(): RecyclerView.LayoutManager {
         return SafeGridLayoutManager(context, getHorizontalItemNum())
     }

BasePuzzleGame/src/main/java/com/bihe0832/android/base/puzzle/ui/GameActivity.kt

@@ -2,6 +2,7 @@ package com.bihe0832.android.base.puzzle.ui
 
 import android.os.Bundle
 import com.bihe0832.android.app.router.RouterConstants
+import com.bihe0832.android.base.puzzle.PuzzleGameManager
 import com.bihe0832.android.base.puzzle.R
 import com.bihe0832.android.framework.ui.main.CommonActivity
 import com.bihe0832.android.lib.router.annotation.Module
@@ -10,7 +11,7 @@ import com.bihe0832.android.lib.router.annotation.Module
 class GameActivity : CommonActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        initToolbar("游戏中", true)
+        initToolbar("拼图游戏中", true)
     }
 
     override fun onResume() {

BasePuzzleGame/src/main/java/com/bihe0832/android/base/puzzle/ui/PuzzlePhotosFragment.kt

@@ -39,6 +39,10 @@ class PuzzlePhotosFragment : PhotosSelectFragment() {
         }
     }
 
+    override fun customPhoto() {
+        RouterHelper.openPageByRouter(RouterConstants.MODULE_NAME_PUZZLE_GAME)
+    }
+
     override fun getHorizontalFix(): Int {
         return 64
     }

PubPuzzleGame/src/main/java/com/bihe0832/android/app/puzzle/MainActivity.kt

@@ -8,7 +8,9 @@ import com.bihe0832.android.app.router.RouterConstants
 import com.bihe0832.android.app.router.RouterHelper
 import com.bihe0832.android.app.update.UpdateManager
 import com.bihe0832.android.base.puzzle.ui.PuzzlePhotosFragment
+import com.bihe0832.android.framework.ZixieContext
 import com.bihe0832.android.framework.ui.BaseActivity
+import com.bihe0832.android.lib.lifecycle.INSTALL_TYPE_NOT_FIRST
 import com.bihe0832.android.lib.router.annotation.APPMain
 import com.bihe0832.android.lib.router.annotation.Module
 import kotlinx.android.synthetic.main.activity_puzzle_main.*
@@ -47,7 +49,9 @@ class MainActivity : BaseActivity() {
         if (findFragment(PuzzlePhotosFragment::class.java) == null) {
             loadRootFragment(R.id.common_fragment_content, PuzzlePhotosFragment())
         }
-        UpdateManager.checkUpdateAndShowDialog(this, false)
+        if(ZixieContext.isFirstStart() == INSTALL_TYPE_NOT_FIRST){
+            UpdateManager.checkUpdateAndShowDialog(this, false)
+        }
     }