@norcy/react-native-toolkit 0.1.145 → 0.1.146

package/android/src/main/java/com/norcy/reactnativetoolkit/BaseToolkitActivity.java

@@ -6,6 +6,7 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.view.WindowManager;
 import android.content.res.Configuration;
+import org.devio.rn.splashscreen.SplashScreen;
 
 public abstract class BaseToolkitActivity extends ReactActivity {
     @Override
@@ -13,6 +14,8 @@ public abstract class BaseToolkitActivity extends ReactActivity {
         // 处理 DEBUG 模式下的屏幕常亮
         if (getReactNativeHost().getUseDeveloperSupport()) {
             getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+        } else {
+            SplashScreen.show(this, true);
         }
         super.onCreate(savedInstanceState);
         

package/android/src/main/java/com/norcy/reactnativetoolkit/BaseToolkitApplication.java

@@ -3,57 +3,64 @@ package com.norcy.reactnativetoolkit;
 import android.app.Application;
 import android.content.Context;
 
+import com.facebook.react.BuildConfig;
 import com.facebook.react.PackageList;
 import com.facebook.react.ReactApplication;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
 import com.facebook.soloader.SoLoader;
-import cn.reactnative.modules.update.UpdateContext;
 
 import java.util.List;
 
 public abstract class BaseToolkitApplication extends Application implements ReactApplication {
-    private final ReactNativeHost mReactNativeHost;
-
-    public BaseToolkitApplication() {
-        mReactNativeHost = createReactNativeHost();
-    }
-    
-    // 让子类可以完全控制要使用哪些包
-    protected abstract List<ReactPackage> getPackages();
-
-    protected ReactNativeHost createReactNativeHost() {
-        return new ReactNativeHost(this) {
-            @Override
-            public boolean getUseDeveloperSupport() {
-                return BuildConfig.DEBUG;
-            }
-
-            @Override
-            protected List<ReactPackage> getPackages() {
-                return BaseToolkitApplication.this.getPackages();
-            }
-
-            @Override
-            protected String getJSBundleFile() {
-                return UpdateContext.getBundleUrl(BaseToolkitApplication.this);
-            }
-
-            @Override
-            protected String getJSMainModuleName() {
-                return "index"
-            }
-        };
-    }
-
-    @Override
-    public ReactNativeHost getReactNativeHost() {
-        return mReactNativeHost;
-    }
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        SoLoader.init(this, false);
-    }
-}
+  private final ReactNativeHost mReactNativeHost;
+
+  public BaseToolkitApplication() {
+    mReactNativeHost = createReactNativeHost();
+  }
+
+  // 让子类可以完全控制要使用哪些包
+  protected abstract List<ReactPackage> getPackages();
+  
+  // 让子类决定如何获取 JS Bundle URL，返回 null 则使用默认的 bundle
+  protected abstract String getJSBundleUrl();
+  
+  // 让子类提供友盟统计的 AppKey
+  protected abstract String getUmengAppKey();
+
+  protected ReactNativeHost createReactNativeHost() {
+    return new ReactNativeHost(this) {
+      @Override
+      public boolean getUseDeveloperSupport() {
+        return BuildConfig.DEBUG;
+      }
+
+      @Override
+      protected List<ReactPackage> getPackages() {
+        return BaseToolkitApplication.this.getPackages();
+      }
+
+      @Override
+      protected String getJSBundleFile() {
+        return BaseToolkitApplication.this.getJSBundleUrl();
+      }
+
+      @Override
+      protected String getJSMainModuleName() {
+        return "index";
+      }
+    };
+  }
+
+  @Override
+  public ReactNativeHost getReactNativeHost() {
+    return mReactNativeHost;
+  }
+
+  @Override
+  public void onCreate() {
+    super.onCreate();
+    SoLoader.init(this, false);
+    UMengManager.getInstance().setup(this, getUmengAppKey());
+  }
+}

package/android/src/main/java/com/norcy/reactnativetoolkit/NCYAPI.java

