Skip to content

Commit ed6df50

Browse files
committed
Move from com.cboy to org.devio
1 parent 9153625 commit ed6df50

File tree

5 files changed

+18
-9
lines changed

5 files changed

+18
-9
lines changed

android/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.cboy.rn.splashscreen">
2+
package="org.devio.rn.splashscreen">
33

44
<application
55
android:allowBackup="true"

android/src/main/java/com/cboy/rn/splashscreen/SplashScreen.java renamed to android/src/main/java/org/devio/rn/splashscreen/SplashScreen.java

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
package com.cboy.rn.splashscreen;
1+
package org.devio.rn.splashscreen;
2+
23
import android.app.Activity;
34
import android.app.Dialog;
45

56
import java.lang.ref.WeakReference;
7+
68
/**
79
* SplashScreen
810
* 启动屏
@@ -18,15 +20,15 @@ public class SplashScreen {
1820
/**
1921
* 打开启动屏
2022
*/
21-
public static void show(final Activity activity,final boolean fullScreen) {
23+
public static void show(final Activity activity, final boolean fullScreen) {
2224
if (activity == null) return;
2325
mActivity = new WeakReference<Activity>(activity);
2426
activity.runOnUiThread(new Runnable() {
2527
@Override
2628
public void run() {
2729
if (!activity.isFinishing()) {
2830

29-
mSplashDialog = new Dialog(activity,fullScreen? R.style.SplashScreen_Fullscreen:R.style.SplashScreen_SplashTheme);
31+
mSplashDialog = new Dialog(activity, fullScreen ? R.style.SplashScreen_Fullscreen : R.style.SplashScreen_SplashTheme);
3032
mSplashDialog.setContentView(R.layout.launch_screen);
3133
mSplashDialog.setCancelable(false);
3234

@@ -37,25 +39,32 @@ public void run() {
3739
}
3840
});
3941
}
42+
4043
/**
4144
* 打开启动屏
4245
*/
4346
public static void show(final Activity activity) {
44-
show(activity,false);
47+
show(activity, false);
4548
}
4649

4750
/**
4851
* 关闭启动屏
4952
*/
5053
public static void hide(Activity activity) {
51-
if (activity == null) activity = mActivity.get();
54+
if (activity == null) {
55+
if (mActivity == null) {
56+
return;
57+
}
58+
activity = mActivity.get();
59+
}
5260
if (activity == null) return;
5361

5462
activity.runOnUiThread(new Runnable() {
5563
@Override
5664
public void run() {
5765
if (mSplashDialog != null && mSplashDialog.isShowing()) {
5866
mSplashDialog.dismiss();
67+
mSplashDialog = null;
5968
}
6069
}
6170
});

android/src/main/java/com/cboy/rn/splashscreen/SplashScreenModule.java renamed to android/src/main/java/org/devio/rn/splashscreen/SplashScreenModule.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.cboy.rn.splashscreen;
1+
package org.devio.rn.splashscreen;
22

33
import com.facebook.react.bridge.ReactApplicationContext;
44
import com.facebook.react.bridge.ReactContextBaseJavaModule;

android/src/main/java/com/cboy/rn/splashscreen/SplashScreenReactPackage.java renamed to android/src/main/java/org/devio/rn/splashscreen/SplashScreenReactPackage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.cboy.rn.splashscreen;
1+
package org.devio.rn.splashscreen;
22

33
import com.facebook.react.ReactPackage;
44
import com.facebook.react.bridge.JavaScriptModule;

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-native-splash-screen",
3-
"version": "3.0.0",
3+
"version": "3.0.1",
44
"description": "A splash screen for react-native, hide when application loaded ,it works on iOS and Android.",
55
"main": "index.js",
66
"scripts": {

0 commit comments

Comments
 (0)