Compare commits
142 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6661e307cd | ||
|
|
027bd16af2 | ||
|
|
4daaadce70 | ||
|
|
43ed2f50fe | ||
|
|
e46d01714a | ||
|
|
366b2a6618 | ||
|
|
34e053ae48 | ||
|
|
d55ef1d8c8 | ||
|
|
de3e7d9e4c | ||
|
|
e0201d3882 | ||
|
|
ba5b35813d | ||
|
|
3134f36739 | ||
|
|
d4f4740053 | ||
|
|
a248f18035 | ||
|
|
268f39f43b | ||
|
|
6e4f432e26 | ||
|
|
1b4c03924a | ||
|
|
d458371f54 | ||
|
|
84381e5ed7 | ||
|
|
8970fd406d | ||
|
|
34d6fef493 | ||
|
|
84b71e33a8 | ||
|
|
6cd99dece0 | ||
|
|
d726f3602b | ||
|
|
da21c99bcc | ||
|
|
1f8748375c | ||
|
|
fa731cd583 | ||
|
|
d077dcb6d3 | ||
|
|
59b60fdc6d | ||
|
|
c768705221 | ||
|
|
57206dd2f1 | ||
|
|
4e27d906c3 | ||
|
|
c24f469475 | ||
|
|
8f8a29eda8 | ||
|
|
a78542b214 | ||
|
|
8d9ae57a5f | ||
|
|
2502935fc0 | ||
|
|
8e6d9bf460 | ||
|
|
897f334343 | ||
|
|
33bc69c3fb | ||
|
|
5028ce31be | ||
|
|
d3a4007763 | ||
|
|
a4f3e3cc38 | ||
|
|
9d51128ed3 | ||
|
|
eddb072927 | ||
|
|
4f9417d620 | ||
|
|
6f2314d3c9 | ||
|
|
a6e9ece559 | ||
|
|
78430e2ec2 | ||
|
|
ec5b9e1938 | ||
|
|
53dfb45ca2 | ||
|
|
4a62e89c73 | ||
|
|
655f4c8cf5 | ||
|
|
3732c196a1 | ||
|
|
bfb520bd07 | ||
|
|
f7be8a4d71 | ||
|
|
4383a66274 | ||
|
|
a82b75f51f | ||
|
|
584f698329 | ||
|
|
e58903a634 | ||
|
|
41e1028b2d | ||
|
|
11d40ce5f2 | ||
|
|
4a1d4d5a50 | ||
|
|
02517a9eb0 | ||
|
|
f7309f699f | ||
|
|
a224113998 | ||
|
|
f2ede92ea1 | ||
|
|
a913e8c10e | ||
|
|
c5f458291a | ||
|
|
9699632a43 | ||
|
|
80e42f5dba | ||
|
|
9b718b8f75 | ||
|
|
99e3431844 | ||
|
|
d7b5562ab7 | ||
|
|
6a0a5b2d49 | ||
|
|
7023ff57ca | ||
|
|
17e21d79cf | ||
|
|
1cab582bd0 | ||
|
|
7da5a165fd | ||
|
|
d5194a1ad1 | ||
|
|
ebc9b97e70 | ||
|
|
40742e16d8 | ||
|
|
598ae1a506 | ||
|
|
e5424591d1 | ||
|
|
2cf7336b6a | ||
|
|
7eac48ab5d | ||
|
|
18d9b75545 | ||
|
|
e8ec85c65f | ||
|
|
48a776d506 | ||
|
|
8ad526148f | ||
|
|
cea39f1746 | ||
|
|
aa56c2ec0f | ||
|
|
00a989d567 | ||
|
|
83ca3a6c05 | ||
|
|
257f2697e0 | ||
|
|
77aa345f11 | ||
|
|
66332d007a | ||
|
|
37849b1730 | ||
|
|
c771672fcd | ||
|
|
2978454298 | ||
|
|
905413e424 | ||
|
|
ee36fd9334 | ||
|
|
5b46071834 | ||
|
|
a6802bdd44 | ||
|
|
97848e7b13 | ||
|
|
bf3a0808f6 | ||
|
|
4a7bb19ca1 | ||
|
|
7a8640d582 | ||
|
|
ff50e03446 | ||
|
|
7888010061 | ||
|
|
a9c360620f | ||
|
|
05738ec204 | ||
|
|
e4ef93595b | ||
|
|
b336926838 | ||
|
|
628647df98 | ||
|
|
7d76034415 | ||
|
|
ac217f659f | ||
|
|
0e077b1de0 | ||
|
|
1767fe37fa | ||
|
|
7a9f579327 | ||
|
|
350bfa0c89 | ||
|
|
58ef3e6b22 | ||
|
|
4dd89a1e74 | ||
|
|
0019e9dd95 | ||
|
|
90f6b7bcb3 | ||
|
|
828740823d | ||
|
|
135e0c5595 | ||
|
|
06fc213da3 | ||
|
|
a52d18dce2 | ||
|
|
cef2b41a64 | ||
|
|
fc5d248e2e | ||
|
|
d5fd6c006d | ||
|
|
26924d7e6c | ||
|
|
3876110a66 | ||
|
|
93f2d51c46 | ||
|
|
4944b05378 | ||
|
|
90d1539038 | ||
|
|
26eacb923a | ||
|
|
37739940ab | ||
|
|
020e4f9239 | ||
|
|
e0d4fe81fd | ||
|
|
49b0c25a3d |
9
.gitignore
vendored
@@ -51,3 +51,12 @@ android/bin
|
|||||||
Example/testHotUpdate/harmony
|
Example/testHotUpdate/harmony
|
||||||
Example/testHotUpdate/android/app/.cxx
|
Example/testHotUpdate/android/app/.cxx
|
||||||
Example/harmony_use_pushy/libs
|
Example/harmony_use_pushy/libs
|
||||||
|
**/mcp.json
|
||||||
|
|
||||||
|
|
||||||
|
harmony/package
|
||||||
|
**/oh_modules
|
||||||
|
harmony/pushy/.preview
|
||||||
|
Example/harmony_use_pushy/harmony/entry/src/main/resources/rawfile/meta.json
|
||||||
|
**/.hvigor
|
||||||
|
Example/harmony_use_pushy/harmony/entry/src/main/cpp/generated
|
||||||
|
|||||||
6
.gitmodules
vendored
@@ -4,9 +4,3 @@
|
|||||||
[submodule "android/jni/HDiffPatch"]
|
[submodule "android/jni/HDiffPatch"]
|
||||||
path = android/jni/HDiffPatch
|
path = android/jni/HDiffPatch
|
||||||
url = https://github.com/sisong/HDiffPatch.git
|
url = https://github.com/sisong/HDiffPatch.git
|
||||||
[submodule "harmony/src/main/cpp/HDiffPatch"]
|
|
||||||
path = harmony/src/main/cpp/HDiffPatch
|
|
||||||
url = https://github.com/sisong/HDiffPatch.git
|
|
||||||
[submodule "harmony/src/main/cpp/lzma"]
|
|
||||||
path = harmony/src/main/cpp/lzma
|
|
||||||
url = https://github.com/sisong/lzma.git
|
|
||||||
|
|||||||
@@ -6,6 +6,7 @@
|
|||||||
Example
|
Example
|
||||||
android/build
|
android/build
|
||||||
.vscode
|
.vscode
|
||||||
|
.github/
|
||||||
|
|
||||||
# OSX
|
# OSX
|
||||||
#
|
#
|
||||||
@@ -45,8 +46,12 @@ node_modules/
|
|||||||
npm-debug.log
|
npm-debug.log
|
||||||
Example
|
Example
|
||||||
yarn.lock
|
yarn.lock
|
||||||
|
bun.lock
|
||||||
|
|
||||||
domains.json
|
domains.json
|
||||||
endpoints.json
|
endpoints.json
|
||||||
|
endpoints_cresc.json
|
||||||
|
|
||||||
tea.yaml
|
tea.yaml
|
||||||
|
|
||||||
|
e2e/
|
||||||
@@ -1 +0,0 @@
|
|||||||
nodeLinker: node-modules
|
|
||||||
36
Example/expoUsePushy/.gitignore
vendored
Normal file
@@ -0,0 +1,36 @@
|
|||||||
|
# Learn more https://docs.github.com/en/get-started/getting-started-with-git/ignoring-files
|
||||||
|
|
||||||
|
# dependencies
|
||||||
|
node_modules/
|
||||||
|
|
||||||
|
# Expo
|
||||||
|
.expo/
|
||||||
|
dist/
|
||||||
|
web-build/
|
||||||
|
expo-env.d.ts
|
||||||
|
|
||||||
|
# Native
|
||||||
|
*.orig.*
|
||||||
|
*.jks
|
||||||
|
*.p8
|
||||||
|
*.p12
|
||||||
|
*.key
|
||||||
|
*.mobileprovision
|
||||||
|
|
||||||
|
# Metro
|
||||||
|
.metro-health-check*
|
||||||
|
|
||||||
|
# debug
|
||||||
|
npm-debug.*
|
||||||
|
yarn-debug.*
|
||||||
|
yarn-error.*
|
||||||
|
|
||||||
|
# macOS
|
||||||
|
.DS_Store
|
||||||
|
*.pem
|
||||||
|
|
||||||
|
# local env files
|
||||||
|
.env*.local
|
||||||
|
|
||||||
|
# typescript
|
||||||
|
*.tsbuildinfo
|
||||||
221
Example/expoUsePushy/App.tsx
Normal file
@@ -0,0 +1,221 @@
|
|||||||
|
/* eslint-disable react/no-unstable-nested-components */
|
||||||
|
/* eslint-disable react-native/no-inline-styles */
|
||||||
|
import React, {useState} from 'react';
|
||||||
|
import {StyleSheet, Text, View, TouchableOpacity, Image} from 'react-native';
|
||||||
|
|
||||||
|
import TestConsole from './TestConsole';
|
||||||
|
|
||||||
|
import _updateConfig from './update.json';
|
||||||
|
import {PushyProvider, Pushy, usePushy} from 'react-native-update';
|
||||||
|
const {appKey} = _updateConfig.android;
|
||||||
|
|
||||||
|
function Home() {
|
||||||
|
const {
|
||||||
|
client,
|
||||||
|
checkUpdate,
|
||||||
|
downloadUpdate,
|
||||||
|
switchVersionLater,
|
||||||
|
switchVersion,
|
||||||
|
updateInfo,
|
||||||
|
packageVersion,
|
||||||
|
currentHash,
|
||||||
|
progress: {received, total} = {},
|
||||||
|
} = usePushy();
|
||||||
|
const [useDefaultAlert, setUseDefaultAlert] = useState(false);
|
||||||
|
const [showTestConsole, setShowTestConsole] = useState(false);
|
||||||
|
const [showUpdateBanner, setShowUpdateBanner] = useState(false);
|
||||||
|
const [showUpdateSnackbar, setShowUpdateSnackbar] = useState(false);
|
||||||
|
// if (updateInfo) {
|
||||||
|
// updateInfo!.name = 'name';
|
||||||
|
// updateInfo!.update = true;
|
||||||
|
// }
|
||||||
|
const snackbarVisible =
|
||||||
|
!useDefaultAlert && showUpdateSnackbar && updateInfo?.update;
|
||||||
|
|
||||||
|
if (showTestConsole) {
|
||||||
|
return (
|
||||||
|
<TestConsole visible={true} onClose={() => setShowTestConsole(false)} />
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<View style={styles.container}>
|
||||||
|
<Text style={styles.welcome}>欢迎使用Pushy热更新服务</Text>
|
||||||
|
{/* <Text style={styles.welcome}>😁hdiffFromAPP更新成功!!!</Text> */}
|
||||||
|
{/* <Text style={styles.welcome}>😁hdiffFromPPk更新成功!!!</Text> */}
|
||||||
|
<View style={{flexDirection: 'row'}}>
|
||||||
|
<TouchableOpacity
|
||||||
|
onPress={() => {
|
||||||
|
client?.setOptions({
|
||||||
|
updateStrategy: !useDefaultAlert ? null : 'alwaysAlert',
|
||||||
|
});
|
||||||
|
setShowUpdateSnackbar(useDefaultAlert);
|
||||||
|
setUseDefaultAlert(!useDefaultAlert);
|
||||||
|
}}
|
||||||
|
style={{
|
||||||
|
flexDirection: 'row',
|
||||||
|
alignItems: 'center',
|
||||||
|
}}>
|
||||||
|
<View
|
||||||
|
style={{
|
||||||
|
width: 20,
|
||||||
|
height: 20,
|
||||||
|
borderWidth: 1,
|
||||||
|
borderColor: '#999',
|
||||||
|
backgroundColor: useDefaultAlert ? 'blue' : 'white',
|
||||||
|
justifyContent: 'center',
|
||||||
|
alignItems: 'center',
|
||||||
|
}}>
|
||||||
|
{useDefaultAlert && <Text style={{color: 'white'}}>✓</Text>}
|
||||||
|
</View>
|
||||||
|
<Text style={{marginLeft: 8}}>
|
||||||
|
{' '}
|
||||||
|
{useDefaultAlert ? '当前使用' : '当前不使用'}默认的alert更新提示
|
||||||
|
</Text>
|
||||||
|
</TouchableOpacity>
|
||||||
|
</View>
|
||||||
|
<Image
|
||||||
|
resizeMode={'contain'}
|
||||||
|
source={require('./assets/shezhi.png')}
|
||||||
|
style={styles.image}
|
||||||
|
/>
|
||||||
|
<Text style={styles.instructions}>
|
||||||
|
这是版本一 {'\n'}
|
||||||
|
当前原生包版本号: {packageVersion}
|
||||||
|
{'\n'}
|
||||||
|
当前热更新版本Hash: {currentHash || '(空)'}
|
||||||
|
{'\n'}
|
||||||
|
</Text>
|
||||||
|
<Text>
|
||||||
|
下载进度:{received} / {total}
|
||||||
|
</Text>
|
||||||
|
<TouchableOpacity
|
||||||
|
onPress={() => {
|
||||||
|
checkUpdate();
|
||||||
|
setShowUpdateSnackbar(true);
|
||||||
|
}}>
|
||||||
|
<Text style={styles.instructions}>点击这里检查更新</Text>
|
||||||
|
</TouchableOpacity>
|
||||||
|
|
||||||
|
<TouchableOpacity
|
||||||
|
testID="testcase"
|
||||||
|
style={{marginTop: 15}}
|
||||||
|
onPress={() => {
|
||||||
|
setShowTestConsole(true);
|
||||||
|
}}>
|
||||||
|
<Text style={styles.instructions}>
|
||||||
|
react-native-update版本:{client?.version}
|
||||||
|
</Text>
|
||||||
|
</TouchableOpacity>
|
||||||
|
{snackbarVisible && (
|
||||||
|
<View style={styles.overlay}>
|
||||||
|
<View
|
||||||
|
style={{
|
||||||
|
width: '100%',
|
||||||
|
backgroundColor: '#333',
|
||||||
|
padding: 16,
|
||||||
|
flexDirection: 'row',
|
||||||
|
justifyContent: 'space-between',
|
||||||
|
alignItems: 'center',
|
||||||
|
}}>
|
||||||
|
<Text style={{color: 'white'}}>
|
||||||
|
有新版本({updateInfo.name})可用,是否更新?
|
||||||
|
</Text>
|
||||||
|
<View style={{flexDirection: 'row'}}>
|
||||||
|
<TouchableOpacity
|
||||||
|
onPress={() => setShowUpdateSnackbar(false)}
|
||||||
|
style={{marginRight: 10}}>
|
||||||
|
<Text style={{color: 'white'}}>取消</Text>
|
||||||
|
</TouchableOpacity>
|
||||||
|
<TouchableOpacity
|
||||||
|
onPress={async () => {
|
||||||
|
setShowUpdateSnackbar(false);
|
||||||
|
await downloadUpdate();
|
||||||
|
setShowUpdateBanner(true);
|
||||||
|
}}>
|
||||||
|
<Text style={{color: '#2196F3'}}>更新</Text>
|
||||||
|
</TouchableOpacity>
|
||||||
|
</View>
|
||||||
|
</View>
|
||||||
|
</View>
|
||||||
|
)}
|
||||||
|
{showUpdateBanner && (
|
||||||
|
<View style={styles.overlay}>
|
||||||
|
<View
|
||||||
|
style={{
|
||||||
|
width: '100%',
|
||||||
|
backgroundColor: '#fff',
|
||||||
|
padding: 16,
|
||||||
|
borderBottomWidth: 1,
|
||||||
|
borderBottomColor: '#eee',
|
||||||
|
}}>
|
||||||
|
<View style={{flexDirection: 'row', alignItems: 'center'}}>
|
||||||
|
<Text>更新已完成,是否立即重启?</Text>
|
||||||
|
</View>
|
||||||
|
<View
|
||||||
|
style={{
|
||||||
|
flexDirection: 'row',
|
||||||
|
justifyContent: 'flex-end',
|
||||||
|
marginTop: 10,
|
||||||
|
}}>
|
||||||
|
<TouchableOpacity
|
||||||
|
onPress={() => {
|
||||||
|
switchVersionLater();
|
||||||
|
setShowUpdateBanner(false);
|
||||||
|
}}
|
||||||
|
style={{marginRight: 20}}>
|
||||||
|
<Text style={{color: '#2196F3'}}>下次再说</Text>
|
||||||
|
</TouchableOpacity>
|
||||||
|
<TouchableOpacity onPress={switchVersion}>
|
||||||
|
<Text style={{color: '#2196F3'}}>立即重启</Text>
|
||||||
|
</TouchableOpacity>
|
||||||
|
</View>
|
||||||
|
</View>
|
||||||
|
</View>
|
||||||
|
)}
|
||||||
|
</View>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
const styles = StyleSheet.create({
|
||||||
|
overlay: {
|
||||||
|
position: 'absolute',
|
||||||
|
top: 0,
|
||||||
|
left: 0,
|
||||||
|
right: 0,
|
||||||
|
bottom: 0,
|
||||||
|
backgroundColor: 'rgba(0, 0, 0, 0.5)',
|
||||||
|
justifyContent: 'center',
|
||||||
|
alignItems: 'center',
|
||||||
|
},
|
||||||
|
container: {
|
||||||
|
flex: 1,
|
||||||
|
justifyContent: 'center',
|
||||||
|
alignItems: 'center',
|
||||||
|
backgroundColor: '#F5FCFF',
|
||||||
|
},
|
||||||
|
welcome: {
|
||||||
|
fontSize: 20,
|
||||||
|
textAlign: 'center',
|
||||||
|
margin: 10,
|
||||||
|
},
|
||||||
|
instructions: {
|
||||||
|
textAlign: 'center',
|
||||||
|
color: '#333333',
|
||||||
|
marginBottom: 5,
|
||||||
|
},
|
||||||
|
image: {},
|
||||||
|
});
|
||||||
|
|
||||||
|
const pushyClient = new Pushy({
|
||||||
|
appKey,
|
||||||
|
debug: true,
|
||||||
|
});
|
||||||
|
|
||||||
|
export default function HomeScreen() {
|
||||||
|
return (
|
||||||
|
<PushyProvider client={pushyClient}>
|
||||||
|
<Home />
|
||||||
|
</PushyProvider>
|
||||||
|
);
|
||||||
|
}
|
||||||
274
Example/expoUsePushy/TestConsole.js
Normal file
@@ -0,0 +1,274 @@
|
|||||||
|
/* eslint-disable react-native/no-inline-styles */
|
||||||
|
/* eslint-disable react/react-in-jsx-scope */
|
||||||
|
import {useCallback, useMemo, useState} from 'react';
|
||||||
|
import {
|
||||||
|
ActivityIndicator,
|
||||||
|
TextInput,
|
||||||
|
Button,
|
||||||
|
StyleSheet,
|
||||||
|
SafeAreaView,
|
||||||
|
Text,
|
||||||
|
View,
|
||||||
|
TouchableOpacity,
|
||||||
|
} from 'react-native';
|
||||||
|
|
||||||
|
import {PushyModule} from 'react-native-update';
|
||||||
|
const Hash = '9D5CE6EBA420717BE7E7D308B11F8207681B066C951D68F3994D19828F342474';
|
||||||
|
const UUID = '00000000-0000-0000-0000-000000000000';
|
||||||
|
const DownloadUrl = 'https://localhost:3000/diff.ppk-patch';
|
||||||
|
const AppPatchDownloadUrl = 'https://github.com/bozaigao/test_pushy_server/raw/refs/heads/main/hdiff.app-patch';
|
||||||
|
const AppPatchHash = 'f5ba92c7c04250d4b8a446c8267ef459';
|
||||||
|
const PPKDownloadUrl = 'https://github.com/bozaigao/test_pushy_server/raw/refs/heads/main/hdiff.ppk-patch';
|
||||||
|
const PPKPatchHash = '6b3d26b7d868d1f67aedadb7f0b342d9';
|
||||||
|
const OriginHash = 'f5ba92c7c04250d4b8a446c8267ef459';
|
||||||
|
|
||||||
|
|
||||||
|
const CustomDialog = ({title, visible, onConfirm}) => {
|
||||||
|
if (!visible) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<View style={styles.overlay}>
|
||||||
|
<View style={styles.dialog}>
|
||||||
|
<Text style={styles.title}>{title}</Text>
|
||||||
|
<TouchableOpacity
|
||||||
|
testID="done"
|
||||||
|
style={styles.button}
|
||||||
|
onPress={onConfirm}>
|
||||||
|
<Text style={styles.buttonText}>确认</Text>
|
||||||
|
</TouchableOpacity>
|
||||||
|
</View>
|
||||||
|
</View>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
export default function TestConsole({visible, onClose}) {
|
||||||
|
const [text, setText] = useState('');
|
||||||
|
const [running, setRunning] = useState(false);
|
||||||
|
const [options, setOptions] = useState();
|
||||||
|
const [alertVisible, setAlertVisible] = useState(false);
|
||||||
|
const [alertMsg, setAlertMsg] = useState('');
|
||||||
|
const NativeTestMethod = useMemo(() => {
|
||||||
|
return [
|
||||||
|
{
|
||||||
|
name: 'setLocalHashInfo',
|
||||||
|
invoke: () => {
|
||||||
|
setText(
|
||||||
|
`setLocalHashInfo\n${Hash}\n{\"version\":\"1.0.0\",\"size\":\"19M\"}`,
|
||||||
|
);
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'getLocalHashInfo',
|
||||||
|
invoke: () => {
|
||||||
|
setText(`getLocalHashInfo\n${Hash}`);
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'setUuid',
|
||||||
|
invoke: () => {
|
||||||
|
setText(`setUuid\n${UUID}`);
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'reloadUpdate',
|
||||||
|
invoke: () => {
|
||||||
|
setText('reloadUpdate');
|
||||||
|
setOptions({hash: Hash});
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'setNeedUpdateForApp',
|
||||||
|
invoke: () => {
|
||||||
|
setText('setNeedUpdate');
|
||||||
|
setOptions({hash: AppPatchHash});
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'setNeedUpdateForPPK',
|
||||||
|
invoke: () => {
|
||||||
|
setText('setNeedUpdate');
|
||||||
|
setOptions({hash: PPKPatchHash});
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'markSuccess',
|
||||||
|
invoke: () => {
|
||||||
|
setText('markSuccess');
|
||||||
|
setOptions(undefined);
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'downloadPatchFromPpk',
|
||||||
|
invoke: () => {
|
||||||
|
setText('downloadPatchFromPpk');
|
||||||
|
setOptions({updateUrl: PPKDownloadUrl, hash: PPKPatchHash, originHash: OriginHash});
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'downloadPatchFromPackage',
|
||||||
|
invoke: () => {
|
||||||
|
setText('downloadPatchFromPackage');
|
||||||
|
setOptions({updateUrl: AppPatchDownloadUrl, hash: AppPatchHash});
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'downloadFullUpdate',
|
||||||
|
invoke: () => {
|
||||||
|
setText('downloadFullUpdate');
|
||||||
|
setOptions({updateUrl: DownloadUrl, hash: Hash});
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'downloadAndInstallApk',
|
||||||
|
invoke: () => {
|
||||||
|
setText('downloadAndInstallApk');
|
||||||
|
setOptions({url: DownloadUrl, target: Hash, hash: Hash});
|
||||||
|
},
|
||||||
|
},
|
||||||
|
];
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const renderTestView = useCallback(() => {
|
||||||
|
const views = [];
|
||||||
|
for (let i = 0; i < NativeTestMethod.length; i++) {
|
||||||
|
views.push(
|
||||||
|
<TouchableOpacity
|
||||||
|
key={i}
|
||||||
|
testID={NativeTestMethod[i].name}
|
||||||
|
onPress={() => {
|
||||||
|
NativeTestMethod[i].invoke();
|
||||||
|
}}>
|
||||||
|
<Text>{NativeTestMethod[i].name}</Text>
|
||||||
|
</TouchableOpacity>,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return <View>{views}</View>;
|
||||||
|
}, [NativeTestMethod]);
|
||||||
|
if (!visible) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<SafeAreaView style={{flex: 1, padding: 10}}>
|
||||||
|
<View
|
||||||
|
style={{
|
||||||
|
flexDirection: 'row',
|
||||||
|
alignItems: 'center',
|
||||||
|
justifyContent: 'space-between',
|
||||||
|
padding: 10,
|
||||||
|
}}>
|
||||||
|
<Text>调试Pushy方法(方法名,参数,值换行)</Text>
|
||||||
|
<Button title="关闭" onPress={() => onClose()} />
|
||||||
|
</View>
|
||||||
|
<TextInput
|
||||||
|
autoCorrect={false}
|
||||||
|
autoCapitalize="none"
|
||||||
|
style={{
|
||||||
|
borderWidth: StyleSheet.hairlineWidth * 4,
|
||||||
|
borderColor: 'black',
|
||||||
|
height: '30%',
|
||||||
|
marginTop: 20,
|
||||||
|
marginBottom: 20,
|
||||||
|
padding: 10,
|
||||||
|
fontSize: 20,
|
||||||
|
}}
|
||||||
|
textAlignVertical="top"
|
||||||
|
multiline={true}
|
||||||
|
value={text}
|
||||||
|
onChangeText={setText}
|
||||||
|
/>
|
||||||
|
{running && <ActivityIndicator />}
|
||||||
|
<TouchableOpacity
|
||||||
|
style={{
|
||||||
|
backgroundColor: 'rgb(0,140,237)',
|
||||||
|
justifyContent: 'center',
|
||||||
|
alignItems: 'center',
|
||||||
|
paddingTop: 10,
|
||||||
|
paddingBottom: 10,
|
||||||
|
marginBottom: 5,
|
||||||
|
}}
|
||||||
|
testID="submit"
|
||||||
|
onPress={async () => {
|
||||||
|
setRunning(true);
|
||||||
|
try {
|
||||||
|
const inputs = text.split('\n');
|
||||||
|
const methodName = inputs[0];
|
||||||
|
let params = [];
|
||||||
|
if (inputs.length === 1) {
|
||||||
|
if (options) {
|
||||||
|
await PushyModule[methodName](options);
|
||||||
|
} else {
|
||||||
|
await PushyModule[methodName]();
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (inputs.length === 2) {
|
||||||
|
params = [inputs[1]];
|
||||||
|
} else {
|
||||||
|
params = [inputs[1], inputs[2]];
|
||||||
|
console.log({inputs, params});
|
||||||
|
}
|
||||||
|
await PushyModule[methodName](...params);
|
||||||
|
}
|
||||||
|
setAlertVisible(true);
|
||||||
|
setAlertMsg('done');
|
||||||
|
} catch (e) {
|
||||||
|
setAlertVisible(true);
|
||||||
|
setAlertMsg(e.message);
|
||||||
|
}
|
||||||
|
setRunning(false);
|
||||||
|
}}>
|
||||||
|
<Text style={{color: 'white'}}>执行</Text>
|
||||||
|
</TouchableOpacity>
|
||||||
|
<Button title="重置" onPress={() => setText('')} />
|
||||||
|
{renderTestView()}
|
||||||
|
<CustomDialog
|
||||||
|
title={alertMsg}
|
||||||
|
visible={alertVisible}
|
||||||
|
onConfirm={() => {
|
||||||
|
setAlertVisible(false);
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</SafeAreaView>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
const styles = StyleSheet.create({
|
||||||
|
container: {
|
||||||
|
flex: 1,
|
||||||
|
justifyContent: 'center',
|
||||||
|
alignItems: 'center',
|
||||||
|
},
|
||||||
|
overlay: {
|
||||||
|
position: 'absolute',
|
||||||
|
top: 0,
|
||||||
|
left: 0,
|
||||||
|
right: 0,
|
||||||
|
bottom: 0,
|
||||||
|
backgroundColor: 'rgba(0, 0, 0, 0.5)',
|
||||||
|
justifyContent: 'center',
|
||||||
|
alignItems: 'center',
|
||||||
|
},
|
||||||
|
dialog: {
|
||||||
|
backgroundColor: 'white',
|
||||||
|
borderRadius: 10,
|
||||||
|
padding: 20,
|
||||||
|
width: '80%',
|
||||||
|
alignItems: 'center',
|
||||||
|
},
|
||||||
|
title: {
|
||||||
|
fontSize: 18,
|
||||||
|
fontWeight: 'bold',
|
||||||
|
marginBottom: 20,
|
||||||
|
},
|
||||||
|
button: {
|
||||||
|
backgroundColor: '#2196F3',
|
||||||
|
borderRadius: 5,
|
||||||
|
paddingVertical: 10,
|
||||||
|
paddingHorizontal: 20,
|
||||||
|
},
|
||||||
|
buttonText: {
|
||||||
|
color: 'white',
|
||||||
|
fontWeight: 'bold',
|
||||||
|
},
|
||||||
|
});
|
||||||
30
Example/expoUsePushy/app.json
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
{
|
||||||
|
"expo": {
|
||||||
|
"name": "expoUsePushy",
|
||||||
|
"slug": "expoUsePushy",
|
||||||
|
"version": "1.0.0",
|
||||||
|
"orientation": "portrait",
|
||||||
|
"icon": "./assets/icon.png",
|
||||||
|
"userInterfaceStyle": "light",
|
||||||
|
"newArchEnabled": true,
|
||||||
|
"splash": {
|
||||||
|
"image": "./assets/splash-icon.png",
|
||||||
|
"resizeMode": "contain",
|
||||||
|
"backgroundColor": "#ffffff"
|
||||||
|
},
|
||||||
|
"ios": {
|
||||||
|
"supportsTablet": true,
|
||||||
|
"bundleIdentifier": "com.anonymous.expoUsePushy"
|
||||||
|
},
|
||||||
|
"android": {
|
||||||
|
"adaptiveIcon": {
|
||||||
|
"foregroundImage": "./assets/adaptive-icon.png",
|
||||||
|
"backgroundColor": "#ffffff"
|
||||||
|
},
|
||||||
|
"package": "com.anonymous.expoUsePushy"
|
||||||
|
},
|
||||||
|
"web": {
|
||||||
|
"favicon": "./assets/favicon.png"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
BIN
Example/expoUsePushy/assets/adaptive-icon.png
Normal file
|
After Width: | Height: | Size: 17 KiB |
BIN
Example/expoUsePushy/assets/favicon.png
Normal file
|
After Width: | Height: | Size: 1.4 KiB |
BIN
Example/expoUsePushy/assets/icon.png
Normal file
|
After Width: | Height: | Size: 22 KiB |
BIN
Example/expoUsePushy/assets/shezhi.png
Normal file
|
After Width: | Height: | Size: 696 B |
BIN
Example/expoUsePushy/assets/shezhi@2x.png
Normal file
|
After Width: | Height: | Size: 1.2 KiB |
BIN
Example/expoUsePushy/assets/shezhi@3x.png
Normal file
|
After Width: | Height: | Size: 1.8 KiB |
BIN
Example/expoUsePushy/assets/splash-icon.png
Normal file
|
After Width: | Height: | Size: 17 KiB |
2005
Example/expoUsePushy/bun.lock
Normal file
1
Example/expoUsePushy/index.js
Normal file
@@ -0,0 +1 @@
|
|||||||
|
import 'expo-router/entry';
|
||||||
50
Example/expoUsePushy/package.json
Normal file
@@ -0,0 +1,50 @@
|
|||||||
|
{
|
||||||
|
"name": "expousepushy",
|
||||||
|
"main": "index.js",
|
||||||
|
"version": "1.0.0",
|
||||||
|
"scripts": {
|
||||||
|
"start": "expo start",
|
||||||
|
"reset-project": "node ./scripts/reset-project.js",
|
||||||
|
"android": "expo run:android",
|
||||||
|
"ios": "expo run:ios",
|
||||||
|
"web": "expo start --web",
|
||||||
|
"lint": "expo lint"
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"@expo/vector-icons": "^14.1.0",
|
||||||
|
"@react-navigation/bottom-tabs": "^7.3.10",
|
||||||
|
"@react-navigation/elements": "^2.3.8",
|
||||||
|
"@react-navigation/native": "^7.1.6",
|
||||||
|
"expo": "~53.0.22",
|
||||||
|
"expo-blur": "~14.1.5",
|
||||||
|
"expo-constants": "~17.1.7",
|
||||||
|
"expo-font": "~13.3.2",
|
||||||
|
"expo-haptics": "~14.1.4",
|
||||||
|
"expo-image": "~2.4.0",
|
||||||
|
"expo-linking": "~7.1.7",
|
||||||
|
"expo-router": "~5.1.5",
|
||||||
|
"expo-splash-screen": "~0.30.10",
|
||||||
|
"expo-status-bar": "~2.2.3",
|
||||||
|
"expo-symbols": "~0.4.5",
|
||||||
|
"expo-system-ui": "~5.0.11",
|
||||||
|
"expo-web-browser": "~14.2.0",
|
||||||
|
"react": "19.0.0",
|
||||||
|
"react-dom": "19.0.0",
|
||||||
|
"react-native": "0.79.6",
|
||||||
|
"react-native-gesture-handler": "~2.24.0",
|
||||||
|
"react-native-reanimated": "~3.17.4",
|
||||||
|
"react-native-safe-area-context": "5.4.0",
|
||||||
|
"react-native-screens": "~4.11.1",
|
||||||
|
"react-native-update": "^10.34.4",
|
||||||
|
"react-native-web": "~0.20.0",
|
||||||
|
"react-native-webview": "13.13.5"
|
||||||
|
},
|
||||||
|
"devDependencies": {
|
||||||
|
"@babel/core": "^7.25.2",
|
||||||
|
"@types/react": "~19.0.10",
|
||||||
|
"typescript": "~5.8.3",
|
||||||
|
"eslint": "^9.25.0",
|
||||||
|
"eslint-config-expo": "~9.2.0"
|
||||||
|
},
|
||||||
|
"private": true
|
||||||
|
}
|
||||||
6
Example/expoUsePushy/tsconfig.json
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
{
|
||||||
|
"extends": "expo/tsconfig.base",
|
||||||
|
"compilerOptions": {
|
||||||
|
"strict": true
|
||||||
|
}
|
||||||
|
}
|
||||||
14
Example/expoUsePushy/update.json
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
{
|
||||||
|
"ios": {
|
||||||
|
"appId": 29439,
|
||||||
|
"appKey": "jNA71vpFHTDpEqeZd9yx87zj"
|
||||||
|
},
|
||||||
|
"android": {
|
||||||
|
"appId": 29413,
|
||||||
|
"appKey": "vdZWPXU6eyaPE6Avk96-YvwK"
|
||||||
|
},
|
||||||
|
"harmony": {
|
||||||
|
"appId": 29140,
|
||||||
|
"appKey": "JLklGflGIRbY-cMebjQwm1J1"
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,4 +1,3 @@
|
|||||||
/* eslint-disable react/no-unstable-nested-components */
|
|
||||||
/* eslint-disable react-native/no-inline-styles */
|
/* eslint-disable react-native/no-inline-styles */
|
||||||
import React, {useState} from 'react';
|
import React, {useState} from 'react';
|
||||||
import {StyleSheet, Text, View, TouchableOpacity, Image} from 'react-native';
|
import {StyleSheet, Text, View, TouchableOpacity, Image} from 'react-native';
|
||||||
@@ -6,7 +5,7 @@ import {StyleSheet, Text, View, TouchableOpacity, Image} from 'react-native';
|
|||||||
import TestConsole from './TestConsole';
|
import TestConsole from './TestConsole';
|
||||||
|
|
||||||
import _updateConfig from './update.json';
|
import _updateConfig from './update.json';
|
||||||
import {PushyProvider, Pushy, usePushy} from 'react-native-update';
|
import {UpdateProvider, Pushy, useUpdate} from 'react-native-update';
|
||||||
const {appKey} = _updateConfig.harmony;
|
const {appKey} = _updateConfig.harmony;
|
||||||
|
|
||||||
function App() {
|
function App() {
|
||||||
@@ -20,7 +19,7 @@ function App() {
|
|||||||
packageVersion,
|
packageVersion,
|
||||||
currentHash,
|
currentHash,
|
||||||
progress: {received, total} = {},
|
progress: {received, total} = {},
|
||||||
} = usePushy();
|
} = useUpdate();
|
||||||
const [useDefaultAlert, setUseDefaultAlert] = useState(false);
|
const [useDefaultAlert, setUseDefaultAlert] = useState(false);
|
||||||
const [showTestConsole, setShowTestConsole] = useState(false);
|
const [showTestConsole, setShowTestConsole] = useState(false);
|
||||||
const [showUpdateBanner, setShowUpdateBanner] = useState(false);
|
const [showUpdateBanner, setShowUpdateBanner] = useState(false);
|
||||||
@@ -41,6 +40,7 @@ function App() {
|
|||||||
return (
|
return (
|
||||||
<View style={styles.container}>
|
<View style={styles.container}>
|
||||||
<Text style={styles.welcome}>欢迎使用Pushy热更新服务</Text>
|
<Text style={styles.welcome}>欢迎使用Pushy热更新服务</Text>
|
||||||
|
{/* <Image source={require('./gmail.png')} style={styles.image} /> */}
|
||||||
{/* <Text style={styles.welcome}>😁hdiffFromAPP更新成功!!!</Text> */}
|
{/* <Text style={styles.welcome}>😁hdiffFromAPP更新成功!!!</Text> */}
|
||||||
{/* <Text style={styles.welcome}>😁hdiffFromPPk更新成功!!!</Text> */}
|
{/* <Text style={styles.welcome}>😁hdiffFromPPk更新成功!!!</Text> */}
|
||||||
<View style={{flexDirection: 'row'}}>
|
<View style={{flexDirection: 'row'}}>
|
||||||
@@ -166,7 +166,7 @@ function App() {
|
|||||||
style={{marginRight: 20}}>
|
style={{marginRight: 20}}>
|
||||||
<Text style={{color: '#2196F3'}}>下次再说</Text>
|
<Text style={{color: '#2196F3'}}>下次再说</Text>
|
||||||
</TouchableOpacity>
|
</TouchableOpacity>
|
||||||
<TouchableOpacity onPress={switchVersion}>
|
<TouchableOpacity onPress={() => switchVersion()}>
|
||||||
<Text style={{color: '#2196F3'}}>立即重启</Text>
|
<Text style={{color: '#2196F3'}}>立即重启</Text>
|
||||||
</TouchableOpacity>
|
</TouchableOpacity>
|
||||||
</View>
|
</View>
|
||||||
@@ -204,18 +204,22 @@ const styles = StyleSheet.create({
|
|||||||
color: '#333333',
|
color: '#333333',
|
||||||
marginBottom: 5,
|
marginBottom: 5,
|
||||||
},
|
},
|
||||||
image: {},
|
image: {
|
||||||
|
width: 109,
|
||||||
|
height: 40,
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
const pushyClient = new Pushy({
|
const pushyClient = new Pushy({
|
||||||
appKey,
|
appKey,
|
||||||
debug: true,
|
debug: true,
|
||||||
|
updateStrategy: null,
|
||||||
});
|
});
|
||||||
|
|
||||||
export default function Root() {
|
export default function Root() {
|
||||||
return (
|
return (
|
||||||
<PushyProvider client={pushyClient}>
|
<UpdateProvider client={pushyClient}>
|
||||||
<App />
|
<App />
|
||||||
</PushyProvider>
|
</UpdateProvider>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +0,0 @@
|
|||||||
source 'https://rubygems.org'
|
|
||||||
|
|
||||||
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
|
|
||||||
ruby ">= 2.6.10"
|
|
||||||
|
|
||||||
gem 'cocoapods', '~> 1.12'
|
|
||||||
@@ -2,19 +2,25 @@
|
|||||||
|
|
||||||
### 1. 在项目根目录执行下面命令安装第三方依赖。
|
### 1. 在项目根目录执行下面命令安装第三方依赖。
|
||||||
```
|
```
|
||||||
yarn install
|
bun install
|
||||||
```
|
```
|
||||||
|
|
||||||
### 2. 在项目根目录执行下面命令生成bundle包文件。
|
### 2. 本地debug 模式
|
||||||
```
|
```
|
||||||
yarn build
|
bun run start
|
||||||
|
```
|
||||||
|

|
||||||
|
|
||||||
|
### 3. release 模式: 在项目根目录执行下面命令生成bundle包文件。
|
||||||
|
```
|
||||||
|
bun run build
|
||||||
```
|
```
|
||||||
说明:这个命令会在harmony/entry/src/main/resources/rawfile目录生成Hbundle.harmony.js和assets文件,同时会基于该内容在.pushy/output目录生成ppk包。
|
说明:这个命令会在harmony/entry/src/main/resources/rawfile目录生成Hbundle.harmony.js和assets文件,同时会基于该内容在.pushy/output目录生成ppk包。
|
||||||
|
|
||||||
**注意⚠️**:在使用pushy bundle --platform harmony命令进行打包的默认bundle包名是Hbundle.harmony.js,不要随意修改包名,因为diff是匹配该包名进行生成的。
|
**注意⚠️**:在使用pushy bundle --platform harmony命令进行打包的默认bundle包名是Hbundle.harmony.js,不要随意修改包名,因为diff是匹配该包名进行生成的。
|
||||||
|
|
||||||
### 3. 使用DevEco Studio IDE打开harmony目录然后执行sync运行项目
|
### 4. 使用DevEco Studio IDE打开harmony目录然后执行sync运行项目
|
||||||

|

|
||||||
|
|
||||||
### 4 运行效果图
|
### 5 运行效果图
|
||||||

|

|
||||||
|
|||||||
2250
Example/harmony_use_pushy/bun.lock
Normal file
BIN
Example/harmony_use_pushy/debug.png
Normal file
|
After Width: | Height: | Size: 743 KiB |
@@ -1,45 +1,44 @@
|
|||||||
{
|
{
|
||||||
"app": {
|
app: {
|
||||||
"signingConfigs": [],
|
signingConfigs: [],
|
||||||
"products": [
|
products: [
|
||||||
{
|
{
|
||||||
"name": "default",
|
name: 'default',
|
||||||
"signingConfig": "default",
|
signingConfig: 'default',
|
||||||
"compatibleSdkVersion": "5.0.0(12)",
|
compatibleSdkVersion: '5.0.0(12)',
|
||||||
"runtimeOS": "HarmonyOS",
|
runtimeOS: 'HarmonyOS',
|
||||||
"buildOption": {
|
buildOption: {
|
||||||
"strictMode": {
|
strictMode: {
|
||||||
"caseSensitiveCheck": true,
|
caseSensitiveCheck: true,
|
||||||
"useNormalizedOHMUrl": true
|
useNormalizedOHMUrl: true
|
||||||
}
|
},
|
||||||
}
|
"nativeCompiler": "BiSheng"
|
||||||
}
|
},
|
||||||
|
},
|
||||||
],
|
],
|
||||||
"buildModeSet": [
|
buildModeSet: [
|
||||||
{
|
{
|
||||||
"name": "debug",
|
name: 'debug',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "release"
|
name: 'release',
|
||||||
}
|
},
|
||||||
]
|
],
|
||||||
},
|
},
|
||||||
"modules": [
|
modules: [
|
||||||
{
|
{
|
||||||
"name": "entry",
|
name: 'entry',
|
||||||
"srcPath": "./entry",
|
srcPath: './entry',
|
||||||
"targets": [
|
targets: [
|
||||||
{
|
{
|
||||||
"name": "default",
|
name: 'default',
|
||||||
"applyToProducts": [
|
applyToProducts: ['default'],
|
||||||
"default"
|
},
|
||||||
]
|
],
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: 'pushy',
|
name: 'pushy',
|
||||||
srcPath: '../node_modules/react-native-update/harmony',
|
srcPath: '../node_modules/react-native-update/harmony/pushy',
|
||||||
}
|
},
|
||||||
]
|
],
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,44 +1,9 @@
|
|||||||
import { hapTasks } from '@ohos/hvigor-ohos-plugin';
|
import {hapTasks} from '@ohos/hvigor-ohos-plugin';
|
||||||
import fs from 'fs';
|
import {reactNativeUpdatePlugin} from 'pushy/hvigor-plugin';
|
||||||
import path from 'path';
|
|
||||||
|
|
||||||
export function generatePushyBuildTime(str?: string) {
|
|
||||||
return {
|
|
||||||
pluginId: 'PushyBuildTimePlugin',
|
|
||||||
apply(pluginContext) {
|
|
||||||
pluginContext.registerTask({
|
|
||||||
name: 'pushy_build_time',
|
|
||||||
run: (taskContext) => {
|
|
||||||
const metaFilePath = path.resolve(__dirname, 'src/main/resources/rawfile/meta.json');
|
|
||||||
const dirPath = path.dirname(metaFilePath);
|
|
||||||
if (!fs.existsSync(dirPath)) {
|
|
||||||
fs.mkdirSync(dirPath, { recursive: true });
|
|
||||||
}
|
|
||||||
const moduleJsonPath = path.resolve(__dirname, '../AppScope/app.json5');
|
|
||||||
let versionName = '';
|
|
||||||
if (fs.existsSync(moduleJsonPath)) {
|
|
||||||
const moduleContent = fs.readFileSync(moduleJsonPath, 'utf-8');
|
|
||||||
const versionMatch = moduleContent.match(/"versionName":\s*"([^"]+)"/);
|
|
||||||
if (versionMatch && versionMatch[1]) {
|
|
||||||
versionName = versionMatch[1];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
const buildTime = new Date().toISOString();
|
|
||||||
const metaContent = {
|
|
||||||
pushy_build_time: buildTime,
|
|
||||||
versionName: versionName
|
|
||||||
};
|
|
||||||
fs.writeFileSync(metaFilePath, JSON.stringify(metaContent, null, 4));
|
|
||||||
console.log(`Build time written to ${metaFilePath}`);
|
|
||||||
},
|
|
||||||
dependencies: [],
|
|
||||||
postDependencies: ['default@BuildJS']
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
system: hapTasks, /* Built-in plugin of Hvigor. It cannot be modified. */
|
system: hapTasks /* Built-in plugin of Hvigor. It cannot be modified. */,
|
||||||
plugins:[generatePushyBuildTime()] /* Custom plugin to extend the functionality of Hvigor. */
|
plugins: [
|
||||||
}
|
reactNativeUpdatePlugin(),
|
||||||
|
] /* Custom plugin to extend the functionality of Hvigor. */,
|
||||||
|
};
|
||||||
|
|||||||
@@ -1,25 +1,26 @@
|
|||||||
{
|
{
|
||||||
"meta": {
|
"meta": {
|
||||||
"stableOrder": true
|
"stableOrder": true,
|
||||||
|
"enableUnifiedLockfile": false
|
||||||
},
|
},
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",
|
"ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",
|
||||||
"specifiers": {
|
"specifiers": {
|
||||||
"@rnoh/react-native-openharmony@0.72.38": "@rnoh/react-native-openharmony@0.72.38",
|
"@rnoh/react-native-openharmony@0.72.96": "@rnoh/react-native-openharmony@0.72.96",
|
||||||
"pushy@../../node_modules/react-native-update/harmony": "pushy@../../node_modules/react-native-update/harmony"
|
"pushy@../../node_modules/react-native-update/harmony/pushy": "pushy@../../node_modules/react-native-update/harmony/pushy"
|
||||||
},
|
},
|
||||||
"packages": {
|
"packages": {
|
||||||
"@rnoh/react-native-openharmony@0.72.38": {
|
"@rnoh/react-native-openharmony@0.72.96": {
|
||||||
"name": "@rnoh/react-native-openharmony",
|
"name": "",
|
||||||
"version": "0.72.38",
|
"version": "0.72.96",
|
||||||
"integrity": "sha512-br5SIrbB0OarSLirenleE7eTOX1lNccMJ7nb/G7qWTyJ7kW4DalmTXVKYpoT2qaOLls1uEE7McD1OjbZZM9jug==",
|
"integrity": "sha512-gBbm8LLyqi5UE7qHWdZYeQnjyncfEpCczKZUP/9M2U1Z7exR0Kya8PMKMwr1ta5ujy7w/hZVC2LomEV4QvBeqA==",
|
||||||
"resolved": "https://ohpm.openharmony.cn/ohpm/@rnoh/react-native-openharmony/-/react-native-openharmony-0.72.38.har",
|
"resolved": "https://ohpm.openharmony.cn/ohpm/@rnoh/react-native-openharmony/-/react-native-openharmony-0.72.96.har",
|
||||||
"registryType": "ohpm"
|
"registryType": "ohpm"
|
||||||
},
|
},
|
||||||
"pushy@../../node_modules/react-native-update/harmony": {
|
"pushy@../../node_modules/react-native-update/harmony/pushy": {
|
||||||
"name": "pushy",
|
"name": "pushy",
|
||||||
"version": "3.1.0-0.0.7",
|
"version": "3.1.0-0.0.7",
|
||||||
"resolved": "../../node_modules/react-native-update/harmony",
|
"resolved": "",
|
||||||
"registryType": "local",
|
"registryType": "local",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@rnoh/react-native-openharmony": "^0.72.38"
|
"@rnoh/react-native-openharmony": "^0.72.38"
|
||||||
|
|||||||
@@ -1,13 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "entry",
|
name: 'entry',
|
||||||
"version": "1.0.0",
|
version: '1.0.0',
|
||||||
"description": "Please describe the basic information.",
|
description: 'Please describe the basic information.',
|
||||||
"main": "",
|
main: '',
|
||||||
"author": "",
|
author: '',
|
||||||
"license": "",
|
license: '',
|
||||||
"dependencies": {
|
dependencies: {
|
||||||
"@rnoh/react-native-openharmony": "0.72.38",
|
'@rnoh/react-native-openharmony': '0.72.96',
|
||||||
"pushy": "file:../../node_modules/react-native-update/harmony"
|
pushy: 'file:../../node_modules/react-native-update/harmony/pushy',
|
||||||
}
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import { FileJSBundleProvider } from 'pushy/src/main/ets/FileJSBundleProvider';
|
import { PushyFileJSBundleProvider } from 'pushy/src/main/ets/PushyFileJSBundleProvider';
|
||||||
import { ComponentBuilderContext, RNOHCoreContext,RNAbility } from '@rnoh/react-native-openharmony';
|
import { ComponentBuilderContext, RNOHCoreContext,RNAbility,
|
||||||
|
MetroJSBundleProvider } from '@rnoh/react-native-openharmony';
|
||||||
import {
|
import {
|
||||||
RNApp,
|
RNApp,
|
||||||
AnyJSBundleProvider,
|
AnyJSBundleProvider,
|
||||||
@@ -53,7 +54,6 @@ struct Index {
|
|||||||
enableCAPIArchitecture: true,
|
enableCAPIArchitecture: true,
|
||||||
arkTsComponentNames: arkTsComponentNames,
|
arkTsComponentNames: arkTsComponentNames,
|
||||||
},
|
},
|
||||||
initialProps: { "foo": "bar" } as Record<string, string>,
|
|
||||||
appKey: "harmony_use_pushy",
|
appKey: "harmony_use_pushy",
|
||||||
wrappedCustomRNComponentBuilder: wrappedCustomRNComponentBuilder,
|
wrappedCustomRNComponentBuilder: wrappedCustomRNComponentBuilder,
|
||||||
onSetUp: (rnInstance) => {
|
onSetUp: (rnInstance) => {
|
||||||
@@ -61,9 +61,10 @@ struct Index {
|
|||||||
},
|
},
|
||||||
jsBundleProvider: new TraceJSBundleProviderDecorator(
|
jsBundleProvider: new TraceJSBundleProviderDecorator(
|
||||||
new AnyJSBundleProvider([
|
new AnyJSBundleProvider([
|
||||||
// MetroJSBundleProvider.fromServerIp('127.0.0.1'),
|
// local debug mode
|
||||||
// new ResourceJSBundleProvider(rnohCoreContext.uiAbilityContext.resourceManager, 'hermes_bundle.hbc'),
|
new MetroJSBundleProvider(),
|
||||||
new FileJSBundleProvider(this.rnohCoreContext.uiAbilityContext),
|
// release mode
|
||||||
|
new PushyFileJSBundleProvider(this.rnohCoreContext.uiAbilityContext),
|
||||||
new ResourceJSBundleProvider(this.rnohCoreContext.uiAbilityContext.resourceManager, 'bundle.harmony.js')
|
new ResourceJSBundleProvider(this.rnohCoreContext.uiAbilityContext.resourceManager, 'bundle.harmony.js')
|
||||||
]),
|
]),
|
||||||
this.rnohCoreContext.logger),
|
this.rnohCoreContext.logger),
|
||||||
|
|||||||
@@ -1,4 +0,0 @@
|
|||||||
{
|
|
||||||
"pushy_build_time": "2025-02-14T09:43:25.648Z",
|
|
||||||
"versionName": "1.0.0"
|
|
||||||
}
|
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
{
|
{
|
||||||
"modelVersion": "5.0.0",
|
"modelVersion": "5.0.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
pushy: 'file:../../node_modules/react-native-update/harmony/pushy'
|
||||||
},
|
},
|
||||||
"execution": {
|
"execution": {
|
||||||
// "analyze": "normal", /* Define the build analyze mode. Value: [ "normal" | "advanced" | false ]. Default: "normal" */
|
// "analyze": "normal", /* Define the build analyze mode. Value: [ "normal" | "advanced" | false ]. Default: "normal" */
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import { appTasks } from '@ohos/hvigor-ohos-plugin';
|
import {appTasks} from '@ohos/hvigor-ohos-plugin';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
system: appTasks, /* Built-in plugin of Hvigor. It cannot be modified. */
|
system: appTasks /* Built-in plugin of Hvigor. It cannot be modified. */,
|
||||||
plugins:[] /* Custom plugin to extend the functionality of Hvigor. */
|
plugins: [] /* Custom plugin to extend the functionality of Hvigor. */,
|
||||||
}
|
};
|
||||||
|
|||||||
@@ -1,23 +1,16 @@
|
|||||||
{
|
{
|
||||||
"meta": {
|
"meta": {
|
||||||
"stableOrder": true
|
"stableOrder": true,
|
||||||
|
"enableUnifiedLockfile": false
|
||||||
},
|
},
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",
|
"ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",
|
||||||
"specifiers": {
|
"specifiers": {
|
||||||
"@ohos/hamock@1.0.0": "@ohos/hamock@1.0.0",
|
|
||||||
"@ohos/hypium@1.0.19": "@ohos/hypium@1.0.19"
|
"@ohos/hypium@1.0.19": "@ohos/hypium@1.0.19"
|
||||||
},
|
},
|
||||||
"packages": {
|
"packages": {
|
||||||
"@ohos/hamock@1.0.0": {
|
|
||||||
"name": "@ohos/hamock",
|
|
||||||
"version": "1.0.0",
|
|
||||||
"integrity": "sha512-K6lDPYc6VkKe6ZBNQa9aoG+ZZMiwqfcR/7yAVFSUGIuOAhPvCJAo9+t1fZnpe0dBRBPxj2bxPPbKh69VuyAtDg==",
|
|
||||||
"resolved": "https://ohpm.openharmony.cn/ohpm/@ohos/hamock/-/hamock-1.0.0.har",
|
|
||||||
"registryType": "ohpm"
|
|
||||||
},
|
|
||||||
"@ohos/hypium@1.0.19": {
|
"@ohos/hypium@1.0.19": {
|
||||||
"name": "@ohos/hypium",
|
"name": "",
|
||||||
"version": "1.0.19",
|
"version": "1.0.19",
|
||||||
"integrity": "sha512-cEjDgLFCm3cWZDeRXk7agBUkPqjWxUo6AQeiu0gEkb3J8ESqlduQLSIXeo3cCsm8U/asL7iKjF85ZyOuufAGSQ==",
|
"integrity": "sha512-cEjDgLFCm3cWZDeRXk7agBUkPqjWxUo6AQeiu0gEkb3J8ESqlduQLSIXeo3cCsm8U/asL7iKjF85ZyOuufAGSQ==",
|
||||||
"resolved": "https://ohpm.openharmony.cn/ohpm/@ohos/hypium/-/hypium-1.0.19.har",
|
"resolved": "https://ohpm.openharmony.cn/ohpm/@ohos/hypium/-/hypium-1.0.19.har",
|
||||||
|
|||||||
@@ -1,20 +1,18 @@
|
|||||||
{
|
{
|
||||||
"modelVersion": "5.0.0",
|
modelVersion: '5.0.0',
|
||||||
"description": "Please describe the basic information.",
|
description: 'Please describe the basic information.',
|
||||||
"dependencies": {
|
dependencies: {},
|
||||||
|
devDependencies: {
|
||||||
|
'@ohos/hypium': '1.0.19'
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
arkTs: {
|
||||||
"@ohos/hypium": "1.0.19",
|
compilerOptions: {
|
||||||
"@ohos/hamock": "1.0.0"
|
noImplicitAny: false,
|
||||||
|
suppressImplicitAnyIndexErrors: true,
|
||||||
|
strict: false,
|
||||||
|
},
|
||||||
},
|
},
|
||||||
"arkTs": {
|
overrides: {
|
||||||
"compilerOptions": {
|
'@rnoh/react-native-openharmony': '0.72.96',
|
||||||
"noImplicitAny": false,
|
|
||||||
"suppressImplicitAnyIndexErrors": true,
|
|
||||||
"strict": false
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
"overrides": {
|
|
||||||
"@rnoh/react-native-openharmony": "0.72.38"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,5 @@
|
|||||||
|
|
||||||
|
/**
|
||||||
|
*/
|
||||||
|
|
||||||
|
export {}
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
/**
|
||||||
|
* This code was generated by "react-native codegen-harmony"
|
||||||
|
*
|
||||||
|
* Do not edit this file as changes may cause incorrect behavior and will be
|
||||||
|
* lost once the code is regenerated.
|
||||||
|
*/
|
||||||
|
|
||||||
|
export * from "./ts"
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
/**
|
||||||
|
* This code was generated by "react-native codegen-harmony"
|
||||||
|
*
|
||||||
|
* Do not edit this file as changes may cause incorrect behavior and will be
|
||||||
|
* lost once the code is regenerated.
|
||||||
|
*/
|
||||||
|
|
||||||
|
export * as RNC from "./components/ts"
|
||||||
|
export * as TM from "./turboModules/ts"
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
|
||||||
|
/**
|
||||||
|
*/
|
||||||
|
|
||||||
|
export {}
|
||||||
12423
Example/harmony_use_pushy/package-lock.json
generated
@@ -6,18 +6,19 @@
|
|||||||
"android": "react-native run-android",
|
"android": "react-native run-android",
|
||||||
"ios": "react-native run-ios",
|
"ios": "react-native run-ios",
|
||||||
"lint": "eslint .",
|
"lint": "eslint .",
|
||||||
"start": "react-native start",
|
"start": "npm run codegen && hdc rport tcp:8081 tcp:8081 && react-native start",
|
||||||
"build": "pushy bundle --platform harmony",
|
"codegen": "react-native codegen-harmony --rnoh-module-path ./harmony/react_native_openharmony",
|
||||||
|
"build": "pushy bundle --platform harmony --no-interactive",
|
||||||
"test": "jest",
|
"test": "jest",
|
||||||
"hdiffFromPPK": "pushy hdiffFromPPK .pushy/output/harmony.1735052610653.ppk .pushy/output/harmony.1735052678646.ppk .pushy/output/hdiff.ppk-patch",
|
"hdiffFromPPK": "pushy hdiffFromPPK .pushy/output/harmony.1735052610653.ppk .pushy/output/harmony.1735052678646.ppk .pushy/output/hdiff.ppk-patch",
|
||||||
"hdiffFromApp": "pushy hdiffFromApp .pushy/output/version-1.0.0.app .pushy/output/harmony.1735052610653.ppk .pushy/output/hdiff.app-patch",
|
"hdiffFromApp": "pushy hdiffFromApp .pushy/output/version-1.0.0.app .pushy/output/harmony.1735052610653.ppk .pushy/output/hdiff.app-patch",
|
||||||
"hash": "pushy hash /Users/yanbo.he/Desktop/HarmonyOS/react-native-pushy/Example/harmony_use_pushy/.pushy/output/harmony.1735048297258.ppk"
|
"hash": "pushy hash /Users/yanbo.he/Desktop/HarmonyOS/react-native-pushy/Example/harmony_use_pushy/.pushy/output/harmony.1735048297258.ppk"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
"@react-native-oh/react-native-harmony": "^0.72.59",
|
||||||
"react": "18.2.0",
|
"react": "18.2.0",
|
||||||
"react-native": "0.72.5",
|
"react-native": "0.72.5",
|
||||||
"react-native-update": "file:../../",
|
"react-native-update": "^10.35.4"
|
||||||
"@react-native-oh/react-native-harmony": "^0.72.43"
|
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@babel/core": "^7.20.0",
|
"@babel/core": "^7.20.0",
|
||||||
@@ -39,4 +40,4 @@
|
|||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=16"
|
"node": ">=16"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
5
Example/testHotUpdate/.gitignore
vendored
@@ -30,6 +30,7 @@ build/
|
|||||||
local.properties
|
local.properties
|
||||||
*.iml
|
*.iml
|
||||||
*.hprof
|
*.hprof
|
||||||
|
.kotlin/
|
||||||
|
|
||||||
# node.js
|
# node.js
|
||||||
#
|
#
|
||||||
@@ -61,3 +62,7 @@ buck-out/
|
|||||||
# Ruby / CocoaPods
|
# Ruby / CocoaPods
|
||||||
/ios/Pods/
|
/ios/Pods/
|
||||||
/vendor/bundle/
|
/vendor/bundle/
|
||||||
|
|
||||||
|
# react-native-update
|
||||||
|
.update
|
||||||
|
.pushy
|
||||||
@@ -1 +0,0 @@
|
|||||||
18
|
|
||||||
@@ -1,7 +1,5 @@
|
|||||||
module.exports = {
|
module.exports = {
|
||||||
arrowParens: 'avoid',
|
arrowParens: 'avoid',
|
||||||
bracketSameLine: true,
|
|
||||||
bracketSpacing: false,
|
|
||||||
singleQuote: true,
|
singleQuote: true,
|
||||||
trailingComma: 'all',
|
trailingComma: 'all',
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -68,7 +68,7 @@ def enableProguardInReleaseBuilds = false
|
|||||||
* give correct results when using with locales other than en-US. Note that
|
* give correct results when using with locales other than en-US. Note that
|
||||||
* this variant is about 6MiB larger per architecture than default.
|
* this variant is about 6MiB larger per architecture than default.
|
||||||
*/
|
*/
|
||||||
def jscFlavor = 'org.webkit:android-jsc:+'
|
def jscFlavor = 'io.github.react-native-community:jsc-android:2026004.+'
|
||||||
|
|
||||||
android {
|
android {
|
||||||
ndkVersion rootProject.ext.ndkVersion
|
ndkVersion rootProject.ext.ndkVersion
|
||||||
@@ -81,7 +81,7 @@ android {
|
|||||||
minSdkVersion rootProject.ext.minSdkVersion
|
minSdkVersion rootProject.ext.minSdkVersion
|
||||||
targetSdkVersion rootProject.ext.targetSdkVersion
|
targetSdkVersion rootProject.ext.targetSdkVersion
|
||||||
versionCode 1
|
versionCode 1
|
||||||
versionName "1.0"
|
versionName "1.81.4"
|
||||||
}
|
}
|
||||||
signingConfigs {
|
signingConfigs {
|
||||||
debug {
|
debug {
|
||||||
|
|||||||
@@ -5,13 +5,11 @@ import cn.reactnative.modules.update.UpdateContext
|
|||||||
import com.facebook.react.PackageList
|
import com.facebook.react.PackageList
|
||||||
import com.facebook.react.ReactApplication
|
import com.facebook.react.ReactApplication
|
||||||
import com.facebook.react.ReactHost
|
import com.facebook.react.ReactHost
|
||||||
|
import com.facebook.react.ReactNativeApplicationEntryPoint.loadReactNative
|
||||||
import com.facebook.react.ReactNativeHost
|
import com.facebook.react.ReactNativeHost
|
||||||
import com.facebook.react.ReactPackage
|
import com.facebook.react.ReactPackage
|
||||||
import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
|
|
||||||
import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
|
import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
|
||||||
import com.facebook.react.defaults.DefaultReactNativeHost
|
import com.facebook.react.defaults.DefaultReactNativeHost
|
||||||
import com.facebook.react.soloader.OpenSourceMergedSoMapping
|
|
||||||
import com.facebook.soloader.SoLoader
|
|
||||||
|
|
||||||
class MainApplication : Application(), ReactApplication {
|
class MainApplication : Application(), ReactApplication {
|
||||||
|
|
||||||
@@ -39,10 +37,6 @@ class MainApplication : Application(), ReactApplication {
|
|||||||
|
|
||||||
override fun onCreate() {
|
override fun onCreate() {
|
||||||
super.onCreate()
|
super.onCreate()
|
||||||
SoLoader.init(this, OpenSourceMergedSoMapping)
|
loadReactNative(this)
|
||||||
if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
|
|
||||||
// If you opted-in for the New Architecture, we load the native entry point for this app.
|
|
||||||
load()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
buildscript {
|
buildscript {
|
||||||
ext {
|
ext {
|
||||||
buildToolsVersion = "35.0.0"
|
buildToolsVersion = "36.0.0"
|
||||||
minSdkVersion = 24
|
minSdkVersion = 24
|
||||||
compileSdkVersion = 35
|
compileSdkVersion = 36
|
||||||
targetSdkVersion = 34
|
targetSdkVersion = 36
|
||||||
ndkVersion = "26.1.10909125"
|
ndkVersion = "27.1.12297006"
|
||||||
kotlinVersion = "1.9.25"
|
kotlinVersion = "2.1.20"
|
||||||
}
|
}
|
||||||
repositories {
|
repositories {
|
||||||
google()
|
google()
|
||||||
|
|||||||
@@ -25,7 +25,8 @@ android.useAndroidX=true
|
|||||||
# Use this property to specify which architecture you want to build.
|
# Use this property to specify which architecture you want to build.
|
||||||
# You can also override it from the CLI using
|
# You can also override it from the CLI using
|
||||||
# ./gradlew <task> -PreactNativeArchitectures=x86_64
|
# ./gradlew <task> -PreactNativeArchitectures=x86_64
|
||||||
reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
|
# reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
|
||||||
|
reactNativeArchitectures=arm64-v8a
|
||||||
|
|
||||||
# Use this property to enable support to the new architecture.
|
# Use this property to enable support to the new architecture.
|
||||||
# This will allow you to use TurboModules and the Fabric render in
|
# This will allow you to use TurboModules and the Fabric render in
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
|
||||||
networkTimeout=10000
|
networkTimeout=10000
|
||||||
validateDistributionUrl=true
|
validateDistributionUrl=true
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
|
|||||||
11
Example/testHotUpdate/android/gradlew
vendored
@@ -86,8 +86,7 @@ done
|
|||||||
# shellcheck disable=SC2034
|
# shellcheck disable=SC2034
|
||||||
APP_BASE_NAME=${0##*/}
|
APP_BASE_NAME=${0##*/}
|
||||||
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
||||||
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
|
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
|
||||||
' "$PWD" ) || exit
|
|
||||||
|
|
||||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||||
MAX_FD=maximum
|
MAX_FD=maximum
|
||||||
@@ -115,7 +114,7 @@ case "$( uname )" in #(
|
|||||||
NONSTOP* ) nonstop=true ;;
|
NONSTOP* ) nonstop=true ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
CLASSPATH="\\\"\\\""
|
||||||
|
|
||||||
|
|
||||||
# Determine the Java command to use to start the JVM.
|
# Determine the Java command to use to start the JVM.
|
||||||
@@ -206,7 +205,7 @@ fi
|
|||||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||||
|
|
||||||
# Collect all arguments for the java command:
|
# Collect all arguments for the java command:
|
||||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
||||||
# and any embedded shellness will be escaped.
|
# and any embedded shellness will be escaped.
|
||||||
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
|
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
|
||||||
# treated as '${Hostname}' itself on the command line.
|
# treated as '${Hostname}' itself on the command line.
|
||||||
@@ -214,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
|||||||
set -- \
|
set -- \
|
||||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||||
-classpath "$CLASSPATH" \
|
-classpath "$CLASSPATH" \
|
||||||
org.gradle.wrapper.GradleWrapperMain \
|
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
|
||||||
"$@"
|
"$@"
|
||||||
|
|
||||||
# Stop when "xargs" is not available.
|
# Stop when "xargs" is not available.
|
||||||
@@ -249,4 +248,4 @@ eval "set -- $(
|
|||||||
tr '\n' ' '
|
tr '\n' ' '
|
||||||
)" '"$@"'
|
)" '"$@"'
|
||||||
|
|
||||||
exec "$JAVACMD" "$@"
|
exec "$JAVACMD" "$@"
|
||||||
11
Example/testHotUpdate/android/gradlew.bat
vendored
@@ -1,3 +1,8 @@
|
|||||||
|
@REM Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
|
@REM
|
||||||
|
@REM This source code is licensed under the MIT license found in the
|
||||||
|
@REM LICENSE file in the root directory of this source tree.
|
||||||
|
|
||||||
@rem
|
@rem
|
||||||
@rem Copyright 2015 the original author or authors.
|
@rem Copyright 2015 the original author or authors.
|
||||||
@rem
|
@rem
|
||||||
@@ -70,11 +75,11 @@ goto fail
|
|||||||
:execute
|
:execute
|
||||||
@rem Setup the command line
|
@rem Setup the command line
|
||||||
|
|
||||||
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
set CLASSPATH=
|
||||||
|
|
||||||
|
|
||||||
@rem Execute Gradle
|
@rem Execute Gradle
|
||||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
|
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
|
||||||
|
|
||||||
:end
|
:end
|
||||||
@rem End local scope for the variables with windows NT shell
|
@rem End local scope for the variables with windows NT shell
|
||||||
@@ -91,4 +96,4 @@ exit /b %EXIT_CODE%
|
|||||||
:mainEnd
|
:mainEnd
|
||||||
if "%OS%"=="Windows_NT" endlocal
|
if "%OS%"=="Windows_NT" endlocal
|
||||||
|
|
||||||
:omega
|
:omega
|
||||||
@@ -403,6 +403,8 @@
|
|||||||
"-DFOLLY_NO_CONFIG",
|
"-DFOLLY_NO_CONFIG",
|
||||||
"-DFOLLY_MOBILE=1",
|
"-DFOLLY_MOBILE=1",
|
||||||
"-DFOLLY_USE_LIBCPP=1",
|
"-DFOLLY_USE_LIBCPP=1",
|
||||||
|
"-DFOLLY_CFG_NO_COROUTINES=1",
|
||||||
|
"-DFOLLY_HAVE_CLOCK_GETTIME=1",
|
||||||
);
|
);
|
||||||
OTHER_LDFLAGS = "$(inherited)";
|
OTHER_LDFLAGS = "$(inherited)";
|
||||||
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
|
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
|
||||||
@@ -475,6 +477,8 @@
|
|||||||
"-DFOLLY_NO_CONFIG",
|
"-DFOLLY_NO_CONFIG",
|
||||||
"-DFOLLY_MOBILE=1",
|
"-DFOLLY_MOBILE=1",
|
||||||
"-DFOLLY_USE_LIBCPP=1",
|
"-DFOLLY_USE_LIBCPP=1",
|
||||||
|
"-DFOLLY_CFG_NO_COROUTINES=1",
|
||||||
|
"-DFOLLY_HAVE_CLOCK_GETTIME=1",
|
||||||
);
|
);
|
||||||
OTHER_LDFLAGS = "$(inherited)";
|
OTHER_LDFLAGS = "$(inherited)";
|
||||||
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
|
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
|
||||||
|
|||||||
@@ -2,12 +2,14 @@
|
|||||||
#import "RCTPushy.h"
|
#import "RCTPushy.h"
|
||||||
|
|
||||||
#import <React/RCTBundleURLProvider.h>
|
#import <React/RCTBundleURLProvider.h>
|
||||||
|
#import <ReactAppDependencyProvider/RCTAppDependencyProvider.h>
|
||||||
|
|
||||||
@implementation AppDelegate
|
@implementation AppDelegate
|
||||||
|
|
||||||
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
|
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
|
||||||
{
|
{
|
||||||
self.moduleName = @"AwesomeProject";
|
self.moduleName = @"AwesomeProject";
|
||||||
|
self.dependencyProvider = [RCTAppDependencyProvider new];
|
||||||
// You can add your custom initial props in the dictionary below.
|
// You can add your custom initial props in the dictionary below.
|
||||||
// They will be passed down to the ViewController used by React Native.
|
// They will be passed down to the ViewController used by React Native.
|
||||||
self.initialProps = @{};
|
self.initialProps = @{};
|
||||||
|
|||||||
@@ -37,8 +37,14 @@
|
|||||||
</dict>
|
</dict>
|
||||||
</dict>
|
</dict>
|
||||||
</dict>
|
</dict>
|
||||||
|
<key>NSCameraUsageDescription</key>
|
||||||
|
<string>For taking photos</string>
|
||||||
<key>NSLocationWhenInUseUsageDescription</key>
|
<key>NSLocationWhenInUseUsageDescription</key>
|
||||||
<string></string>
|
<string></string>
|
||||||
|
<key>NSPhotoLibraryUsageDescription</key>
|
||||||
|
<string>For saving photos</string>
|
||||||
|
<key>RCTNewArchEnabled</key>
|
||||||
|
<true/>
|
||||||
<key>UILaunchStoryboardName</key>
|
<key>UILaunchStoryboardName</key>
|
||||||
<string>LaunchScreen</string>
|
<string>LaunchScreen</string>
|
||||||
<key>UIRequiredDeviceCapabilities</key>
|
<key>UIRequiredDeviceCapabilities</key>
|
||||||
@@ -53,10 +59,5 @@
|
|||||||
</array>
|
</array>
|
||||||
<key>UIViewControllerBasedStatusBarAppearance</key>
|
<key>UIViewControllerBasedStatusBarAppearance</key>
|
||||||
<false/>
|
<false/>
|
||||||
<key>NSCameraUsageDescription</key>
|
|
||||||
<string>For taking photos</string>
|
|
||||||
|
|
||||||
<key>NSPhotoLibraryUsageDescription</key>
|
|
||||||
<string>For saving photos</string>
|
|
||||||
</dict>
|
</dict>
|
||||||
</plist>
|
</plist>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ const {getDefaultConfig, mergeConfig} = require('@react-native/metro-config');
|
|||||||
* Metro configuration
|
* Metro configuration
|
||||||
* https://reactnative.dev/docs/metro
|
* https://reactnative.dev/docs/metro
|
||||||
*
|
*
|
||||||
* @type {import('metro-config').MetroConfig}
|
* @type {import('@react-native/metro-config').MetroConfig}
|
||||||
*/
|
*/
|
||||||
const config = {};
|
const config = {};
|
||||||
|
|
||||||
|
|||||||
@@ -10,49 +10,45 @@
|
|||||||
"test:e2e": "detox test --configuration android.emu.debug",
|
"test:e2e": "detox test --configuration android.emu.debug",
|
||||||
"lint": "eslint .",
|
"lint": "eslint .",
|
||||||
"postinstall": "patch-package",
|
"postinstall": "patch-package",
|
||||||
"apk": "cd android && ./gradlew assembleRelease",
|
"apk": "cd android && ./gradlew assembleRelease"
|
||||||
"dev:harmony": "react-native bundle-harmony --dev"
|
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"form-data": "^4.0.2",
|
"form-data": "^4.0.4",
|
||||||
"patch-package": "^8.0.0",
|
"patch-package": "^8.0.0",
|
||||||
"postinstall-postinstall": "^2.1.0",
|
"react": "19.1.0",
|
||||||
"react": "18.3.1",
|
"react-native": "0.81.4",
|
||||||
"react-native": "0.76.7",
|
"react-native-camera-kit": "^16.1.2",
|
||||||
"react-native-camera-kit": "^14.2.0",
|
"react-native-paper": "^5.14.5",
|
||||||
"react-native-paper": "^5.13.1",
|
"react-native-safe-area-context": "^5.6.1",
|
||||||
"react-native-safe-area-context": "^5.2.0",
|
"react-native-svg": "^15.13.0",
|
||||||
"react-native-svg": "^15.11.1",
|
"react-native-update": "^10.34.4",
|
||||||
"react-native-update": "^10.25.2",
|
"react-native-vector-icons": "^10.3.0"
|
||||||
"react-native-vector-icons": "^10.2.0"
|
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@babel/core": "^7.26.0",
|
"@babel/core": "^7.27.3",
|
||||||
"@babel/preset-env": "^7.26.0",
|
"@babel/preset-env": "^7.27.2",
|
||||||
"@babel/runtime": "^7.26.0",
|
"@babel/runtime": "^7.27.3",
|
||||||
"@react-native-community/cli": "15.0.1",
|
"@react-native-community/cli": "20.0.0",
|
||||||
"@react-native-community/cli-platform-android": "15.0.1",
|
"@react-native-community/cli-platform-android": "20.0.0",
|
||||||
"@react-native-community/cli-platform-ios": "15.0.1",
|
"@react-native-community/cli-platform-ios": "20.0.0",
|
||||||
"@react-native/babel-preset": "0.76.7",
|
"@react-native/babel-preset": "0.81.4",
|
||||||
"@react-native/eslint-config": "0.76.7",
|
"@react-native/eslint-config": "0.81.4",
|
||||||
"@react-native/metro-config": "0.76.7",
|
"@react-native/metro-config": "0.81.4",
|
||||||
"@react-native/typescript-config": "0.76.7",
|
"@react-native/typescript-config": "0.81.4",
|
||||||
"@types/react": "^18.2.6",
|
"@types/react": "^19.1.13",
|
||||||
"@types/react-test-renderer": "^18.0.0",
|
"@types/react-test-renderer": "^19.1.0",
|
||||||
"babel-jest": "^29.6.3",
|
"detox": "^20.41.2",
|
||||||
"detox": "^20.32.0",
|
"eslint": "^9.35.0",
|
||||||
"eslint": "^8.19.0",
|
|
||||||
"jest": "^29.6.3",
|
"jest": "^29.6.3",
|
||||||
"prettier": "2.8.8",
|
"prettier": "2.8.8",
|
||||||
"react-test-renderer": "18.3.1",
|
"react-test-renderer": "19.1.1",
|
||||||
"typescript": "5.7.3"
|
"typescript": "5.8.3"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=18"
|
"node": ">=20"
|
||||||
},
|
},
|
||||||
"trustedDependencies": [
|
"trustedDependencies": [
|
||||||
"detox",
|
"detox",
|
||||||
"dtrace-provider",
|
"dtrace-provider"
|
||||||
"postinstall-postinstall"
|
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
/* eslint-disable react/no-unstable-nested-components */
|
/* eslint-disable react/no-unstable-nested-components */
|
||||||
/* eslint-disable react-native/no-inline-styles */
|
/* eslint-disable react-native/no-inline-styles */
|
||||||
import React, {useRef, useState} from 'react';
|
import React, { useRef, useState } from 'react';
|
||||||
import {
|
import {
|
||||||
StyleSheet,
|
StyleSheet,
|
||||||
Platform,
|
Platform,
|
||||||
@@ -19,14 +19,14 @@ import {
|
|||||||
Modal,
|
Modal,
|
||||||
Portal,
|
Portal,
|
||||||
} from 'react-native-paper';
|
} from 'react-native-paper';
|
||||||
import {Camera} from 'react-native-camera-kit';
|
import { Camera } from 'react-native-camera-kit';
|
||||||
import {LocalSvg} from 'react-native-svg/css';
|
import { LocalSvg } from 'react-native-svg/css';
|
||||||
|
|
||||||
import TestConsole from './TestConsole';
|
import TestConsole from './TestConsole';
|
||||||
|
|
||||||
import _updateConfig from '../update.json';
|
import _updateConfig from '../update.json';
|
||||||
import {UpdateProvider, Pushy, Cresc, useUpdate} from 'react-native-update';
|
import { UpdateProvider, Pushy, Cresc, useUpdate } from 'react-native-update';
|
||||||
const {appKey} = _updateConfig[Platform.OS];
|
const { appKey } = _updateConfig[Platform.OS];
|
||||||
|
|
||||||
function App() {
|
function App() {
|
||||||
const {
|
const {
|
||||||
@@ -39,7 +39,8 @@ function App() {
|
|||||||
packageVersion,
|
packageVersion,
|
||||||
currentHash,
|
currentHash,
|
||||||
parseTestQrCode,
|
parseTestQrCode,
|
||||||
progress: {received, total} = {},
|
progress: { received, total } = {},
|
||||||
|
currentVersionInfo,
|
||||||
} = useUpdate();
|
} = useUpdate();
|
||||||
const [useDefaultAlert, setUseDefaultAlert] = useState(true);
|
const [useDefaultAlert, setUseDefaultAlert] = useState(true);
|
||||||
const [showTestConsole, setShowTestConsole] = useState(false);
|
const [showTestConsole, setShowTestConsole] = useState(false);
|
||||||
@@ -52,8 +53,8 @@ function App() {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<View style={styles.container}>
|
<View style={styles.container}>
|
||||||
<Text style={styles.welcome}>欢迎使用Pushy热更新服务</Text>
|
<Text style={styles.welcome}>欢迎22使用Pushy热更新服务</Text>
|
||||||
<View style={{flexDirection: 'row'}}>
|
<View style={{ flexDirection: 'row' }}>
|
||||||
<Text>
|
<Text>
|
||||||
{useDefaultAlert ? '当前使用' : '当前不使用'}默认的alert更新提示
|
{useDefaultAlert ? '当前使用' : '当前不使用'}默认的alert更新提示
|
||||||
</Text>
|
</Text>
|
||||||
@@ -72,9 +73,9 @@ function App() {
|
|||||||
<Portal>
|
<Portal>
|
||||||
<Modal visible={showCamera} onDismiss={() => setShowCamera(false)}>
|
<Modal visible={showCamera} onDismiss={() => setShowCamera(false)}>
|
||||||
<Camera
|
<Camera
|
||||||
style={{minHeight: 320}}
|
style={{ minHeight: 320 }}
|
||||||
scanBarcode={true}
|
scanBarcode={true}
|
||||||
onReadCode={({nativeEvent: {codeStringValue}}) => {
|
onReadCode={({ nativeEvent: { codeStringValue } }) => {
|
||||||
// 防止重复扫码
|
// 防止重复扫码
|
||||||
if (lastParsedCode.current === codeStringValue) {
|
if (lastParsedCode.current === codeStringValue) {
|
||||||
return;
|
return;
|
||||||
@@ -92,7 +93,7 @@ function App() {
|
|||||||
/>
|
/>
|
||||||
</Modal>
|
</Modal>
|
||||||
</Portal>
|
</Portal>
|
||||||
<View style={{flexDirection: 'row', alignItems: 'center', gap: 10}}>
|
<View style={{ flexDirection: 'row', alignItems: 'center', gap: 10 }}>
|
||||||
<Text>png:</Text>
|
<Text>png:</Text>
|
||||||
<Image
|
<Image
|
||||||
resizeMode={'contain'}
|
resizeMode={'contain'}
|
||||||
@@ -100,11 +101,11 @@ function App() {
|
|||||||
style={styles.image}
|
style={styles.image}
|
||||||
/>
|
/>
|
||||||
</View>
|
</View>
|
||||||
<View style={{flexDirection: 'row', alignItems: 'center', gap: 10}}>
|
<View style={{ flexDirection: 'row', alignItems: 'center', gap: 10 }}>
|
||||||
<Text>svg:</Text>
|
<Text>svg:</Text>
|
||||||
<LocalSvg
|
<LocalSvg
|
||||||
asset={require('./assets/react-logo.svg')}
|
asset={require('./assets/react-logo.svg')}
|
||||||
style={{width: 30, height: 30}}
|
style={{ width: 30, height: 30 }}
|
||||||
/>
|
/>
|
||||||
</View>
|
</View>
|
||||||
<Text style={styles.instructions}>
|
<Text style={styles.instructions}>
|
||||||
@@ -113,6 +114,7 @@ function App() {
|
|||||||
{'\n'}
|
{'\n'}
|
||||||
当前热更新版本Hash: {currentHash || '(空)'}
|
当前热更新版本Hash: {currentHash || '(空)'}
|
||||||
{'\n'}
|
{'\n'}
|
||||||
|
当前热更新版本信息: {JSON.stringify(currentVersionInfo) || '(空)'}
|
||||||
</Text>
|
</Text>
|
||||||
<Text>
|
<Text>
|
||||||
下载进度:{received} / {total}
|
下载进度:{received} / {total}
|
||||||
@@ -121,16 +123,18 @@ function App() {
|
|||||||
onPress={() => {
|
onPress={() => {
|
||||||
checkUpdate();
|
checkUpdate();
|
||||||
setShowUpdateSnackbar(true);
|
setShowUpdateSnackbar(true);
|
||||||
}}>
|
}}
|
||||||
|
>
|
||||||
<Text style={styles.instructions}>点击这里检查更新</Text>
|
<Text style={styles.instructions}>点击这里检查更新</Text>
|
||||||
</TouchableOpacity>
|
</TouchableOpacity>
|
||||||
|
|
||||||
<TouchableOpacity
|
<TouchableOpacity
|
||||||
testID="testcase"
|
testID="testcase"
|
||||||
style={{marginTop: 15}}
|
style={{ marginTop: 15 }}
|
||||||
onLongPress={() => {
|
onLongPress={() => {
|
||||||
setShowTestConsole(true);
|
setShowTestConsole(true);
|
||||||
}}>
|
}}
|
||||||
|
>
|
||||||
<Text style={styles.instructions}>
|
<Text style={styles.instructions}>
|
||||||
react-native-update版本:{client?.version}
|
react-native-update版本:{client?.version}
|
||||||
</Text>
|
</Text>
|
||||||
@@ -152,14 +156,15 @@ function App() {
|
|||||||
await downloadUpdate();
|
await downloadUpdate();
|
||||||
setShowUpdateBanner(true);
|
setShowUpdateBanner(true);
|
||||||
},
|
},
|
||||||
}}>
|
}}
|
||||||
<Text style={{color: 'white'}}>
|
>
|
||||||
|
<Text style={{ color: 'white' }}>
|
||||||
有新版本({updateInfo.name})可用,是否更新?
|
有新版本({updateInfo.name})可用,是否更新?
|
||||||
</Text>
|
</Text>
|
||||||
</Snackbar>
|
</Snackbar>
|
||||||
)}
|
)}
|
||||||
<Banner
|
<Banner
|
||||||
style={{width: '100%', position: 'absolute', top: 0}}
|
style={{ width: '100%', position: 'absolute', top: 0 }}
|
||||||
visible={showUpdateBanner}
|
visible={showUpdateBanner}
|
||||||
actions={[
|
actions={[
|
||||||
{
|
{
|
||||||
@@ -174,9 +179,10 @@ function App() {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
]}
|
]}
|
||||||
icon={({size}) => (
|
icon={({ size }) => (
|
||||||
<Icon name="checkcircleo" size={size} color="#00f" />
|
<Icon name="checkcircleo" size={size} color="#00f" />
|
||||||
)}>
|
)}
|
||||||
|
>
|
||||||
更新已完成,是否立即重启?
|
更新已完成,是否立即重启?
|
||||||
</Banner>
|
</Banner>
|
||||||
</View>
|
</View>
|
||||||
@@ -204,17 +210,18 @@ const styles = StyleSheet.create({
|
|||||||
});
|
});
|
||||||
|
|
||||||
// use Pushy for China users
|
// use Pushy for China users
|
||||||
// const updateClient = new Pushy({
|
const updateClient = new Pushy({
|
||||||
|
appKey,
|
||||||
|
debug: true,
|
||||||
|
// updateStrategy: 'silentAndLater',
|
||||||
|
});
|
||||||
|
|
||||||
|
// use Cresc for global users
|
||||||
|
// const updateClient = new Cresc({
|
||||||
// appKey,
|
// appKey,
|
||||||
// debug: true,
|
// debug: true,
|
||||||
// });
|
// });
|
||||||
|
|
||||||
// use Cresc for global users
|
|
||||||
const updateClient = new Cresc({
|
|
||||||
appKey,
|
|
||||||
debug: true,
|
|
||||||
});
|
|
||||||
|
|
||||||
export default function Root() {
|
export default function Root() {
|
||||||
return (
|
return (
|
||||||
<UpdateProvider client={updateClient}>
|
<UpdateProvider client={updateClient}>
|
||||||
|
|||||||
5
Example/testHotUpdate/tsconfig.json
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
{
|
||||||
|
"extends": "@react-native/typescript-config",
|
||||||
|
"include": ["**/*.ts", "**/*.tsx"],
|
||||||
|
"exclude": ["**/node_modules", "**/Pods"]
|
||||||
|
}
|
||||||
@@ -1,10 +1,10 @@
|
|||||||
{
|
{
|
||||||
"ios": {
|
"ios": {
|
||||||
"appId": 24794,
|
"appId": 28943,
|
||||||
"appKey": "SqShg4Klnj2hG6LAFMW2PdcgSSuniz0T"
|
"appKey": "d-OmPxIBivPrDfKhLHjxN-HS"
|
||||||
},
|
},
|
||||||
"android": {
|
"android": {
|
||||||
"appId": 27509,
|
"appId": 27509,
|
||||||
"appKey": "aQz3Uc2pA7gt_prDaQ4rbWRY"
|
"appKey": "aQz3Uc2pA7gt_prDaQ4rbWRY"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -22,14 +22,70 @@ def supportsNamespace() {
|
|||||||
return major >= 8
|
return major >= 8
|
||||||
}
|
}
|
||||||
|
|
||||||
|
def checkProjectInfo() {
|
||||||
|
def hasExpoModulesCore = rootProject.subprojects.any { it.name == 'expo-modules-core' }
|
||||||
|
def packageJsonFile = new File(rootProject.projectDir.parentFile, 'package.json')
|
||||||
|
|
||||||
|
def hasExpoDependency = false
|
||||||
|
def projectVersion = '1.0.0' // Default version
|
||||||
|
|
||||||
|
if (packageJsonFile.exists()) {
|
||||||
|
def packageJson = new groovy.json.JsonSlurper().parseText(packageJsonFile.text)
|
||||||
|
projectVersion = packageJson.version ?: '1.0.0' // Get project version
|
||||||
|
|
||||||
|
// Check for expo dependency and version >= 50
|
||||||
|
String expoVersionString = packageJson.dependencies?.expo ?: packageJson.devDependencies?.expo
|
||||||
|
boolean expoVersionIsHighEnough = false
|
||||||
|
if (expoVersionString) {
|
||||||
|
try {
|
||||||
|
// Extract the first number sequence as the major version
|
||||||
|
def matcher = (expoVersionString =~ /(\d+)/)
|
||||||
|
if (matcher.find()) {
|
||||||
|
int majorVersion = matcher[0][0].toInteger()
|
||||||
|
if (majorVersion >= 50) {
|
||||||
|
expoVersionIsHighEnough = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (NumberFormatException e) {
|
||||||
|
// Handle error if version parsing fails, maybe log a warning
|
||||||
|
println "Warning: Could not parse Expo version string: ${expoVersionString}"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
hasExpoDependency = expoVersionIsHighEnough // Update based on version check
|
||||||
|
}
|
||||||
|
|
||||||
|
def isExpo = hasExpoModulesCore && hasExpoDependency
|
||||||
|
|
||||||
|
// Return a map containing both pieces of information
|
||||||
|
return [isExpo: isExpo, version: projectVersion]
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get project info map
|
||||||
|
def projectInfo = checkProjectInfo()
|
||||||
|
// Extract info into variables
|
||||||
|
def projectVersion = projectInfo.version
|
||||||
|
def expoProject = projectInfo.isExpo
|
||||||
|
|
||||||
apply plugin: 'com.android.library'
|
apply plugin: 'com.android.library'
|
||||||
if (isNewArchitectureEnabled()) {
|
if (isNewArchitectureEnabled()) {
|
||||||
apply plugin: 'com.facebook.react'
|
apply plugin: 'com.facebook.react'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (expoProject) {
|
||||||
|
group = 'expo.modules.pushy'
|
||||||
|
version = projectVersion
|
||||||
|
|
||||||
|
def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
|
||||||
|
apply from: expoModulesCorePlugin
|
||||||
|
applyKotlinExpoModulesCorePlugin()
|
||||||
|
// useExpoPublishing()
|
||||||
|
useCoreDependencies()
|
||||||
|
} else {
|
||||||
|
group = 'cn.reactnative.modules.update'
|
||||||
|
version = projectVersion
|
||||||
|
}
|
||||||
|
|
||||||
android {
|
android {
|
||||||
|
|
||||||
if (supportsNamespace()) {
|
if (supportsNamespace()) {
|
||||||
namespace "cn.reactnative.modules.update"
|
namespace "cn.reactnative.modules.update"
|
||||||
|
|
||||||
@@ -41,15 +97,15 @@ android {
|
|||||||
}
|
}
|
||||||
compileSdkVersion safeExtGet('compileSdkVersion', 28)
|
compileSdkVersion safeExtGet('compileSdkVersion', 28)
|
||||||
buildToolsVersion safeExtGet('buildToolsVersion', '28.0.3')
|
buildToolsVersion safeExtGet('buildToolsVersion', '28.0.3')
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
minSdkVersion safeExtGet('minSdkVersion', 16)
|
minSdkVersion safeExtGet('minSdkVersion', 16)
|
||||||
targetSdkVersion safeExtGet('targetSdkVersion', 27)
|
targetSdkVersion safeExtGet('targetSdkVersion', 27)
|
||||||
versionCode 1
|
versionCode 1
|
||||||
versionName "1.0"
|
versionName "1.81.4"
|
||||||
consumerProguardFiles "proguard.pro"
|
consumerProguardFiles "proguard.pro"
|
||||||
buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
|
buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
main {
|
main {
|
||||||
// let gradle pack the shared library into apk
|
// let gradle pack the shared library into apk
|
||||||
@@ -59,6 +115,12 @@ android {
|
|||||||
} else {
|
} else {
|
||||||
java.srcDirs += ['src/oldarch']
|
java.srcDirs += ['src/oldarch']
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (expoProject) {
|
||||||
|
java.srcDirs += ['java/expo/modules/pushy']
|
||||||
|
} else {
|
||||||
|
java.exclude 'expo/modules/pushy/**'
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -70,6 +132,10 @@ android {
|
|||||||
resValue("string", "pushy_build_time", "0")
|
resValue("string", "pushy_build_time", "0")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
lintOptions {
|
||||||
|
abortOnError false
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
@@ -82,7 +148,6 @@ repositories {
|
|||||||
dependencies {
|
dependencies {
|
||||||
implementation 'com.facebook.react:react-native:+'
|
implementation 'com.facebook.react:react-native:+'
|
||||||
implementation 'com.fasterxml.jackson.core:jackson-databind:2.13.0'
|
implementation 'com.fasterxml.jackson.core:jackson-databind:2.13.0'
|
||||||
implementation 'com.jakewharton:process-phoenix:3.0.0'
|
|
||||||
}
|
}
|
||||||
if (isNewArchitectureEnabled()) {
|
if (isNewArchitectureEnabled()) {
|
||||||
react {
|
react {
|
||||||
|
|||||||
17
android/proguard.pro
vendored
@@ -1,3 +1,18 @@
|
|||||||
|
# Keep our update module classes
|
||||||
-keepnames class cn.reactnative.modules.update.DownloadTask { *; }
|
-keepnames class cn.reactnative.modules.update.DownloadTask { *; }
|
||||||
-keepnames class cn.reactnative.modules.update.UpdateModuleImpl { *; }
|
-keepnames class cn.reactnative.modules.update.UpdateModuleImpl { *; }
|
||||||
-keepnames class com.facebook.react.ReactInstanceManager { *; }
|
-keepnames class cn.reactnative.modules.update.** { *; }
|
||||||
|
|
||||||
|
# Keep React Native classes
|
||||||
|
-keepnames class com.facebook.react.ReactInstanceManager { *; }
|
||||||
|
-keepnames class com.facebook.react.** { *; }
|
||||||
|
-keepnames class com.facebook.react.bridge.** { *; }
|
||||||
|
-keepnames class com.facebook.react.devsupport.** { *; }
|
||||||
|
|
||||||
|
# Keep fields used in reflection
|
||||||
|
-keepclassmembers class com.facebook.react.ReactActivity { *; }
|
||||||
|
-keepclassmembers class com.facebook.react.ReactInstanceManager { *; }
|
||||||
|
-keepclassmembers class com.facebook.react.ReactDelegate { *; }
|
||||||
|
-keepclassmembers class com.facebook.react.ReactHost { *; }
|
||||||
|
|
||||||
|
-keepnames class expo.modules.ExpoReactHostFactory$ExpoReactHostDelegate { *; }
|
||||||
|
|||||||
@@ -25,6 +25,7 @@ import java.util.ArrayList;
|
|||||||
import java.util.Enumeration;
|
import java.util.Enumeration;
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
import java.util.zip.ZipEntry;
|
import java.util.zip.ZipEntry;
|
||||||
|
import java.util.zip.CRC32;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
|
||||||
import okio.BufferedSink;
|
import okio.BufferedSink;
|
||||||
@@ -100,7 +101,7 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
|
|||||||
if (UpdateContext.DEBUG) {
|
if (UpdateContext.DEBUG) {
|
||||||
Log.d("react-native-update", "Progress " + received + "/" + contentLength);
|
Log.d("react-native-update", "Progress " + received + "/" + contentLength);
|
||||||
}
|
}
|
||||||
|
|
||||||
int percentage = (int)(received * 100.0 / contentLength + 0.5);
|
int percentage = (int)(received * 100.0 / contentLength + 0.5);
|
||||||
if (percentage > currentPercentage) {
|
if (percentage > currentPercentage) {
|
||||||
currentPercentage = percentage;
|
currentPercentage = percentage;
|
||||||
@@ -120,14 +121,13 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onProgressUpdate(long[]... values) {
|
protected void onProgressUpdate(final long[]... values) {
|
||||||
super.onProgressUpdate(values);
|
super.onProgressUpdate(values);
|
||||||
WritableMap params = Arguments.createMap();
|
WritableMap params = Arguments.createMap();
|
||||||
params.putDouble("received", (values[0][0]));
|
params.putDouble("received", (values[0][0]));
|
||||||
params.putDouble("total", (values[0][1]));
|
params.putDouble("total", (values[0][1]));
|
||||||
params.putString("hash", this.hash);
|
params.putString("hash", this.hash);
|
||||||
sendEvent("RCTPushyDownloadProgress", params);
|
sendEvent("RCTPushyDownloadProgress", params);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
byte[] buffer = new byte[1024*4];
|
byte[] buffer = new byte[1024*4];
|
||||||
@@ -199,6 +199,10 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
|
|||||||
return fout.toByteArray();
|
return fout.toByteArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private String getCRC32AsDecimal(long crc32Value) {
|
||||||
|
return String.valueOf(crc32Value & 0xFFFFFFFFL);
|
||||||
|
}
|
||||||
|
|
||||||
private void copyFilesWithBlacklist(String current, File from, File to, JSONObject blackList) throws IOException {
|
private void copyFilesWithBlacklist(String current, File from, File to, JSONObject blackList) throws IOException {
|
||||||
File[] files = from.listFiles();
|
File[] files = from.listFiles();
|
||||||
for (File file : files) {
|
for (File file : files) {
|
||||||
@@ -274,12 +278,41 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
|
|||||||
zipFile.close();
|
zipFile.close();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void copyFromResourceV2(HashMap<String, ArrayList<File>> resToCopy2) throws IOException {
|
||||||
|
SafeZipFile zipFile = new SafeZipFile(new File(context.getPackageResourcePath()));
|
||||||
|
Enumeration<? extends ZipEntry> entries = zipFile.entries();
|
||||||
|
while (entries.hasMoreElements()) {
|
||||||
|
ZipEntry ze = entries.nextElement();
|
||||||
|
String fn = ze.getName();
|
||||||
|
long zipCrc32 = ze.getCrc();
|
||||||
|
String crc32Decimal = getCRC32AsDecimal(zipCrc32);
|
||||||
|
ArrayList<File> targets = resToCopy2.get(crc32Decimal);
|
||||||
|
if (targets != null) {
|
||||||
|
File lastTarget = null;
|
||||||
|
for (File target: targets) {
|
||||||
|
if (UpdateContext.DEBUG) {
|
||||||
|
Log.d("react-native-update", "Copying from resource " + fn + " to " + target);
|
||||||
|
}
|
||||||
|
if (lastTarget != null) {
|
||||||
|
copyFile(lastTarget, target);
|
||||||
|
} else {
|
||||||
|
zipFile.unzipToFile(ze, target);
|
||||||
|
lastTarget = target;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
zipFile.close();
|
||||||
|
}
|
||||||
|
|
||||||
private void doPatchFromApk(DownloadTaskParams param) throws IOException, JSONException {
|
private void doPatchFromApk(DownloadTaskParams param) throws IOException, JSONException {
|
||||||
downloadFile(param);
|
downloadFile(param);
|
||||||
|
|
||||||
removeDirectory(param.unzipDirectory);
|
removeDirectory(param.unzipDirectory);
|
||||||
param.unzipDirectory.mkdirs();
|
param.unzipDirectory.mkdirs();
|
||||||
HashMap<String, ArrayList<File>> copyList = new HashMap<String, ArrayList<File>>();
|
HashMap<String, ArrayList<File>> copyList = new HashMap<String, ArrayList<File>>();
|
||||||
|
HashMap<String, ArrayList<File>> copiesv2List = new HashMap<String, ArrayList<File>>();
|
||||||
|
Boolean isV2 = false;
|
||||||
|
|
||||||
boolean foundDiff = false;
|
boolean foundDiff = false;
|
||||||
boolean foundBundlePatch = false;
|
boolean foundBundlePatch = false;
|
||||||
@@ -298,29 +331,58 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
|
|||||||
JSONObject obj = (JSONObject)new JSONTokener(json).nextValue();
|
JSONObject obj = (JSONObject)new JSONTokener(json).nextValue();
|
||||||
|
|
||||||
JSONObject copies = obj.getJSONObject("copies");
|
JSONObject copies = obj.getJSONObject("copies");
|
||||||
|
JSONObject copiesv2 = obj.getJSONObject("copiesv2");
|
||||||
Iterator<?> keys = copies.keys();
|
Iterator<?> keys = copies.keys();
|
||||||
while( keys.hasNext() ) {
|
Iterator<?> keysV2 = copiesv2.keys();
|
||||||
String to = (String)keys.next();
|
if(keysV2.hasNext()){
|
||||||
String from = copies.getString(to);
|
isV2 = true;
|
||||||
if (from.isEmpty()) {
|
while( keysV2.hasNext() ) {
|
||||||
from = to;
|
String from = (String)keysV2.next();
|
||||||
}
|
String to = copiesv2.getString(from);
|
||||||
ArrayList<File> target = null;
|
if (from.isEmpty()) {
|
||||||
if (!copyList.containsKey(from)) {
|
from = to;
|
||||||
target = new ArrayList<File>();
|
}
|
||||||
copyList.put(from, target);
|
ArrayList<File> target = null;
|
||||||
} else {
|
if (!copiesv2List.containsKey(from)) {
|
||||||
target = copyList.get((from));
|
target = new ArrayList<File>();
|
||||||
}
|
copiesv2List.put(from, target);
|
||||||
File toFile = new File(param.unzipDirectory, to);
|
} else {
|
||||||
|
target = copiesv2List.get((from));
|
||||||
|
}
|
||||||
|
File toFile = new File(param.unzipDirectory, to);
|
||||||
|
|
||||||
// Fixing a Zip Path Traversal Vulnerability
|
// Fixing a Zip Path Traversal Vulnerability
|
||||||
// https://support.google.com/faqs/answer/9294009
|
// https://support.google.com/faqs/answer/9294009
|
||||||
String canonicalPath = toFile.getCanonicalPath();
|
String canonicalPath = toFile.getCanonicalPath();
|
||||||
if (!canonicalPath.startsWith(param.unzipDirectory.getCanonicalPath() + File.separator)) {
|
if (!canonicalPath.startsWith(param.unzipDirectory.getCanonicalPath() + File.separator)) {
|
||||||
throw new SecurityException("Illegal name: " + to);
|
throw new SecurityException("Illegal name: " + to);
|
||||||
|
}
|
||||||
|
target.add(toFile);
|
||||||
|
}
|
||||||
|
}else{
|
||||||
|
while( keys.hasNext() ) {
|
||||||
|
String to = (String)keys.next();
|
||||||
|
String from = copies.getString(to);
|
||||||
|
if (from.isEmpty()) {
|
||||||
|
from = to;
|
||||||
|
}
|
||||||
|
ArrayList<File> target = null;
|
||||||
|
if (!copyList.containsKey(from)) {
|
||||||
|
target = new ArrayList<File>();
|
||||||
|
copyList.put(from, target);
|
||||||
|
} else {
|
||||||
|
target = copyList.get((from));
|
||||||
|
}
|
||||||
|
File toFile = new File(param.unzipDirectory, to);
|
||||||
|
|
||||||
|
// Fixing a Zip Path Traversal Vulnerability
|
||||||
|
// https://support.google.com/faqs/answer/9294009
|
||||||
|
String canonicalPath = toFile.getCanonicalPath();
|
||||||
|
if (!canonicalPath.startsWith(param.unzipDirectory.getCanonicalPath() + File.separator)) {
|
||||||
|
throw new SecurityException("Illegal name: " + to);
|
||||||
|
}
|
||||||
|
target.add(toFile);
|
||||||
}
|
}
|
||||||
target.add(toFile);
|
|
||||||
}
|
}
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
@@ -349,7 +411,11 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
|
|||||||
throw new Error("bundle patch not found");
|
throw new Error("bundle patch not found");
|
||||||
}
|
}
|
||||||
|
|
||||||
copyFromResource(copyList);
|
if(isV2){
|
||||||
|
copyFromResourceV2(copiesv2List);
|
||||||
|
}else{
|
||||||
|
copyFromResource(copyList);
|
||||||
|
}
|
||||||
|
|
||||||
if (UpdateContext.DEBUG) {
|
if (UpdateContext.DEBUG) {
|
||||||
Log.d("react-native-update", "Unzip finished");
|
Log.d("react-native-update", "Unzip finished");
|
||||||
@@ -452,7 +518,7 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected Void doInBackground(DownloadTaskParams... params) {
|
protected Void doInBackground(final DownloadTaskParams... params) {
|
||||||
int taskType = params[0].type;
|
int taskType = params[0].type;
|
||||||
try {
|
try {
|
||||||
switch (taskType) {
|
switch (taskType) {
|
||||||
|
|||||||
@@ -0,0 +1,13 @@
|
|||||||
|
package cn.reactnative.modules.update;
|
||||||
|
|
||||||
|
import androidx.annotation.Nullable;
|
||||||
|
|
||||||
|
public interface ReactNativeHostHandler {
|
||||||
|
@Nullable
|
||||||
|
String getJSBundleFile(boolean useDeveloperSupport);
|
||||||
|
|
||||||
|
@Nullable
|
||||||
|
String getBundleAssetName(boolean useDeveloperSupport);
|
||||||
|
|
||||||
|
void onWillCreateReactInstance(boolean useDeveloperSupport);
|
||||||
|
}
|
||||||
@@ -7,14 +7,11 @@ import android.content.pm.PackageManager;
|
|||||||
import android.os.Build;
|
import android.os.Build;
|
||||||
import android.os.Environment;
|
import android.os.Environment;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
|
|
||||||
import com.facebook.react.ReactInstanceManager;
|
import com.facebook.react.ReactInstanceManager;
|
||||||
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.concurrent.Executor;
|
import java.util.concurrent.Executor;
|
||||||
import java.util.concurrent.Executors;
|
import java.util.concurrent.Executors;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
|
|
||||||
public class UpdateContext {
|
public class UpdateContext {
|
||||||
@@ -39,10 +36,28 @@ public class UpdateContext {
|
|||||||
this.sp = context.getSharedPreferences("update", Context.MODE_PRIVATE);
|
this.sp = context.getSharedPreferences("update", Context.MODE_PRIVATE);
|
||||||
|
|
||||||
String packageVersion = getPackageVersion();
|
String packageVersion = getPackageVersion();
|
||||||
if (!packageVersion.equals(this.sp.getString("packageVersion", null))) {
|
String buildTime = getBuildTime();
|
||||||
|
String storedPackageVersion = this.sp.getString("packageVersion", null);
|
||||||
|
String storedBuildTime = this.sp.getString("buildTime", null);
|
||||||
|
|
||||||
|
// If stored versions don't exist, write current versions first
|
||||||
|
if (storedPackageVersion == null || storedBuildTime == null) {
|
||||||
|
SharedPreferences.Editor editor = sp.edit();
|
||||||
|
editor.putString("packageVersion", packageVersion);
|
||||||
|
editor.putString("buildTime", buildTime);
|
||||||
|
editor.apply();
|
||||||
|
storedPackageVersion = packageVersion;
|
||||||
|
storedBuildTime = buildTime;
|
||||||
|
}
|
||||||
|
|
||||||
|
boolean packageVersionChanged = !packageVersion.equals(storedPackageVersion);
|
||||||
|
boolean buildTimeChanged = !buildTime.equals(storedBuildTime);
|
||||||
|
|
||||||
|
if (packageVersionChanged || buildTimeChanged) {
|
||||||
SharedPreferences.Editor editor = sp.edit();
|
SharedPreferences.Editor editor = sp.edit();
|
||||||
editor.clear();
|
editor.clear();
|
||||||
editor.putString("packageVersion", packageVersion);
|
editor.putString("packageVersion", packageVersion);
|
||||||
|
editor.putString("buildTime", buildTime);
|
||||||
editor.apply();
|
editor.apply();
|
||||||
|
|
||||||
this.cleanUp();
|
this.cleanUp();
|
||||||
@@ -172,17 +187,19 @@ public class UpdateContext {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void markSuccess() {
|
public void markSuccess() {
|
||||||
SharedPreferences.Editor editor = sp.edit();
|
if (!BuildConfig.DEBUG) {
|
||||||
editor.putBoolean("firstTimeOk", true);
|
SharedPreferences.Editor editor = sp.edit();
|
||||||
String lastVersion = sp.getString("lastVersion", null);
|
editor.putBoolean("firstTimeOk", true);
|
||||||
String curVersion = sp.getString("currentVersion", null);
|
String lastVersion = sp.getString("lastVersion", null);
|
||||||
if (lastVersion != null && !lastVersion.equals(curVersion)) {
|
String curVersion = sp.getString("currentVersion", null);
|
||||||
editor.remove("lastVersion");
|
if (lastVersion != null && !lastVersion.equals(curVersion)) {
|
||||||
editor.remove("hash_" + lastVersion);
|
editor.remove("lastVersion");
|
||||||
}
|
editor.remove("hash_" + lastVersion);
|
||||||
editor.apply();
|
}
|
||||||
|
editor.apply();
|
||||||
|
|
||||||
this.cleanUp();
|
this.cleanUp();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void clearFirstTime() {
|
public void clearFirstTime() {
|
||||||
@@ -256,6 +273,7 @@ public class UpdateContext {
|
|||||||
if (lastVersion == null) {
|
if (lastVersion == null) {
|
||||||
editor.remove("currentVersion");
|
editor.remove("currentVersion");
|
||||||
} else {
|
} else {
|
||||||
|
editor.remove("lastVersion");
|
||||||
editor.putString("currentVersion", lastVersion);
|
editor.putString("currentVersion", lastVersion);
|
||||||
}
|
}
|
||||||
editor.putBoolean("firstTimeOk", true);
|
editor.putBoolean("firstTimeOk", true);
|
||||||
|
|||||||
@@ -23,8 +23,40 @@ import java.util.Map;
|
|||||||
public class UpdateModuleImpl {
|
public class UpdateModuleImpl {
|
||||||
|
|
||||||
public static final String NAME = "Pushy";
|
public static final String NAME = "Pushy";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取字段的兼容性方法,尝试带m前缀和不带m前缀的字段名
|
||||||
|
* @param clazz 目标类
|
||||||
|
* @param fieldName 基础字段名(不带m前缀)
|
||||||
|
* @return 找到的字段对象
|
||||||
|
* @throws NoSuchFieldException 如果两种命名都找不到字段
|
||||||
|
*/
|
||||||
|
private static Field getCompatibleField(Class<?> clazz, String fieldName) throws NoSuchFieldException {
|
||||||
|
// 首先尝试带m前缀的字段名
|
||||||
|
try {
|
||||||
|
return clazz.getDeclaredField("m" + capitalize(fieldName));
|
||||||
|
} catch (NoSuchFieldException e) {
|
||||||
|
// 如果找不到带m前缀的,尝试不带m前缀的
|
||||||
|
try {
|
||||||
|
return clazz.getDeclaredField(fieldName);
|
||||||
|
} catch (NoSuchFieldException e2) {
|
||||||
|
// 如果都找不到,抛出异常并包含两种尝试的信息
|
||||||
|
throw new NoSuchFieldException("Field not found with either name: m" + capitalize(fieldName) + " or " + fieldName);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 首字母大写的辅助方法
|
||||||
|
*/
|
||||||
|
private static String capitalize(String str) {
|
||||||
|
if (str == null || str.length() == 0) {
|
||||||
|
return str;
|
||||||
|
}
|
||||||
|
return str.substring(0, 1).toUpperCase() + str.substring(1);
|
||||||
|
}
|
||||||
|
|
||||||
public static void downloadFullUpdate(UpdateContext updateContext, ReadableMap options, Promise promise) {
|
public static void downloadFullUpdate(UpdateContext updateContext, final ReadableMap options, final Promise promise) {
|
||||||
String url = options.getString("updateUrl");
|
String url = options.getString("updateUrl");
|
||||||
String hash = options.getString("hash");
|
String hash = options.getString("hash");
|
||||||
updateContext.downloadFullUpdate(url, hash, new UpdateContext.DownloadFileListener() {
|
updateContext.downloadFullUpdate(url, hash, new UpdateContext.DownloadFileListener() {
|
||||||
@@ -40,7 +72,7 @@ public class UpdateModuleImpl {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void downloadAndInstallApk(UpdateContext updateContext, ReadableMap options, Promise promise) {
|
public static void downloadAndInstallApk(UpdateContext updateContext, final ReadableMap options, final Promise promise) {
|
||||||
String url = options.getString("url");
|
String url = options.getString("url");
|
||||||
String hash = options.getString("hash");
|
String hash = options.getString("hash");
|
||||||
String target = options.getString("target");
|
String target = options.getString("target");
|
||||||
@@ -63,7 +95,7 @@ public class UpdateModuleImpl {
|
|||||||
UpdateModule.installApk(toInstall);
|
UpdateModule.installApk(toInstall);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void downloadPatchFromPackage(UpdateContext updateContext, ReadableMap options, Promise promise) {
|
public static void downloadPatchFromPackage(UpdateContext updateContext, final ReadableMap options, final Promise promise) {
|
||||||
String url = options.getString("updateUrl");
|
String url = options.getString("updateUrl");
|
||||||
String hash = options.getString("hash");
|
String hash = options.getString("hash");
|
||||||
updateContext.downloadPatchFromApk(url, hash, new UpdateContext.DownloadFileListener() {
|
updateContext.downloadPatchFromApk(url, hash, new UpdateContext.DownloadFileListener() {
|
||||||
@@ -79,7 +111,7 @@ public class UpdateModuleImpl {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void downloadPatchFromPpk(UpdateContext updateContext, ReadableMap options, Promise promise) {
|
public static void downloadPatchFromPpk(UpdateContext updateContext, final ReadableMap options, final Promise promise) {
|
||||||
try {
|
try {
|
||||||
String url = options.getString("updateUrl");
|
String url = options.getString("updateUrl");
|
||||||
String hash = options.getString("hash");
|
String hash = options.getString("hash");
|
||||||
@@ -102,7 +134,7 @@ public class UpdateModuleImpl {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void reloadUpdate(UpdateContext updateContext, ReactApplicationContext mContext, ReadableMap options, Promise promise) {
|
public static void reloadUpdate(final UpdateContext updateContext,final ReactApplicationContext mContext, final ReadableMap options, final Promise promise) {
|
||||||
final String hash = options.getString("hash");
|
final String hash = options.getString("hash");
|
||||||
UiThreadUtil.runOnUiThread(new Runnable() {
|
UiThreadUtil.runOnUiThread(new Runnable() {
|
||||||
@Override
|
@Override
|
||||||
@@ -143,17 +175,26 @@ public class UpdateModuleImpl {
|
|||||||
ReactDelegate reactDelegate = (ReactDelegate)
|
ReactDelegate reactDelegate = (ReactDelegate)
|
||||||
getReactDelegateMethod.invoke(currentActivity);
|
getReactDelegateMethod.invoke(currentActivity);
|
||||||
|
|
||||||
Field reactHostField = ReactDelegate.class.getDeclaredField("mReactHost");
|
Field reactHostField = getCompatibleField(ReactDelegate.class, "reactHost");
|
||||||
reactHostField.setAccessible(true);
|
reactHostField.setAccessible(true);
|
||||||
Object reactHost = reactHostField.get(reactDelegate);
|
Object reactHost = reactHostField.get(reactDelegate);
|
||||||
|
|
||||||
// Access the mReactHostDelegate field
|
Field devSupport = getCompatibleField(reactHost.getClass(), "useDevSupport");
|
||||||
Field reactHostDelegateField = reactHost.getClass().getDeclaredField("mReactHostDelegate");
|
devSupport.setAccessible(true);
|
||||||
|
devSupport.set(reactHost, false);
|
||||||
|
|
||||||
|
// Access the ReactHostDelegate field (compatible with mReactHostDelegate/reactHostDelegate)
|
||||||
|
Field reactHostDelegateField = getCompatibleField(reactHost.getClass(), "reactHostDelegate");
|
||||||
reactHostDelegateField.setAccessible(true);
|
reactHostDelegateField.setAccessible(true);
|
||||||
Object reactHostDelegate = reactHostDelegateField.get(reactHost);
|
Object reactHostDelegate = reactHostDelegateField.get(reactHost);
|
||||||
|
|
||||||
|
String bundleFieldName = "jsBundleLoader";
|
||||||
|
if (reactHostDelegate.getClass().getCanonicalName().equals("expo.modules.ExpoReactHostFactory.ExpoReactHostDelegate")) {
|
||||||
|
bundleFieldName = "_jsBundleLoader";
|
||||||
|
}
|
||||||
|
|
||||||
// Modify the jsBundleLoader field
|
// Modify the jsBundleLoader field
|
||||||
Field jsBundleLoaderField = reactHostDelegate.getClass().getDeclaredField("jsBundleLoader");
|
Field jsBundleLoaderField = reactHostDelegate.getClass().getDeclaredField(bundleFieldName);
|
||||||
jsBundleLoaderField.setAccessible(true);
|
jsBundleLoaderField.setAccessible(true);
|
||||||
jsBundleLoaderField.set(reactHostDelegate, loader);
|
jsBundleLoaderField.set(reactHostDelegate, loader);
|
||||||
|
|
||||||
@@ -176,8 +217,37 @@ public class UpdateModuleImpl {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static void restartApp(final ReactApplicationContext mContext, final Promise promise) {
|
||||||
|
UiThreadUtil.runOnUiThread(new Runnable() {
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
try {
|
||||||
|
final Context application = mContext.getApplicationContext();
|
||||||
|
ReactInstanceManager instanceManager = ((ReactApplication) application).getReactNativeHost().getReactInstanceManager();
|
||||||
|
|
||||||
public static void setNeedUpdate(UpdateContext updateContext, ReadableMap options, Promise promise) {
|
instanceManager.recreateReactContextInBackground();
|
||||||
|
promise.resolve(true);
|
||||||
|
|
||||||
|
} catch (Throwable err) {
|
||||||
|
promise.reject("restartApp failed: "+err.getMessage());
|
||||||
|
Log.e("pushy", "restartApp failed", err);
|
||||||
|
|
||||||
|
final Activity currentActivity = mContext.getCurrentActivity();
|
||||||
|
if (currentActivity == null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
currentActivity.runOnUiThread(new Runnable() {
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
currentActivity.recreate();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void setNeedUpdate(final UpdateContext updateContext, final ReadableMap options, final Promise promise) {
|
||||||
final String hash = options.getString("hash");
|
final String hash = options.getString("hash");
|
||||||
UiThreadUtil.runOnUiThread(new Runnable() {
|
UiThreadUtil.runOnUiThread(new Runnable() {
|
||||||
@Override
|
@Override
|
||||||
@@ -193,7 +263,7 @@ public class UpdateModuleImpl {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void markSuccess(UpdateContext updateContext, Promise promise) {
|
public static void markSuccess(final UpdateContext updateContext, final Promise promise) {
|
||||||
UiThreadUtil.runOnUiThread(new Runnable() {
|
UiThreadUtil.runOnUiThread(new Runnable() {
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
@@ -203,7 +273,7 @@ public class UpdateModuleImpl {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void setUuid(UpdateContext updateContext, String uuid, Promise promise) {
|
public static void setUuid(final UpdateContext updateContext, final String uuid, final Promise promise) {
|
||||||
UiThreadUtil.runOnUiThread(new Runnable() {
|
UiThreadUtil.runOnUiThread(new Runnable() {
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
@@ -224,7 +294,7 @@ public class UpdateModuleImpl {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public static void setLocalHashInfo(UpdateContext updateContext, final String hash, final String info, Promise promise) {
|
public static void setLocalHashInfo(final UpdateContext updateContext, final String hash, final String info, final Promise promise) {
|
||||||
UiThreadUtil.runOnUiThread(new Runnable() {
|
UiThreadUtil.runOnUiThread(new Runnable() {
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
@@ -239,7 +309,7 @@ public class UpdateModuleImpl {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void getLocalHashInfo(UpdateContext updateContext, final String hash, Promise promise) {
|
public static void getLocalHashInfo(UpdateContext updateContext, final String hash, final Promise promise) {
|
||||||
String value = updateContext.getKv("hash_" + hash);
|
String value = updateContext.getKv("hash_" + hash);
|
||||||
if (check(value)) {
|
if (check(value)) {
|
||||||
promise.resolve(value);
|
promise.resolve(value);
|
||||||
|
|||||||
10
android/src/main/java/expo/modules/pushy/ExpoPushyModule.kt
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
package expo.modules.pushy
|
||||||
|
|
||||||
|
import expo.modules.kotlin.modules.Module
|
||||||
|
import expo.modules.kotlin.modules.ModuleDefinition
|
||||||
|
|
||||||
|
class ExpoPushyModule : Module() {
|
||||||
|
override fun definition() = ModuleDefinition {
|
||||||
|
Name("ExpoPushy")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
package expo.modules.pushy;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import android.util.Log;
|
||||||
|
import androidx.annotation.Nullable;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import cn.reactnative.modules.update.UpdateContext;
|
||||||
|
import expo.modules.core.interfaces.Package;
|
||||||
|
import expo.modules.core.interfaces.ReactNativeHostHandler;
|
||||||
|
|
||||||
|
public class ExpoPushyPackage implements Package {
|
||||||
|
@Override
|
||||||
|
public List<ReactNativeHostHandler> createReactNativeHostHandlers(Context context) {
|
||||||
|
List<ReactNativeHostHandler> handlers = new ArrayList<>();
|
||||||
|
handlers.add(new ReactNativeHostHandler() {
|
||||||
|
@Nullable
|
||||||
|
@Override
|
||||||
|
public String getJSBundleFile(boolean useDeveloperSupport) {
|
||||||
|
return UpdateContext.getBundleUrl(context);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
return handlers;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -4,6 +4,8 @@ import static androidx.core.content.FileProvider.getUriForFile;
|
|||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.net.Uri;
|
import android.net.Uri;
|
||||||
import android.os.Build;
|
import android.os.Build;
|
||||||
|
import android.os.Handler;
|
||||||
|
import android.os.Looper;
|
||||||
import com.facebook.react.bridge.Promise;
|
import com.facebook.react.bridge.Promise;
|
||||||
import com.facebook.react.bridge.ReactApplicationContext;
|
import com.facebook.react.bridge.ReactApplicationContext;
|
||||||
import com.facebook.react.bridge.ReactContext;
|
import com.facebook.react.bridge.ReactContext;
|
||||||
@@ -17,6 +19,7 @@ import java.util.Map;
|
|||||||
public class UpdateModule extends NativePushySpec {
|
public class UpdateModule extends NativePushySpec {
|
||||||
UpdateContext updateContext;
|
UpdateContext updateContext;
|
||||||
public static ReactApplicationContext mContext;
|
public static ReactApplicationContext mContext;
|
||||||
|
private final Handler handler = new Handler(Looper.getMainLooper());
|
||||||
public UpdateModule(ReactApplicationContext reactContext, UpdateContext updateContext) {
|
public UpdateModule(ReactApplicationContext reactContext, UpdateContext updateContext) {
|
||||||
super(reactContext);
|
super(reactContext);
|
||||||
this.updateContext = updateContext;
|
this.updateContext = updateContext;
|
||||||
@@ -32,18 +35,30 @@ public class UpdateModule extends NativePushySpec {
|
|||||||
final Map<String, Object> constants = new HashMap<>();
|
final Map<String, Object> constants = new HashMap<>();
|
||||||
constants.put("downloadRootDir", updateContext.getRootDir());
|
constants.put("downloadRootDir", updateContext.getRootDir());
|
||||||
constants.put("packageVersion", updateContext.getPackageVersion());
|
constants.put("packageVersion", updateContext.getPackageVersion());
|
||||||
constants.put("currentVersion", updateContext.getCurrentVersion());
|
String currentVersion = updateContext.getCurrentVersion();
|
||||||
|
constants.put("currentVersion", currentVersion);
|
||||||
|
constants.put("currentVersionInfo", updateContext.getKv("hash_" + currentVersion));
|
||||||
constants.put("buildTime", updateContext.getBuildTime());
|
constants.put("buildTime", updateContext.getBuildTime());
|
||||||
constants.put("isUsingBundleUrl", updateContext.getIsUsingBundleUrl());
|
constants.put("isUsingBundleUrl", updateContext.getIsUsingBundleUrl());
|
||||||
boolean isFirstTime = updateContext.isFirstTime();
|
boolean isFirstTime = updateContext.isFirstTime();
|
||||||
constants.put("isFirstTime", isFirstTime);
|
constants.put("isFirstTime", isFirstTime);
|
||||||
if (isFirstTime) {
|
if (isFirstTime) {
|
||||||
updateContext.clearFirstTime();
|
handler.postDelayed(new Runnable() {
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
updateContext.clearFirstTime();
|
||||||
|
}
|
||||||
|
}, 2000);
|
||||||
}
|
}
|
||||||
String rolledBackVersion = updateContext.rolledBackVersion();
|
String rolledBackVersion = updateContext.rolledBackVersion();
|
||||||
constants.put("rolledBackVersion", rolledBackVersion);
|
constants.put("rolledBackVersion", rolledBackVersion);
|
||||||
if (rolledBackVersion != null) {
|
if (rolledBackVersion != null) {
|
||||||
updateContext.clearRollbackMark();
|
handler.postDelayed(new Runnable() {
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
updateContext.clearRollbackMark();
|
||||||
|
}
|
||||||
|
}, 2000);
|
||||||
}
|
}
|
||||||
constants.put("uuid", updateContext.getKv("uuid"));
|
constants.put("uuid", updateContext.getKv("uuid"));
|
||||||
return constants;
|
return constants;
|
||||||
@@ -97,6 +112,11 @@ public class UpdateModule extends NativePushySpec {
|
|||||||
UpdateModuleImpl.reloadUpdate(updateContext, mContext, options,promise);
|
UpdateModuleImpl.reloadUpdate(updateContext, mContext, options,promise);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void restartApp(Promise promise) {
|
||||||
|
UpdateModuleImpl.restartApp(mContext, promise);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setNeedUpdate(ReadableMap options,Promise promise) {
|
public void setNeedUpdate(ReadableMap options,Promise promise) {
|
||||||
UpdateModuleImpl.setNeedUpdate(updateContext, options,promise);
|
UpdateModuleImpl.setNeedUpdate(updateContext, options,promise);
|
||||||
|
|||||||
@@ -20,7 +20,6 @@ import com.facebook.react.bridge.UiThreadUtil;
|
|||||||
import com.facebook.react.bridge.JSBundleLoader;
|
import com.facebook.react.bridge.JSBundleLoader;
|
||||||
import com.facebook.react.bridge.WritableMap;
|
import com.facebook.react.bridge.WritableMap;
|
||||||
import com.facebook.react.modules.core.DeviceEventManagerModule;
|
import com.facebook.react.modules.core.DeviceEventManagerModule;
|
||||||
import com.jakewharton.processphoenix.ProcessPhoenix;
|
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.lang.reflect.Field;
|
import java.lang.reflect.Field;
|
||||||
@@ -49,7 +48,9 @@ public class UpdateModule extends ReactContextBaseJavaModule {
|
|||||||
final Map<String, Object> constants = new HashMap<>();
|
final Map<String, Object> constants = new HashMap<>();
|
||||||
constants.put("downloadRootDir", updateContext.getRootDir());
|
constants.put("downloadRootDir", updateContext.getRootDir());
|
||||||
constants.put("packageVersion", updateContext.getPackageVersion());
|
constants.put("packageVersion", updateContext.getPackageVersion());
|
||||||
constants.put("currentVersion", updateContext.getCurrentVersion());
|
String currentVersion = updateContext.getCurrentVersion();
|
||||||
|
constants.put("currentVersion", currentVersion);
|
||||||
|
constants.put("currentVersionInfo", updateContext.getKv("hash_" + currentVersion));
|
||||||
constants.put("buildTime", updateContext.getBuildTime());
|
constants.put("buildTime", updateContext.getBuildTime());
|
||||||
constants.put("isUsingBundleUrl", updateContext.getIsUsingBundleUrl());
|
constants.put("isUsingBundleUrl", updateContext.getIsUsingBundleUrl());
|
||||||
boolean isFirstTime = updateContext.isFirstTime();
|
boolean isFirstTime = updateContext.isFirstTime();
|
||||||
@@ -224,6 +225,29 @@ public class UpdateModule extends ReactContextBaseJavaModule {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ReactMethod
|
||||||
|
public void restartApp(final Promise promise) {
|
||||||
|
|
||||||
|
UiThreadUtil.runOnUiThread(new Runnable() {
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
try {
|
||||||
|
final Context application = getReactApplicationContext().getApplicationContext();
|
||||||
|
ReactInstanceManager instanceManager = updateContext.getCustomReactInstanceManager();
|
||||||
|
if (instanceManager == null) {
|
||||||
|
instanceManager = ((ReactApplication) application).getReactNativeHost().getReactInstanceManager();
|
||||||
|
}
|
||||||
|
instanceManager.recreateReactContextInBackground();
|
||||||
|
promise.resolve(true);
|
||||||
|
|
||||||
|
} catch (Throwable err) {
|
||||||
|
promise.reject(err);
|
||||||
|
Log.e("pushy", "restartApp failed ", err);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
@ReactMethod
|
@ReactMethod
|
||||||
public void setNeedUpdate(ReadableMap options) {
|
public void setNeedUpdate(ReadableMap options) {
|
||||||
final String hash = options.getString("hash");
|
final String hash = options.getString("hash");
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
["https://pushy-koa-qgbgqmcpis.cn-beijing.fcapp.run", "https://p.reactnative.cn/api"]
|
["https://p.reactnative.cn/api"]
|
||||||
|
|||||||
13
expo-module.config.json
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
{
|
||||||
|
"platforms": ["apple", "android"],
|
||||||
|
"apple": {
|
||||||
|
"modules": ["ExpoPushyModule"],
|
||||||
|
"reactDelegateHandlers": ["ExpoPushyReactDelegateHandler"],
|
||||||
|
"podspecPath":"react-native-update.podspec"
|
||||||
|
},
|
||||||
|
"android": {
|
||||||
|
"modules": [
|
||||||
|
"expo.modules.pushy.ExpoPushyModule"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
{
|
|
||||||
"meta": {
|
|
||||||
"stableOrder": true
|
|
||||||
},
|
|
||||||
"lockfileVersion": 3,
|
|
||||||
"ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",
|
|
||||||
"specifiers": {
|
|
||||||
"@rnoh/react-native-openharmony@0.72.38": "@rnoh/react-native-openharmony@0.72.38"
|
|
||||||
},
|
|
||||||
"packages": {
|
|
||||||
"@rnoh/react-native-openharmony@0.72.38": {
|
|
||||||
"name": "@rnoh/react-native-openharmony",
|
|
||||||
"version": "0.72.38",
|
|
||||||
"integrity": "sha512-br5SIrbB0OarSLirenleE7eTOX1lNccMJ7nb/G7qWTyJ7kW4DalmTXVKYpoT2qaOLls1uEE7McD1OjbZZM9jug==",
|
|
||||||
"resolved": "https://ohpm.openharmony.cn/ohpm/@rnoh/react-native-openharmony/-/react-native-openharmony-0.72.38.har",
|
|
||||||
"registryType": "ohpm"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
{
|
|
||||||
"license": "ISC",
|
|
||||||
"types": "",
|
|
||||||
"devDependencies": {},
|
|
||||||
"name": "pushy",
|
|
||||||
"description": "",
|
|
||||||
"main": "index.ets",
|
|
||||||
"version": "3.1.0-0.0.7",
|
|
||||||
"dependencies": {
|
|
||||||
"@rnoh/react-native-openharmony":"^0.72.38"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
../../../../../harmony/oh_modules/.ohpm/@rnoh+react-native-openharmony@0.72.38/oh_modules/@rnoh/react-native-openharmony
|
|
||||||
39
harmony/pushy/hvigor-plugin.ts
Normal file
@@ -0,0 +1,39 @@
|
|||||||
|
import fs from 'fs';
|
||||||
|
import path from 'path';
|
||||||
|
|
||||||
|
export function reactNativeUpdatePlugin() {
|
||||||
|
return {
|
||||||
|
pluginId: 'reactNativeUpdatePlugin',
|
||||||
|
apply(node) {
|
||||||
|
node.registerTask({
|
||||||
|
name: 'reactNativeUpdatePlugin',
|
||||||
|
run: () => {
|
||||||
|
const cwd = process.cwd();
|
||||||
|
const metaFilePath = path.resolve(
|
||||||
|
cwd,
|
||||||
|
'entry/src/main/resources/rawfile/meta.json',
|
||||||
|
);
|
||||||
|
fs.mkdirSync(path.dirname(metaFilePath), { recursive: true });
|
||||||
|
|
||||||
|
const moduleJsonPath = path.resolve(cwd, 'AppScope/app.json5');
|
||||||
|
let versionName = '';
|
||||||
|
if (fs.existsSync(moduleJsonPath)) {
|
||||||
|
const content = fs.readFileSync(moduleJsonPath, 'utf-8');
|
||||||
|
const match = content.match(
|
||||||
|
/(?:"versionName"|versionName):\s*["']([^"']+)["']/,
|
||||||
|
);
|
||||||
|
versionName = match?.[1] || '';
|
||||||
|
}
|
||||||
|
|
||||||
|
const metaContent = {
|
||||||
|
pushy_build_time: new Date().toISOString(),
|
||||||
|
versionName,
|
||||||
|
};
|
||||||
|
|
||||||
|
fs.writeFileSync(metaFilePath, JSON.stringify(metaContent, null, 2));
|
||||||
|
console.log(`Build time written to ${metaFilePath}`);
|
||||||
|
},
|
||||||
|
});
|
||||||
|
},
|
||||||
|
};
|
||||||
|
}
|
||||||
20
harmony/pushy/oh-package-lock.json5
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
{
|
||||||
|
"meta": {
|
||||||
|
"stableOrder": true,
|
||||||
|
"enableUnifiedLockfile": false
|
||||||
|
},
|
||||||
|
"lockfileVersion": 3,
|
||||||
|
"ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",
|
||||||
|
"specifiers": {
|
||||||
|
"@rnoh/react-native-openharmony@^0.72.96": "@rnoh/react-native-openharmony@0.72.96"
|
||||||
|
},
|
||||||
|
"packages": {
|
||||||
|
"@rnoh/react-native-openharmony@0.72.96": {
|
||||||
|
"name": "",
|
||||||
|
"version": "0.72.96",
|
||||||
|
"integrity": "sha512-gBbm8LLyqi5UE7qHWdZYeQnjyncfEpCczKZUP/9M2U1Z7exR0Kya8PMKMwr1ta5ujy7w/hZVC2LomEV4QvBeqA==",
|
||||||
|
"resolved": "https://ohpm.openharmony.cn/ohpm/@rnoh/react-native-openharmony/-/react-native-openharmony-0.72.96.har",
|
||||||
|
"registryType": "ohpm"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
13
harmony/pushy/oh-package.json5
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
{
|
||||||
|
license: 'MIT',
|
||||||
|
types: '',
|
||||||
|
devDependencies: {},
|
||||||
|
name: 'pushy',
|
||||||
|
description: '',
|
||||||
|
main: 'index.ets',
|
||||||
|
version: '10.35.1',
|
||||||
|
dependencies: {
|
||||||
|
'@rnoh/react-native-openharmony': '^0.72.96',
|
||||||
|
},
|
||||||
|
modelVersion: '5.0.0',
|
||||||
|
}
|
||||||
@@ -1,11 +1,13 @@
|
|||||||
cmake_minimum_required(VERSION 3.13)
|
cmake_minimum_required(VERSION 3.13)
|
||||||
project(rnupdate)
|
project(rnupdate)
|
||||||
|
|
||||||
set(HDIFFPATCH_DIR ${CMAKE_CURRENT_SOURCE_DIR}/HDiffPatch)
|
# Point to android/jni directory for shared source code
|
||||||
set(LZMA_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lzma)
|
set(ANDROID_JNI_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../../../node_modules/react-native-update/android/jni)
|
||||||
|
set(HDIFFPATCH_DIR ${ANDROID_JNI_DIR}/HDiffPatch)
|
||||||
|
set(LZMA_DIR ${ANDROID_JNI_DIR}/lzma)
|
||||||
set(HDP_SOURCES
|
set(HDP_SOURCES
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/pushy.c
|
${CMAKE_CURRENT_SOURCE_DIR}/pushy.c
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/hpatch.c
|
${ANDROID_JNI_DIR}/hpatch.c
|
||||||
${HDIFFPATCH_DIR}/libHDiffPatch/HPatch/patch.c
|
${HDIFFPATCH_DIR}/libHDiffPatch/HPatch/patch.c
|
||||||
${HDIFFPATCH_DIR}/file_for_patch.c
|
${HDIFFPATCH_DIR}/file_for_patch.c
|
||||||
${LZMA_DIR}/C/LzmaDec.c
|
${LZMA_DIR}/C/LzmaDec.c
|
||||||
@@ -20,6 +22,7 @@ add_library(rnupdate SHARED
|
|||||||
|
|
||||||
target_include_directories(rnupdate PRIVATE
|
target_include_directories(rnupdate PRIVATE
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}
|
${CMAKE_CURRENT_SOURCE_DIR}
|
||||||
|
${ANDROID_JNI_DIR}
|
||||||
${HDIFFPATCH_DIR}
|
${HDIFFPATCH_DIR}
|
||||||
${HDIFFPATCH_DIR}/libHDiffPatch/HPatch
|
${HDIFFPATCH_DIR}/libHDiffPatch/HPatch
|
||||||
${LZMA_DIR}/C
|
${LZMA_DIR}/C
|
||||||
@@ -73,7 +73,7 @@ static jsi::Value _hostFunction_PushyTurboModule_downloadPatchFromPpk(
|
|||||||
const jsi::Value* args,
|
const jsi::Value* args,
|
||||||
size_t count)
|
size_t count)
|
||||||
{
|
{
|
||||||
return jsi::Value(static_cast<ArkTSTurboModule &> (turboModule).call(rt,"downloadPatchFromPpk", args, count));
|
return jsi::Value(static_cast<ArkTSTurboModule &> (turboModule).callAsync(rt,"downloadPatchFromPpk", args, count));
|
||||||
}
|
}
|
||||||
|
|
||||||
static jsi::Value _hostFunction_PushyTurboModule_downloadPatchFromPackage(
|
static jsi::Value _hostFunction_PushyTurboModule_downloadPatchFromPackage(
|
||||||
@@ -82,7 +82,7 @@ static jsi::Value _hostFunction_PushyTurboModule_downloadPatchFromPackage(
|
|||||||
const jsi::Value* args,
|
const jsi::Value* args,
|
||||||
size_t count)
|
size_t count)
|
||||||
{
|
{
|
||||||
return jsi::Value(static_cast<ArkTSTurboModule &> (turboModule).call(rt,"downloadPatchFromPackage", args, count));
|
return jsi::Value(static_cast<ArkTSTurboModule &> (turboModule).callAsync(rt,"downloadPatchFromPackage", args, count));
|
||||||
}
|
}
|
||||||
|
|
||||||
static jsi::Value _hostFunction_PushyTurboModule_downloadFullUpdate(
|
static jsi::Value _hostFunction_PushyTurboModule_downloadFullUpdate(
|
||||||
@@ -91,7 +91,7 @@ static jsi::Value _hostFunction_PushyTurboModule_downloadFullUpdate(
|
|||||||
const jsi::Value* args,
|
const jsi::Value* args,
|
||||||
size_t count)
|
size_t count)
|
||||||
{
|
{
|
||||||
return jsi::Value(static_cast<ArkTSTurboModule &> (turboModule).call(rt,"downloadFullUpdate", args, count));
|
return jsi::Value(static_cast<ArkTSTurboModule &> (turboModule).callAsync(rt,"downloadFullUpdate", args, count));
|
||||||
}
|
}
|
||||||
|
|
||||||
static jsi::Value _hostFunction_PushyTurboModule_downloadAndInstallApk(
|
static jsi::Value _hostFunction_PushyTurboModule_downloadAndInstallApk(
|
||||||
@@ -100,7 +100,7 @@ static jsi::Value _hostFunction_PushyTurboModule_downloadAndInstallApk(
|
|||||||
const jsi::Value* args,
|
const jsi::Value* args,
|
||||||
size_t count)
|
size_t count)
|
||||||
{
|
{
|
||||||
return jsi::Value(static_cast<ArkTSTurboModule &> (turboModule).call(rt,"downloadAndInstallApk", args, count));
|
return jsi::Value(static_cast<ArkTSTurboModule &> (turboModule).callAsync(rt,"downloadAndInstallApk", args, count));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||