feat: 模块重构

Damoness · Feb 26, 2022 · 140a803 · 140a803
1 parent 7f4af5f
commit 140a803
Show file tree

Hide file tree

Showing 21 changed files with 146 additions and 126 deletions.
diff --git a/android/src/main/java/com/damoness/rn/umeng/AnalyticsModule.java b/android/src/main/java/com/damoness/rn/umeng/AnalyticsModule.java
@@ -38,7 +38,7 @@ public AnalyticsModule(ReactApplicationContext reactContext) {
 
     @Override
     public String getName() {
-        return "UMAnalyticsModule";
+        return "DMNAnalyticsModule";
     }
 
     /********************************U-App统计*********************************/

diff --git a/android/src/main/java/com/damoness/rn/umeng/ConfigureModule.java b/android/src/main/java/com/damoness/rn/umeng/ConfigureModule.java
@@ -0,0 +1,50 @@
+package com.damoness.rn.umeng;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+
+import com.facebook.react.bridge.ReactMethod;
+import com.umeng.commonsdk.UMConfigure;
+import com.umeng.socialize.PlatformConfig;
+
+public  class ConfigureModule extends ReactContextBaseJavaModule {
+
+
+  private ReactApplicationContext context;
+  public ConfigureModule(ReactApplicationContext reactContext) {
+    super(reactContext);
+    context = reactContext;
+  }
+
+  @Override
+  public String getName() {
+    return "DMNConfigure";
+  }
+
+
+  @ReactMethod
+  public  void initApp(String appKey,String channel){
+        //初始化
+        UMConfigure.init(this.getReactApplicationContext(),appKey,channel,UMConfigure.DEVICE_TYPE_PHONE,"");
+  }
+
+
+  @ReactMethod
+  public  void setWeChat(String appKey,String appSecret){
+    // 微信设置
+    PlatformConfig.setWeixin(appKey,appSecret);
+    PlatformConfig.setWXFileProvider("com.tencent.sample2.fileprovider");
+
+  }
+
+
+  @ReactMethod
+  public  void setWeChatWork(String appKey,String corpId,String agentId){
+    // 企业微信设置
+    PlatformConfig.setWXWork(corpId,"",agentId,appKey);
+    PlatformConfig.setWXWorkFileProvider("com.tencent.sample2.fileprovider");
+  }
+
+
+
+
+}
diff --git a/android/src/main/java/com/damoness/rn/umeng/DplusReactPackage.java b/android/src/main/java/com/damoness/rn/umeng/DplusReactPackage.java
@@ -31,8 +31,8 @@ public List<NativeModule> createNativeModules(
         ReactApplicationContext reactContext) {
         List<NativeModule> modules = new ArrayList<>();
         modules.add(new ShareModule(reactContext));
-        //modules.add(new PushModule(reactContext));
+        modules.add(new ConfigureModule(reactContext));
         modules.add(new AnalyticsModule(reactContext));
         return modules;
     }
-}
+}
diff --git a/android/src/main/java/com/damoness/rn/umeng/RNUMConfigure.java b/android/src/main/java/com/damoness/rn/umeng/RNUMConfigure.java
diff --git a/android/src/main/java/com/damoness/rn/umeng/ShareModule.java b/android/src/main/java/com/damoness/rn/umeng/ShareModule.java
@@ -45,7 +45,7 @@ public static void initSocialSDK(Activity activity){
     }
     @Override
     public String getName() {
-        return "UMShareModule";
+        return "DMNShareModule";
     }
     private static void runOnMainThread(Runnable runnable) {
         mSDKHandler.postDelayed(runnable, 0);

diff --git a/example/android/app/src/main/java/com/example/damonessreactnativeumeng/MainApplication.java b/example/android/app/src/main/java/com/example/damonessreactnativeumeng/MainApplication.java
@@ -11,8 +11,6 @@
 import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 import com.damoness.rn.umeng.DplusReactPackage;
-import com.umeng.commonsdk.UMConfigure;
-import com.umeng.socialize.PlatformConfig;
 
 public class MainApplication extends Application implements ReactApplication {
 
@@ -50,16 +48,16 @@ public void onCreate() {
     SoLoader.init(this, /* native exopackage */ false);
     initializeFlipper(this, getReactNativeHost().getReactInstanceManager()); // Remove this line if you don't want Flipper enabled
 
-    UMConfigure.init(this,"5a12384aa40fa3551f0001d1"
-      ,"umeng",UMConfigure.DEVICE_TYPE_PHONE,"");//58edcfeb310c93091c000be2 5965ee00734be40b580001a0
-
-    // 微信设置
-    PlatformConfig.setWeixin("wx027de62cf741667e","2be841b3bac5e82323bbf49e2901853a");
-    PlatformConfig.setWXFileProvider("com.tencent.sample2.fileprovider");
-
-    // 企业微信设置
-    PlatformConfig.setWXWork("ww5a3c9b5d4dbd50d3","","1000005","wwauth5a3c9b5d4dbd50d3000005");
-    PlatformConfig.setWXWorkFileProvider("com.tencent.sample2.fileprovider");
+//    UMConfigure.init(this,"5a12384aa40fa3551f0001d1"
+//      ,"umeng",UMConfigure.DEVICE_TYPE_PHONE,"");//58edcfeb310c93091c000be2 5965ee00734be40b580001a0
+//
+//    // 微信设置
+//    PlatformConfig.setWeixin("wx027de62cf741667e","2be841b3bac5e82323bbf49e2901853a");
+//    PlatformConfig.setWXFileProvider("com.tencent.sample2.fileprovider");
+//
+//    // 企业微信设置
+//    PlatformConfig.setWXWork("ww5a3c9b5d4dbd50d3","","1000005","wwauth5a3c9b5d4dbd50d3000005");
+//    PlatformConfig.setWXWorkFileProvider("com.tencent.sample2.fileprovider");
 
   }
 

diff --git a/example/src/App.tsx b/example/src/App.tsx
@@ -6,25 +6,24 @@ import {
   Button,
   Alert,
   SafeAreaView,
-  Platform as Platform1,
 } from 'react-native';
-import { ShareUtil, Configure, Platform } from '@damoness/react-native-umeng';
+import {
+  ShareUtil,
+  Configure,
+  SharePlatform,
+} from '@damoness/react-native-umeng';
 
 import appJSON from '../app.json';
 
 let { umeng, wechatWork, wechat } = appJSON;
 
-// let wechat = appJSON['wechat-BieXiaBuyCar'];
-
-if (Platform1.OS === 'ios') {
-  Configure.initApp(umeng.appKey, 'RN');
-  Configure.setWeChat(wechat.appKey, wechat.appSecret, wechat.universalLink);
-  Configure.setWeChatWork(
-    wechatWork.appKey,
-    wechatWork.corpId,
-    wechatWork.agentId
-  );
-}
+Configure.initApp(umeng.appKey, 'RN');
+Configure.setWeChat(wechat.appKey, wechat.appSecret, wechat.universalLink);
+Configure.setWeChatWork(
+  wechatWork.appKey,
+  wechatWork.corpId,
+  wechatWork.agentId
+);
 
 export default function App() {
   return (
@@ -34,7 +33,7 @@ export default function App() {
           title={'微信登录'}
           onPress={async () => {
             try {
-              let re = await ShareUtil.auth(Platform.Wechat);
+              let re = await ShareUtil.auth(SharePlatform.Wechat);
               console.log(re);
               Alert.alert(JSON.stringify(re));
             } catch (error) {
@@ -46,7 +45,7 @@ export default function App() {
           title={'企业微信登录'}
           onPress={async () => {
             try {
-              let re = await ShareUtil.auth(Platform.WechatWork);
+              let re = await ShareUtil.auth(SharePlatform.WechatWork);
               console.log(re);
               Alert.alert(JSON.stringify(re));
             } catch (error) {
@@ -58,7 +57,7 @@ export default function App() {
           title={'微信登录 报错'}
           onPress={async () => {
             try {
-              await ShareUtil.auth(Platform.Wechat + 2);
+              await ShareUtil.auth(SharePlatform.Wechat + 2);
             } catch (error) {
               console.log('error', error);
               Alert.alert(JSON.stringify(error));
@@ -73,7 +72,11 @@ export default function App() {
               'http://t1.qichangv.com/images/logo/favition.png',
               'https://hot.cnbeta.com/articles/game/1097481.htm',
               '标题',
-              [Platform.Wechat, Platform.Wechat_TimeLine, Platform.WechatWork]
+              [
+                SharePlatform.Wechat,
+                SharePlatform.Wechat_TimeLine,
+                SharePlatform.WechatWork,
+              ]
             );
           }}
           title="分享面板 - 分享"
@@ -86,7 +89,11 @@ export default function App() {
               'http://t1.qichangv.com/images/logo/favition.png',
               '',
               '标题',
-              [Platform.Wechat, Platform.Wechat_TimeLine, Platform.WechatWork]
+              [
+                SharePlatform.Wechat,
+                SharePlatform.Wechat_TimeLine,
+                SharePlatform.WechatWork,
+              ]
             );
           }}
           title="分享面板 - 分享图片"
@@ -96,7 +103,7 @@ export default function App() {
           onPress={() => {
             ShareUtil.shareImageUrl(
               'https://static.cnbetacdn.com/article/2021/0807/ac0ec0fe399be7d.jpg',
-              Platform.Wechat
+              SharePlatform.Wechat
             );
           }}
           title="分享图片"
@@ -105,7 +112,7 @@ export default function App() {
         <Button
           onPress={() => {
             try {
-              ShareUtil.shareText('分享文字', Platform.Wechat_TimeLine);
+              ShareUtil.shareText('分享文字', SharePlatform.Wechat_TimeLine);
             } catch (error) {
               console.log(error);
             }
@@ -121,7 +128,7 @@ export default function App() {
                 '内容',
                 'https://github.com/damoness/react-native-umeng',
                 'https://static.cnbetacdn.com/article/2021/0807/ac0ec0fe399be7d.jpg',
-                Platform.Wechat + 1
+                SharePlatform.Wechat + 1
               ).then(
                 (data) => {
                   console.log(data);

diff --git a/ios/UM/DMNAnalyticsModule.h b/ios/UM/DMNAnalyticsModule.h
@@ -0,0 +1,13 @@
+//
+//  analytics.h
+//  analytics
+//
+//  Created by Damoness on 26/02/2022.
+//  Copyright © 2017 Facebook. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <React/RCTBridgeModule.h>
+@interface DMNAnalyticsModule : NSObject  <RCTBridgeModule>
+
+@end
diff --git a/ios/UM/UMAnalyticsModule.m → ios/UM/DMNAnalyticsModule.m b/ios/UM/UMAnalyticsModule.m → ios/UM/DMNAnalyticsModule.m
@@ -2,16 +2,16 @@
 //  analytics.m
 //  analytics
 //
-//
-//  Copyright (c) 2016年 tendcloud. All rights reserved.
+//  Created by Damoness on 26/02/2022.
+//  Copyright © 2017 Facebook. All rights reserved.
 //
 
 #import <UMCommon/MobClick.h>
-#import "UMAnalyticsModule.h"
+#import "DMNAnalyticsModule.h"
 #import <React/RCTConvert.h>
 #import <React/RCTEventDispatcher.h>
 
-@implementation UMAnalyticsModule
+@implementation DMNAnalyticsModule
 
 RCT_EXPORT_MODULE();
 

diff --git a/ios/UM/RNUMConfigure.h → ios/UM/DMNConfigure.h b/ios/UM/RNUMConfigure.h → ios/UM/DMNConfigure.h
@@ -1,16 +1,15 @@
 //
-//  RNUMConfigure.h
-//  UMComponent
+//  DMNConfigure.h
 //
-//  Created by wyq.Cloudayc on 14/09/2017.
+//  Created by Damoness on 26/02/2022.
 //  Copyright © 2017 Facebook. All rights reserved.
 //
 
 #import <Foundation/Foundation.h>
 #import <UMCommon/UMCommon.h>
 #import <React/RCTBridgeModule.h>
 
-@interface RNUMConfigure : NSObject <RCTBridgeModule>
+@interface DMNConfigure : NSObject <RCTBridgeModule>
 
 
 @end
diff --git a/ios/UM/RNUMConfigure.m → ios/UM/DMNConfigure.m b/ios/UM/RNUMConfigure.m → ios/UM/DMNConfigure.m
@@ -1,15 +1,14 @@
 //
 //  RNUMConfigure.m
-//  UMComponent
 //
-//  Created by wyq.Cloudayc on 14/09/2017.
+//  Created by Damoness on 26/02/2022.
 //  Copyright © 2017 Facebook. All rights reserved.
 //
 
-#import "RNUMConfigure.h"
+#import "DMNConfigure.h"
 #import <UMShare/UMShare.h>
 
-@implementation RNUMConfigure
+@implementation DMNConfigure
 
 RCT_EXPORT_MODULE();
 
@@ -18,7 +17,7 @@ - (dispatch_queue_t)methodQueue
   return dispatch_get_main_queue();
 }
 
-RCT_EXPORT_METHOD(initWithAppKey:(NSString *)appkey channel:(NSString *)channel)
+RCT_EXPORT_METHOD(initApp:(NSString *)appkey channel:(NSString *)channel)
 {
   SEL sel = NSSelectorFromString(@"setWraperType:wrapperVersion:");
   if ([UMConfigure respondsToSelector:sel]) {

diff --git a/ios/UM/UMPushModule.h → ios/UM/DMNPushModule.h b/ios/UM/UMPushModule.h → ios/UM/DMNPushModule.h
@@ -1,14 +1,13 @@
 //
 //  PushModule.h
-//  UMComponent
 //
-//  Created by wyq.Cloudayc on 11/09/2017.
+//  Created by Damoness on 26/02/2022.
 //  Copyright © 2017 Facebook. All rights reserved.
 //
 
 #import <Foundation/Foundation.h>
 #import <React/RCTBridgeModule.h>
 
-@interface UMPushModule : NSObject <RCTBridgeModule>
+@interface DMNPushModule : NSObject <RCTBridgeModule>
 
 @end
diff --git a/ios/UM/UMPushModule.m → ios/UM/DMNPushModule.m b/ios/UM/UMPushModule.m → ios/UM/DMNPushModule.m
@@ -1,17 +1,16 @@
 //
 //  PushModule.m
-//  UMComponent
 //
-//  Created by wyq.Cloudayc on 11/09/2017.
+//  Created by Damoness on 26/02/2022.
 //  Copyright © 2017 Facebook. All rights reserved.
 //
 
-#import "UMPushModule.h"
+#import "DMNPushModule.h"
 #import <UMPush/UMessage.h>
 #import <React/RCTConvert.h>
 #import <React/RCTEventDispatcher.h>
 
-@implementation UMPushModule
+@implementation DMNPushModule
 
 RCT_EXPORT_MODULE();