Skip to content

GitLab

I
ios-ipad学生端
Commit 2545acdb authored by 张凯旋's avatar 张凯旋
Browse files
Options

iOS

parent ba8dc9df
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 675 additions and 388 deletions
App.tsx
View file @ 2545acdb
......@@ -200,12 +200,15 @@ export default class App extends Component {
// setTimeout(this.getMemberInfo, 2000);
IdleTimerManager.setIdleTimerDisabled(true);
// this.checkUserInfo();
setTimeout(e=>{
SplashScreen.hide();
},300)
DeviceEventEmitter.addListener('showLogin', (data) => {
this.setState(data);
})
}
checkUserInfo = () => {
checkUserInfo = () => {
if (this.checkTimer) {
clearTimeout(this.checkTimer);
}
......@@ -268,7 +271,10 @@ export default class App extends Component {
}
}
if (!this.state.inited) {
console.log(this.state.inited,'his.state.inited')
setTimeout(() => {
console.log(this.state.inited,'this.state.inited')
SplashScreen.hide();
DeviceEventEmitter.emit('inited', {
});
......@@ -304,7 +310,7 @@ export default class App extends Component {
name="Login"
component={Login}
options={{ headerShown: false }}
/>
/>
<Root.Screen
name="HomeIndex"
component={HomeIndex}
......
ios/Podfile
View file @ 2545acdb
require_relative '../node_modules/react-native/scripts/react_native_pods'
require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
platform :ios, '10.0'
platform :ios, '11.0'
target 'fenghua_student_client' do
config = use_native_modules!
......@@ -12,7 +12,7 @@ target 'fenghua_student_client' do
pod 'agora-react-native-rtm', :path => '../node_modules/agora-react-native-rtm'
#pod 'BVLinearGradient', :path => '../node_modules/react-native-linear-gradient'
pod 'BVLinearGradient', :path => '../node_modules/react-native-linear-gradient'
pod 'Picker', :path => '../node_modules/react-native-picker'
......@@ -50,13 +50,14 @@ target 'fenghua_student_client' do
#
# Note that if you have use_frameworks! enabled, Flipper will not work and
# you should disable these next few lines.
use_flipper!
post_install do |installer|
flipper_post_install(installer)
end
# use_flipper!({ 'Flipper-Folly' => '2.5' })
# post_install do |installer|
# flipper_post_install(installer)
# end
pod 'AgoraRtm_iOS'
pod 'Whiteboard'
pod 'Whiteboard','2.15.28'
pod 'SDWebImage', '5.12.6'
#pod 'iOSPhotoEditor'
end
......
ios/Podfile.lock 100755 → 100644
View file @ 2545acdb
This diff is collapsed.
ios/RCTTICCoreManager.m
View file @ 2545acdb
......@@ -58,7 +58,7 @@
- (void) joinRoom: (NSString *)roomUuid roomToken:(NSString *)roomToken{
// 加入房间
dispatch_sync(dispatch_get_main_queue(), ^{
WhiteRoomConfig *roomConfig = [[WhiteRoomConfig alloc] initWithUuid:roomUuid roomToken:roomToken];
WhiteRoomConfig *roomConfig = [[WhiteRoomConfig alloc] initWithUUID:roomUuid roomToken:roomToken uid:roomUuid];
[self.sdk joinRoomWithConfig:roomConfig callbacks:self completionHandler:^(BOOL success, WhiteRoom * _Nonnull room, NSError * _Nonnull error) {
......
ios/TestViewManager.m
View file @ 2545acdb
......@@ -57,7 +57,7 @@ RCT_EXPORT_VIEW_PROPERTY(props1, NSString)
// NSLog(@"zhuang %@, %@, %@", uuid, roomToken, [testView props1]);
// }];
WhiteRoomConfig *roomConfig = [[WhiteRoomConfig alloc] initWithUuid:@"b24e2f0067b211ebb39f5da8a8ac664c" roomToken:@"NETLESSROOM_YWs9alJ0N1kxRTFIUzNDNVZuTCZub25jZT0xNjEyNTMwMjc2MjE3MDAmcm9sZT0wJnNpZz1kYzcyYjgxNjk1MTgzNWMwMWUxODU1MDdmMTkzN2U1ODEwYTM5YzA3YzJlNWFhYzM3ZDY2MjM5YjM1OGY5MTdmJnV1aWQ9YjI0ZTJmMDA2N2IyMTFlYmIzOWY1ZGE4YThhYzY2NGM"];
WhiteRoomConfig *roomConfig = [[WhiteRoomConfig alloc] initWithUUID:@"b24e2f0067b211ebb39f5da8a8ac664c" roomToken:@"NETLESSROOM_YWs9alJ0N1kxRTFIUzNDNVZuTCZub25jZT0xNjEyNTMwMjc2MjE3MDAmcm9sZT0wJnNpZz1kYzcyYjgxNjk1MTgzNWMwMWUxODU1MDdmMTkzN2U1ODEwYTM5YzA3YzJlNWFhYzM3ZDY2MjM5YjM1OGY5MTdmJnV1aWQ9YjI0ZTJmMDA2N2IyMTFlYmIzOWY1ZGE4YThhYzY2NGM" uid:@"wewewewew"];
// []
......
ios/WhiteUtils.m
View file @ 2545acdb
......@@ -10,7 +10,7 @@
@implementation WhiteUtils
static NSString *APIHost = @"https://shunt-api.netless.link/v5/";
static NSString *APIHost = @"https://shunt-api.netless.link/v5/";
/** FIXME: 此处 tonken 只做 demo 试用。
实际使用时，请在 https://console.netless.link 注册并获取 sdk token
......
package.json
View file @ 2545acdb
......@@ -8,7 +8,8 @@
"start": "react-native start",
"test": "jest",
"lint": "eslint .",
"a-build": "react-native bundle --entry-file index.js --bundle-output ./android/app/src/main/assets/index.android.bundle --platform android --assets-dest ./android/app/src/main/res/ --dev false"
"a-build": "react-native bundle --entry-file index.js --bundle-output ./android/app/src/main/assets/index.android.bundle --platform android --assets-dest ./android/app/src/main/res/ --dev false",
"i-build": "react-native bundle --entry-file index.js --platform ios --dev false --bundle-output ./ios/bundle/main.jsbundle"
},
"dependencies": {
"@react-native-async-storage/async-storage": "^1.13.4",
......
src/components/Login.tsx
View file @ 2545acdb
......@@ -328,7 +328,7 @@ export default class Login extends Component {
<Text allowFontScaling={false} style={LoginCSS.areaNo}>学号</Text>
</View>
{/* <Image source={require('../../images/common/jiantouba.png')} style={LoginCSS.jiantou}/> */}
<TextInput maxLength={11} allowFontScaling={false} keyboardType="phone-pad"
<TextInput maxLength={11} allowFontScaling={false}
placeholderTextColor="#919191" placeholder="请输入学号"
style={LoginCSS.mobile} onChangeText={(text) => {
this.setState({
......
src/live/Index.tsx
View file @ 2545acdb
......@@ -235,6 +235,11 @@ export default class Index extends Component<Props, State, HomeState, AppContext
}
requestCameraAndAudioPermission = async () => {
this.setState({
permissionsAndroid: true
});
this.startCall();
return;
try {
const granted = await PermissionsAndroid.requestMultiple([
PermissionsAndroid.PERMISSIONS.CAMERA,
......@@ -259,7 +264,7 @@ export default class Index extends Component<Props, State, HomeState, AppContext
}
componentDidMount() {
StatusBar.setBarStyle('light-content');
StatusBar.setBarStyle('light-content');
// console.log(DeviceInfo)
// const model = DeviceInfo.getModel()
// alert(model)
......@@ -517,6 +522,7 @@ export default class Index extends Component<Props, State, HomeState, AppContext
// };
WhiteBoardEngine.leaveRoom().then((e) => {
WhiteBoardEngine.removeAllListener()
// console.log('leave room ok', e);
// WhiteBoardEngine.unInitEngine().then(() => {});
});
......@@ -609,11 +615,11 @@ export default class Index extends Component<Props, State, HomeState, AppContext
this._engine.addListener('Warning', (warn) => {
console.log('Warning', warn);
console.error('Warning', warn);
});
this._engine.addListener('Error', (err) => {
console.log('Error2222', err);
console.error('Error2222', err);
});
this._engine.addListener('LocalAudioStateChanged', (err) => {
......
yarn.lock
View file @ 2545acdb
......@@ -2044,15 +2044,15 @@ balanced-match@^1.0.0:
resolved "https://registry.npm.taobao.org/balanced-match/download/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
base-64@^0.1.0:
base-64@0.1.0, base-64@^0.1.0:
version "0.1.0"
resolved "https://registry.npm.taobao.org/base-64/download/base-64-0.1.0.tgz#780a99c84e7d600260361511c4877613bf24f6bb"
integrity sha1-eAqZyE59YAJgNhURxId2E78k9rs=
resolved "https://registry.npmmirror.com/base-64/-/base-64-0.1.0.tgz#780a99c84e7d600260361511c4877613bf24f6bb"
integrity sha512-Y5gU45svrR5tI2Vt/X9GPd3L0HNIKzGu202EjxrXMpuc2V2CiKgemAbUUsqYmZJvPtCXoUKjNZwBJzsNScUbXA==
base64-js@^1.1.2, base64-js@^1.2.3:
base64-js@^1.1.2, base64-js@^1.2.3, base64-js@^1.3.1:
version "1.5.1"
resolved "https://registry.npm.taobao.org/base64-js/download/base64-js-1.5.1.tgz?cache=0&sync_timestamp=1605123644489&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbase64-js%2Fdownload%2Fbase64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
integrity sha1-GxtEAWClv3rUC2UPCVljSBkDkwo=
resolved "https://registry.npmmirror.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
base@^0.11.1:
version "0.11.2"
......@@ -2164,6 +2164,14 @@ buffer-from@^1.0.0:
resolved "https://registry.npm.taobao.org/buffer-from/download/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
integrity sha1-MnE7wCj3XAL9txDXx7zsHyxgcO8=
buffer@^6.0.3:
version "6.0.3"
resolved "https://registry.npmmirror.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6"
integrity sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==
dependencies:
base64-js "^1.3.1"
ieee754 "^1.2.1"
bytes@3.0.0:
version "3.0.0"
resolved "https://registry.npm.taobao.org/bytes/download/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
......@@ -3554,6 +3562,18 @@ glob-parent@^5.0.0:
dependencies:
is-glob "^4.0.1"
glob@7.0.6:
version "7.0.6"
resolved "https://registry.npmmirror.com/glob/-/glob-7.0.6.tgz#211bafaf49e525b8cd93260d14ab136152b3f57a"
integrity sha512-f8c0rE8JiCxpa52kWPAOa3ZaYEnzofDzCQLCn3Vdk0Z5OVLq3BsRFJI4S4ykpeVW6QMGBUkMeUpoEgWnMTnw5Q==
dependencies:
fs.realpath "^1.0.0"
inflight "^1.0.4"
inherits "2"
minimatch "^3.0.2"
once "^1.3.0"
path-is-absolute "^1.0.0"
glob@^7.0.0:
version "7.2.0"
resolved "https://registry.npmmirror.com/glob/download/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
......@@ -3741,6 +3761,11 @@ iconv-lite@^0.6.2:
dependencies:
safer-buffer ">= 2.1.2 < 3.0.0"
ieee754@^1.2.1:
version "1.2.1"
resolved "https://registry.npmmirror.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
ignore@^4.0.6:
version "4.0.6"
resolved "https://registry.npm.taobao.org/ignore/download/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
......@@ -6080,6 +6105,11 @@ react-native-animatable@1.3.3:
dependencies:
prop-types "^15.7.2"
react-native-audio@^4.3.0:
version "4.3.0"
resolved "https://registry.npmmirror.com/react-native-audio/-/react-native-audio-4.3.0.tgz#fae22b81f6a4dda706fd4837d0c6a89c66cf2e7e"
integrity sha512-QQYq28eSJy+y/Ukvry0AkbwMVELAj+LcEwCVRH+7sKLqlnoBBxGd4ilhgJHjwOiC70192LueGbjXJjPPEwW3iA==
react-native-awesome-alerts@^1.5.1:
version "1.5.1"
resolved "https://registry.nlark.com/react-native-awesome-alerts/download/react-native-awesome-alerts-1.5.1.tgz#77b66969a5562bc4cc3fc2d8c502d16482acd4be"
......@@ -6116,6 +6146,18 @@ react-native-codegen@^0.0.6:
jscodeshift "^0.11.0"
nullthrows "^1.1.1"
react-native-device-info@^9.0.2:
version "9.0.2"
resolved "https://registry.npmmirror.com/react-native-device-info/-/react-native-device-info-9.0.2.tgz#00c7ab139a620ac9650852cd0ef0fb69d9a4418d"
integrity sha512-+IfYZ/OuKjnFf7SFfgIzEqynSeFngrIHc5KgHUIfXusLDXIFJ+LhRBCD7skqnraHrfmESUOMjLbNcvy4SVdwSA==
react-native-document-picker@^8.1.0:
version "8.1.2"
resolved "https://registry.npmmirror.com/react-native-document-picker/-/react-native-document-picker-8.1.2.tgz#503cce26086020c833f08a405fe2da28f735ed08"
integrity sha512-R126YsjTXBuvigRRExyAQ+yn1UGV4dGcMI9x4UAY8TBTSOt6nOQcWS/AQcbzjk9MnN8ISDGqNq9GmN51Q1aHjA==
dependencies:
invariant "^2.2.4"
react-native-draggable@^3.3.0:
version "3.3.0"
resolved "https://registry.npm.taobao.org/react-native-draggable/download/react-native-draggable-3.3.0.tgz#6f07c3ad4cff018bf0455fc48dbfe5f0af9b72cd"
......@@ -6135,6 +6177,14 @@ react-native-fast-image@^8.3.4:
resolved "https://registry.npm.taobao.org/react-native-fast-image/download/react-native-fast-image-8.3.4.tgz#79edca177e30311b19d59ff335625bcbe22650d7"
integrity sha1-ee3KF34wMRsZ1Z/zNWJby+ImUNc=
react-native-fetch-blob@^0.10.8:
version "0.10.8"
resolved "https://registry.npmmirror.com/react-native-fetch-blob/-/react-native-fetch-blob-0.10.8.tgz#4fc256abae0cb5f10e7c41f28c11b3ff330d72a9"
integrity sha512-+zE/VjBO9HTjqNXL1KgtgS3ZTH8CNuxg9rJDml+GsO1UbIe4EgdRiCy/sIV9X8lVYimKfep8iJsVMTsjJvQHmA==
dependencies:
base-64 "0.1.0"
glob "7.0.6"
react-native-fs@^2.16.6:
version "2.16.6"
resolved "https://registry.npm.taobao.org/react-native-fs/download/react-native-fs-2.16.6.tgz#2901789a43210a35a0ef0a098019bbef3af395fd"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment