Skip to content

Commit 4259d33

Browse files
committed
拼图游戏
1 parent 8e22bb7 commit 4259d33

File tree

40 files changed

+1882
-29
lines changed

40 files changed

+1882
-29
lines changed

APPTest/src/main/java/com/bihe0832/android/test/TestMainFragment.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
import android.view.View;
1212
import android.view.ViewGroup;
1313

14+
import com.bihe0832.android.base.photos.PhotosSelectFragment;
15+
import com.bihe0832.android.base.puzzle.ui.PuzzleGameMainFragment;
16+
import com.bihe0832.android.base.puzzle.ui.PuzzlePhotosFragment;
1417
import com.bihe0832.android.framework.ui.BaseFragment;
1518
import com.bihe0832.android.lib.utils.ConvertUtils;
1619
import com.bihe0832.android.test.module.TestDebugCommonFragment;
@@ -99,7 +102,7 @@ public MyTaskPagerFragmentAdapter(FragmentManager fm) {
99102
public Fragment getItem(int position) {
100103

101104
if (mTabString[position].equals(TAB_FOR_NEW)) {
102-
return new TestDebugTempFragment();
105+
return new PuzzlePhotosFragment();
103106
} else if (mTabString[position].equals(TAB_FOR_DEV_COMMON)) {
104107
return new TestDebugCommonFragment();
105108
} else if (mTabString[position].equals(TAB_FOR_DEV_TEMP)) {

APPTest/src/main/java/com/bihe0832/android/test/module/TestDebugTempFragment.kt

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -39,20 +39,5 @@ TestDebugTempFragment : BaseTestFragment() {
3939

4040
private fun testFunc() {
4141
ZLog.d("test")
42-
try {
43-
activity?.showPhotoChooser()
44-
} catch (e: Exception) {
45-
e.printStackTrace()
46-
}
47-
}
48-
49-
50-
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
51-
super.onActivityResult(requestCode, resultCode, data)
52-
ZLog.d("PhotoChooser", "in PhotoChooser onResult, $this, $requestCode, $resultCode, ${data?.data}")
53-
if (requestCode == ZixieActivityRequestCode.TAKE_PHOTO) {
54-
Photos.addPicToPhotos(context, activity!!.getDefaultPhoto().absolutePath)
55-
activity?.cropPhoto(activity!!.getDefaultPhoto().absolutePath, activity!!.getPhotosFolder() + "a.jpg", 2)
56-
}
5742
}
5843
}

Application/src/main/java/com/bihe0832/android/app/router/RouterConstants.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ public class RouterConstants {
1717
public static final String MODULE_NAME_FEEDBACK = FeedbackActivity.MODULE_NAME_FEEDBACK;
1818
public static final String INTENT_EXTRA_KEY_WEB_URL = BaseWebviewFragment.INTENT_KEY_URL;
1919
public static final String MODULE_NAME_BASE_ABOUT = AboutActivityKt.MODULE_NAME_BASE_ABOUT;
20+
public static final String MODULE_NAME_PUZZLE_GAME = "puzzlegame";
21+
public static final String MODULE_NAME_PUZZLE = "puzzle";
2022
public static final String MODULE_NAME_DEBUG = "debug";
2123

2224

173 Bytes
Loading

Application/src/main/res/drawable-xxhdpi/praise_btn_go_feedback.xml renamed to Application/src/main/res/drawable/praise_btn_go_feedback.xml

File renamed without changes.

Application/src/main/res/drawable-xxhdpi/praise_btn_go_market.xml renamed to Application/src/main/res/drawable/praise_btn_go_market.xml

File renamed without changes.

Application/src/main/res/drawable-xxhdpi/praise_dialog_bg.xml renamed to Application/src/main/res/drawable/praise_dialog_bg.xml

File renamed without changes.
976 Bytes
Loading
853 Bytes
Loading
940 Bytes
Loading

0 commit comments

Comments
 (0)