add Native Module

SummerRock · Mar 4, 2024 · ec93fad · ec93fad
1 parent 1cf2e60
commit ec93fad
Show file tree

Hide file tree

Showing 8 changed files with 76 additions and 26 deletions.
diff --git a/android/app/src/main/java/com/example/myapplication/BaseApplication.java b/android/app/src/main/java/com/example/myapplication/BaseApplication.java
@@ -19,7 +19,7 @@
 import com.example.monitor.AppLifecycleListener;
 import com.example.myapplication.base.login.LoginManager;
 import com.example.myapplication.main.MainActivityV2;
-import com.example.react.module.NetworkModulePackage;
+import com.example.react.module.DefaultModulePackage;
 import com.facebook.react.PackageList;
 import com.facebook.react.ReactApplication;
 import com.facebook.react.ReactNativeHost;
@@ -43,7 +43,7 @@ public boolean getUseDeveloperSupport() {
         protected List<ReactPackage> getPackages() {
             List<ReactPackage> packages = new PackageList(this).getPackages();
             // Packages that cannot be autolinked yet can be added manually here
-            packages.add(new NetworkModulePackage());
+            packages.add(new DefaultModulePackage());
             return packages;
         }
     };

diff --git a/android/react/src/main/java/com/example/react/BaseReactActivity.java b/android/react/src/main/java/com/example/react/BaseReactActivity.java
@@ -11,7 +11,7 @@
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.common.mainModule.LogUtils;
 import com.common.router.RouterConstants;
-import com.example.react.module.NetworkModulePackage;
+import com.example.react.module.DefaultModulePackage;
 import com.facebook.react.PackageList;
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactPackage;
@@ -45,7 +45,7 @@ protected void onCreate(Bundle savedInstanceState) {
         }
         mReactRootView = new ReactRootView(this);
         List<ReactPackage> packages = new PackageList(getApplication()).getPackages();
-        packages.add(new NetworkModulePackage());
+        packages.add(new DefaultModulePackage());
         // 有一些第三方可能不能自动链接，对于这些包我们可以用下面的方式手动添加进来：
         // packages.add(new MyReactNativePackage());
         // 同时需要手动把他们添加到`settings.gradle`和 `app/build.gradle`配置文件中。

diff --git a/android/react/src/main/java/com/example/react/module/CloseActivityModule.java b/android/react/src/main/java/com/example/react/module/CloseActivityModule.java
@@ -0,0 +1,28 @@
+package com.example.react.module;
+
+import android.app.Activity;
+
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.ReactMethod;
+
+public class CloseActivityModule extends ReactContextBaseJavaModule {
+
+    public CloseActivityModule(ReactApplicationContext reactContext) {
+        super(reactContext);
+    }
+
+    @Override
+    public String getName() {
+        return "CloseActivityModule";
+    }
+
+    @ReactMethod
+    public void closeActivity() {
+        Activity currentActivity = getCurrentActivity();
+        if (currentActivity != null) {
+            currentActivity.finish();
+        }
+    }
+}
+
diff --git a/...le/react/module/NetworkModulePackage.java → ...le/react/module/DefaultModulePackage.java b/...le/react/module/NetworkModulePackage.java → ...le/react/module/DefaultModulePackage.java
@@ -11,12 +11,13 @@
 import java.util.Collections;
 import java.util.List;
 
-public class NetworkModulePackage implements ReactPackage {
+public class DefaultModulePackage implements ReactPackage {
     @NonNull
     @Override
     public List<NativeModule> createNativeModules(@NonNull ReactApplicationContext reactApplicationContext) {
         List<NativeModule> modules = new ArrayList<>();
         modules.add(new NetworkNativeModule(reactApplicationContext));
+        modules.add(new CloseActivityModule(reactApplicationContext));
         return modules;
     }
 

diff --git a/app/common/native/module.ts b/app/common/native/module.ts
@@ -1,3 +1,5 @@
 import { NativeModules } from 'react-native';
 
 export default NativeModules.NetworkNativeModule;
+
+export const CloseActivityModule = NativeModules.CloseActivityModule;
diff --git a/app/pages/collection/image/arrow_black.png b/app/pages/collection/image/arrow_black.png
diff --git a/app/pages/collection/index.tsx b/app/pages/collection/index.tsx
@@ -1,9 +1,10 @@
 import React, {useEffect, useState} from 'react';
-import {FlatList, Linking, StyleSheet, Text, TouchableOpacity, View} from 'react-native';
+import {ActivityIndicator, FlatList, Linking, Image, StyleSheet, Text, TouchableOpacity, View} from 'react-native';
 import {CollectionData, CollectionItem} from "./interface";
 import {commonFetch, NetStatus} from "../../common/network";
 import ApiStatus from "../../common/component/apiStatus";
 import {Constants, ListInterActStatus} from "../../common/constants";
+import {CloseActivityModule} from "../../common/native/module";
 
 const App = (initialProps) => {
 
@@ -17,7 +18,10 @@ const App = (initialProps) => {
             if (!responseData) {
                 setStatus(NetStatus.LOADING)
             }
-            const result = await commonFetch<CollectionData>('https://www.wanandroid.com/lg/collect/list/0/json/');
+            const page = responseData?.curPage || 0
+            const url = `https://www.wanandroid.com/lg/collect/list/${page}/json/`;
+            const result = await commonFetch<CollectionData>(url);
+            // console.log(result)
             setStatus(NetStatus.SUCCESS)
             setResponseData(result.data);
         } catch (error: Error) {
@@ -65,6 +69,21 @@ const App = (initialProps) => {
             });
     };
 
+    const onLoadMore = () => {
+        console.log('onLoadMore', listInterActStatus)
+        if (listInterActStatus != ListInterActStatus.normal) {
+            return
+        }
+        setListInterActStatus(ListInterActStatus.loadMore);
+        // 模拟加载更多操作
+        fetchData().then(() => {
+            setListInterActStatus(ListInterActStatus.normal);
+        })
+            .catch(error => {
+                setListInterActStatus(ListInterActStatus.normal);
+            });
+    };
+
     const listView = () => {
         if ((responseData?.datas || []).length > 0) {
             return <FlatList
@@ -73,6 +92,8 @@ const App = (initialProps) => {
                 renderItem={renderItemView}
                 onRefresh={onRefresh}
                 refreshing={listInterActStatus === ListInterActStatus.refreshing}
+                onEndReachedThreshold={0.05}
+                ListFooterComponent={responseData.over ? <ActivityIndicator/> : null}
             />
         } else {
             return null;
@@ -81,7 +102,14 @@ const App = (initialProps) => {
 
     return (
         <View style={styles.container}>
-            <Text>我的收藏-React Native</Text>
+            <View style={{ flexDirection: 'row', alignItems: 'center'}}>
+                <TouchableOpacity onPress={()=> {
+                    CloseActivityModule.closeActivity()
+                }}>
+                    <Image source={require('../collection/image/arrow_black.png')} style={styles.tinyImage} />
+                </TouchableOpacity>
+                <Text>我的收藏-React Native</Text>
+            </View>
             <ApiStatus apiStatus={status}
                        failCallback={fetchData}
                        errorMsg={errorMsg}
@@ -102,6 +130,10 @@ const styles = StyleSheet.create({
         fontSize: 18,
         height: 44,
     },
+    tinyImage: {
+        width: 18,
+        height: 18,
+    },
 });
 
 export default App;
diff --git a/app/pages/collection/interface.ts b/app/pages/collection/interface.ts
@@ -1,24 +1,11 @@
-export interface DataResp {
-    articleList: any[]
-    author: string
-    children: any[]
-    courseId: number
-    cover: string
-    desc: string
-    id: number
-    lisense: string
-    lisenseLink: string
-    name: string
-    order: number
-    parentChapterId: number
-    type: number
-    userControlSetTop: boolean
-    visible: number
-}
-
 export interface CollectionData {
     curPage: number
     datas: CollectionItem[]
+    offset: number
+    over: boolean
+    pageCount: number
+    size: number
+    total: number
 }
 
 export interface CollectionItem {