feat: 修改设置企业微信参数

Damoness · Feb 28, 2022 · 45a8e2f · 45a8e2f
1 parent 74ecb71
commit 45a8e2f
Show file tree

Hide file tree

Showing 11 changed files with 73 additions and 39 deletions.
diff --git a/android/src/main/java/com/damoness/rn/umeng/ConfigureModule.java b/android/src/main/java/com/damoness/rn/umeng/ConfigureModule.java
@@ -1,15 +1,16 @@
 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 {
-
+public class ConfigureModule extends ReactContextBaseJavaModule {
 
   private ReactApplicationContext context;
+
   public ConfigureModule(ReactApplicationContext reactContext) {
     super(reactContext);
     context = reactContext;
@@ -20,31 +21,25 @@ public String getName() {
     return "DMNConfigure";
   }
 
-
   @ReactMethod
-  public  void initApp(String appKey,String channel){
-        //初始化
-        UMConfigure.init(this.getReactApplicationContext(),appKey,channel,UMConfigure.DEVICE_TYPE_PHONE,"");
+  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){
+  public void setWeChat(String appKey, String appSecret) {
     // 微信设置
-    PlatformConfig.setWeixin(appKey,appSecret);
+    PlatformConfig.setWeixin(appKey, appSecret);
     PlatformConfig.setWXFileProvider("com.tencent.sample2.fileprovider");
 
   }
 
-
   @ReactMethod
-  public  void setWeChatWork(String appKey,String corpId,String agentId){
+  public void setWeChatWork(String appKey, String appSecret, String corpId, String agentId) {
     // 企业微信设置
-    PlatformConfig.setWXWork(corpId,"",agentId,appKey);
+    PlatformConfig.setWXWork(corpId, appSecret, agentId, appKey);
     PlatformConfig.setWXWorkFileProvider("com.tencent.sample2.fileprovider");
   }
 
-
-
-
 }
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
@@ -77,7 +77,7 @@ import com.android.build.OutputFile
 
 project.ext.react = [
     enableHermes: false,  // clean and rebuild if changing
-    entryFile: "index.tsx",
+    entryFile: "index.js",
 ]
 
 apply from: "../../node_modules/react-native/react.gradle"

diff --git a/example/app.json b/example/app.json
@@ -20,6 +20,7 @@
   },
   "wechatWork": {
     "appKey": "wwauth5a3c9b5d4dbd50d3000005",
+    "appSecret": "T4rIOiRRhGMLgSg1ysSAVBUongtNAw00oVs_cllULzk",
     "corpId": "ww5a3c9b5d4dbd50d3",
     "agentId": "1000005",
     "ios_bundle_id": "com.zofund.crmmanage.test",

diff --git a/example/index.tsx → example/index.js b/example/index.tsx → example/index.js
diff --git a/example/ios/ReactNativeUmengExample.xcodeproj/project.pbxproj b/example/ios/ReactNativeUmengExample.xcodeproj/project.pbxproj
@@ -303,7 +303,8 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = X3384B9A6U;
+				DEVELOPMENT_TEAM = 8XXP5W7RV4;
+				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = ReactNativeUmengExample/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				MARKETING_VERSION = 3.8.4;
@@ -314,6 +315,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.zofund.crmmanage.test;
 				PRODUCT_NAME = ReactNativeUmengExample;
+				PROVISIONING_PROFILE_SPECIFIER = "Development _com.zofund.crmmanage.test";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
 			};

diff --git a/...ReactNativeUmengExample.xcodeproj/xcshareddata/xcschemes/ReactNativeUmengExample.xcscheme b/...ReactNativeUmengExample.xcodeproj/xcshareddata/xcschemes/ReactNativeUmengExample.xcscheme
@@ -50,6 +50,8 @@
             ReferencedContainer = "container:ReactNativeUmengExample.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
+      <Testables>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"

diff --git a/example/src/App.tsx b/example/src/App.tsx
@@ -18,14 +18,6 @@ import appJSON from '../app.json';
 
 let { umeng, wechatWork, wechat } = appJSON;
 
-Configure.initApp(umeng.appKey, 'RN');
-Configure.setWeChat(wechat.appKey, wechat.appSecret, wechat.universalLink);
-Configure.setWeChatWork(
-  wechatWork.appKey,
-  wechatWork.corpId,
-  wechatWork.agentId
-);
-
 const getCommonFunctionData = (platform: SharePlatform) => {
   return [
     {
@@ -80,6 +72,24 @@ const getCommonFunctionData = (platform: SharePlatform) => {
 };
 
 export default function App() {
+  React.useEffect(() => {
+    async function init() {
+      await Configure.initApp(umeng.appKey, 'RN');
+      await Configure.setWeChat(
+        wechat.appKey,
+        wechat.appSecret,
+        wechat.universalLink
+      );
+      await Configure.setWeChatWork(
+        wechatWork.appKey,
+        wechatWork.appSecret,
+        wechatWork.corpId,
+        wechatWork.agentId
+      );
+    }
+    init();
+  }, []);
+
   return (
     <SafeAreaView style={styles.container}>
       <SectionList

diff --git a/ios/UM/DMNConfigure.m b/ios/UM/DMNConfigure.m
@@ -17,7 +17,10 @@ - (dispatch_queue_t)methodQueue
   return dispatch_get_main_queue();
 }
 
-RCT_EXPORT_METHOD(initApp:(NSString *)appkey channel:(NSString *)channel)
+RCT_EXPORT_METHOD(initApp:(NSString *)appkey
+                  channel:(NSString *)channel
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
 {
   SEL sel = NSSelectorFromString(@"setWraperType:wrapperVersion:");
   if ([UMConfigure respondsToSelector:sel]) {
@@ -28,12 +31,18 @@ - (dispatch_queue_t)methodQueue
   [UMConfigure setLogEnabled:YES];//设置打开日志
 
   [UMConfigure initWithAppkey:appkey channel:channel];
+
+  resolve(@(true));
 }
 
 /**
  设置微信
  */
-RCT_EXPORT_METHOD(setWeChat:(NSString *)appkey appSecret:(NSString *)appSecret universalLink:(NSString *)universalLink){
+RCT_EXPORT_METHOD(setWeChat:(NSString *)appkey
+                  appSecret:(NSString *)appSecret
+                  universalLink:(NSString *)universalLink
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject){
 
 
     //配置微信平台的Universal Links
@@ -44,20 +53,28 @@ - (dispatch_queue_t)methodQueue
     /* 设置微信的appKey和appSecret */
     [[UMSocialManager defaultManager] setPlaform:UMSocialPlatformType_WechatSession appKey:appkey appSecret:appSecret redirectURL:nil];
 
+    resolve(@(true));
 }
 
 
 /**
  设置企业微信
  */
-RCT_EXPORT_METHOD(setWeChatWork:(NSString *)appkey corpId:(NSString *)corpId agentId:(NSString *)agentId){
+RCT_EXPORT_METHOD(setWeChatWork:(NSString *)appkey
+                  appSecret:(NSString *)appSecret
+                  corpId:(NSString *)corpId
+                  agentId:(NSString *)agentId
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject){
 
-    [[UMSocialManager defaultManager] setPlaform:UMSocialPlatformType_WechatWork appKey:appkey appSecret:nil redirectURL:nil];
+    [[UMSocialManager defaultManager] setPlaform:UMSocialPlatformType_WechatWork appKey:appkey appSecret:appSecret redirectURL:nil];
 
     //extraInitDic，企业微信增加了corpid和agentid，故在UMSocialGlobal的全局配置里面增加extraInitDic来存储额外的初始化参数。extraInitDic的key:corpId和agentId为固定值
     [UMSocialGlobal shareInstance].extraInitDic =@{
     @(UMSocialPlatformType_WechatWork):@{@"corpId":corpId,@"agentId":agentId}
     };
+
+    resolve(@(true));
 }
 
 @end
diff --git a/ios/UM/DMNShareModule.m b/ios/UM/DMNShareModule.m
@@ -23,13 +23,13 @@ - (dispatch_queue_t)methodQueue
 - (UMSocialPlatformType)platformType:(NSInteger)platform
 {
   switch (platform) {
-    case 0: // QQ
+    case 0: //QQ
       return UMSocialPlatformType_QQ;
-    case 1: // Sina
+    case 1: //Sina
       return UMSocialPlatformType_Sina;
-    case 2: // wechat
+    case 2: //wechat
       return UMSocialPlatformType_WechatSession;
-    case 3:
+    case 3: //
       return UMSocialPlatformType_WechatTimeLine;
     case 4:
         return UMSocialPlatformType_WechatWork;

diff --git a/package.json b/package.json
@@ -29,7 +29,8 @@
     "release": "release-it",
     "example": "yarn --cwd example",
     "pods": "cd example && pod-install --quiet",
-    "bootstrap": "yarn example && yarn && yarn pods"
+    "bootstrap": "yarn example && yarn && yarn pods",
+    "ar": "adb reverse tcp:8081 tcp:8081"
   },
   "keywords": [
     "react-native",

diff --git a/src/Configure.ts b/src/Configure.ts
@@ -8,8 +8,8 @@ const Configure = NativeModules.DMNConfigure;
  * @param channel //渠道
  * @returns
  */
-export function initApp(appKey: string, channel: string) {
-  return Configure.initApp(appKey, channel);
+export async function initApp(appKey: string, channel: string) {
+  return await Configure.initApp(appKey, channel);
 }
 
 /**
@@ -18,7 +18,7 @@ export function initApp(appKey: string, channel: string) {
  * @param appSecret
  * @param universalLink
  */
-export function setWeChat(
+export async function setWeChat(
   appKey: string,
   appSecret: string,
   universalLink: string
@@ -33,9 +33,15 @@ export function setWeChat(
 /**
  * 设置企业微信
  * @param appKey
+ * @param appSecret
  * @param corpId
  * @param agentId
  */
-export function setWeChatWork(appKey: string, corpId: string, agentId: string) {
-  Configure.setWeChatWork(appKey, corpId, agentId);
+export async function setWeChatWork(
+  appKey: string,
+  appSecret: string,
+  corpId: string,
+  agentId: string
+) {
+  return await Configure.setWeChatWork(appKey, appSecret, corpId, agentId);
 }