@@ -6,7 +6,6 @@ import static android.Manifest.permission.READ_EXTERNAL_STORAGE;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Build;
@@ -21,7 +20,6 @@ import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableMap;
-import com.umeng.commonsdk.UMConfigure;
 
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
@@ -29,7 +27,6 @@ import androidx.core.content.ContextCompat;
 import java.io.File;
 
 public class NCYAPI extends ReactContextBaseJavaModule implements ActivityEventListener {
-    private static final String PREFS_NAME = "NCYAPIPrefs"; // 偏好设置文件名
     private static final int REQUEST_CODE = 228228;
     public static final String NAME = "ManageExternalStorage";
     Promise promise;
@@ -46,28 +43,17 @@ public class NCYAPI extends ReactContextBaseJavaModule implements ActivityEventL
 
     @ReactMethod
     public void onAgree() {
-        SharedPreferences.Editor editor = getSharedPreferences().edit();
-        editor.putBoolean("umeng_agreed", true);
-        editor.apply();
-        UMConfigure.init(getReactApplicationContext(), "638196f005844627b58c1db6", "Umeng", UMConfigure.DEVICE_TYPE_PHONE, "");
+        UMengManager.getInstance().onUserAgree();
     }
 
     @ReactMethod(isBlockingSynchronousMethod = true)
     public void setData(String key, String value) {
-        SharedPreferences.Editor editor = getSharedPreferences().edit();
-        editor.putString(key, value);
-        editor.apply();
+        PreferencesManager.getInstance(getReactApplicationContext()).setString(key, value);
     }
 
     @ReactMethod(isBlockingSynchronousMethod = true)
     public String getData(String key) {
-        SharedPreferences preferences = getSharedPreferences();
-        return preferences.getString(key, "");
-    }
-
-    private SharedPreferences getSharedPreferences() {
-        Context context = getReactApplicationContext();
-        return context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+        return PreferencesManager.getInstance(getReactApplicationContext()).getString(key, "");
     }
 
     @ReactMethod

package/android/src/main/java/com/norcy/reactnativetoolkit/PreferencesManager.java

@@ -0,0 +1,50 @@
+package com.norcy.reactnativetoolkit;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+
+public class PreferencesManager {
+    private static final String PREFS_NAME = "NCYAPIPrefs";
+    private static PreferencesManager instance;
+    private Context context;
+    
+    private PreferencesManager(Context context) {
+        this.context = context.getApplicationContext();
+    }
+    
+    public static PreferencesManager getInstance(Context context) {
+        if (instance == null) {
+            instance = new PreferencesManager(context);
+        }
+        return instance;
+    }
+    
+    // 通用数据存储
+    public void setString(String key, String value) {
+        getSharedPreferences().edit().putString(key, value).apply();
+    }
+    
+    public String getString(String key, String defaultValue) {
+        return getSharedPreferences().getString(key, defaultValue);
+    }
+    
+    public void setBoolean(String key, boolean value) {
+        getSharedPreferences().edit().putBoolean(key, value).apply();
+    }
+    
+    public boolean getBoolean(String key, boolean defaultValue) {
+        return getSharedPreferences().getBoolean(key, defaultValue);
+    }
+    
+    public void setInt(String key, int value) {
+        getSharedPreferences().edit().putInt(key, value).apply();
+    }
+    
+    public int getInt(String key, int defaultValue) {
+        return getSharedPreferences().getInt(key, defaultValue);
+    }
+    
+    private SharedPreferences getSharedPreferences() {
+        return context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+    }
+}

package/android/src/main/java/com/norcy/reactnativetoolkit/UMengManager.java

@@ -0,0 +1,54 @@
+package com.norcy.reactnativetoolkit;
+
+import android.content.Context;
+import com.facebook.react.BuildConfig;
+import com.umeng.analytics.MobclickAgent;
+import com.umeng.commonsdk.UMConfigure;
+
+public class UMengManager {
+    private static final UMengManager instance = new UMengManager();
+    private String appKey;
+    private boolean isInitialized = false;
+    private Context context;
+    
+    private UMengManager() {}
+    
+    public static UMengManager getInstance() {
+        return instance;
+    }
+    
+    // 唯一的外部调用方法 - 初始化
+    public void setup(Context context, String appKey) {
+        this.context = context;
+        this.appKey = appKey;
+        
+        if (BuildConfig.DEBUG) {
+            UMConfigure.setLogEnabled(true);
+        } else {
+            if (appKey != null && !appKey.isEmpty()) {
+                UMConfigure.preInit(context, appKey, "Umeng");
+                // 检查用户是否已同意
+                if (PreferencesManager.getInstance(context).getBoolean("umeng_agreed", false)) {
+                    init();
+                }
+            }
+        }
+    }
+    
+    // 用户同意后调用 - 包含存储逻辑
+    public void onUserAgree() {
+        if (appKey != null && !appKey.isEmpty() && !isInitialized) {
+            // 存储用户同意状态
+            PreferencesManager.getInstance(context).setBoolean("umeng_agreed", true);
+            
+            // 初始化友盟
+            init();
+        }
+    }
+    
+    private void init() {
+        UMConfigure.init(context, appKey, "Umeng", UMConfigure.DEVICE_TYPE_PHONE, "");
+        MobclickAgent.setPageCollectionMode(MobclickAgent.PageMode.MANUAL);
+        isInitialized = true;
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@norcy/react-native-toolkit",
-  "version": "0.1.145",
+  "version": "0.1.146",
   "description": "My Toolkit",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -75,6 +75,7 @@
     "react-native-device-info": "^10.0.2",
     "react-native-purchases": "^7.28.1",
     "react-native-simple-toast": "^1.1.3",
+    "react-native-splash-screen": "^3.3.0",
     "react-native-wechat-lib": "^1.1.26",
     "release-it": "^13.5.8",
     "typescript": "^5.0.2"
@@ -97,6 +98,7 @@
     "react-native-device-info": "*",
     "react-native-purchases": "*",
     "react-native-simple-toast": "*",
+    "react-native-splash-screen": "*",
     "react-native-wechat-lib": "*"
   },
   "jest": {

package/yarn.lock

@@ -9304,6 +9304,11 @@ react-native-simple-toast@^1.1.3:
   resolved "https://registry.yarnpkg.com/react-native-simple-toast/-/react-native-simple-toast-1.1.4.tgz#6a962beea87b86228a4f8c51bc93761108740b1c"
   integrity sha512-7D8o8L445XDz7Rdh0pMgCIWuevv1FnGyuD7F8Nz/XhzMInmU4jL5VFJI25VVqQ2uGTaUSuo2ogXSgKnv6p9NJg==
 
+react-native-splash-screen@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/react-native-splash-screen/-/react-native-splash-screen-3.3.0.tgz#3af71ed17afe50fee69590a45aec399d071ead02"
+  integrity sha512-rGjt6HkoSXxMqH4SQUJ1gnPQlPJV8+J47+4yhgTIan4bVvAwJhEeJH7wWt9hXSdH4+VfwTS0GTaflj1Tw83IhA==
+
 react-native-wechat-lib@^1.1.26:
   version "1.1.27"
   resolved "https://registry.yarnpkg.com/react-native-wechat-lib/-/react-native-wechat-lib-1.1.27.tgz#22d8c74bd6099627978ffe898f0ee089e113c7e9"