Skip to content

GitLab

I
ios-ipad学生端
Commit 16aaf3fc authored by zhangkaixuan11's avatar zhangkaixuan11
Browse files
Options

安卓提交适配 图标 外链

parent 2545acdb
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1394 additions and 11914 deletions
.gitignore
View file @ 16aaf3fc
......@@ -57,3 +57,4 @@ buck-out/
# CocoaPods
/ios/Pods/
android/app/release/app-release.apk
Constants.js
View file @ 16aaf3fc
......@@ -6,8 +6,13 @@ import {
} from "./src/netless/fileTypeChange.js"
const designWidth = 1024;
const screenWidth = Dimensions.get('window').height;
const screenHeight = Dimensions.get('window').width;
let screenWidth = Dimensions.get('window').height;
let screenHeight = Dimensions.get('window').width;
const {width,height} = Dimensions.get('screen');
console.log(screenWidth,screenHeight,width,height)
screenWidth = height;
const unitWidth = screenHeight / designWidth;
import {
StyleSheet as RnStyleSheet,
......@@ -360,6 +365,8 @@ export default constantsd;
//状态栏的高度
export function getStatusBarHeight() {
if (Platform.OS === 'android') return StatusBar.currentHeight;
// if (Platform.OS === 'android') return 0;
if (isIphoneX()) {
return 44;
}
......
Static.bundle/index.html
View file @ 16aaf3fc
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=favicon.ico><title>Whiteboard</title><link href=css/app.6d43a2f3.css rel=preload as=style><link href=css/chunk-vendors.a7bbc042.css rel=preload as=style><link href=js/app.8fe45ebf.js rel=preload as=script><link href=js/chunk-vendors.9912874f.js rel=preload as=script><link href=css/chunk-vendors.a7bbc042.css rel=stylesheet><link href=css/app.6d43a2f3.css rel=stylesheet></head><body><noscript><strong>We're sorry but Whiteboard doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=js/chunk-vendors.9912874f.js></script><script src=js/app.8fe45ebf.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=favicon.ico><title>Whiteboard</title><link href=css/app.6d43a2f3.css rel=preload as=style><link href=css/chunk-vendors.a7bbc042.css rel=preload as=style><link href=js/app.17060658.js rel=preload as=script><link href=js/chunk-vendors.9912874f.js rel=preload as=script><link href=css/chunk-vendors.a7bbc042.css rel=stylesheet><link href=css/app.6d43a2f3.css rel=stylesheet></head><body><noscript><strong>We're sorry but Whiteboard doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=js/chunk-vendors.9912874f.js></script><script src=js/app.17060658.js></script></body></html>
\ No newline at end of file
Static.bundle/js/app.17060658.js.map 0 → 100644
View file @ 16aaf3fc
This source diff could not be displayed because it is too large. You can view the blob instead.
Static.bundle/js/app.7f8bb2f3.js deleted 100644 → 0
View file @ 2545acdb
This diff is collapsed.
Static.bundle/js/app.7f8bb2f3.js.map deleted 100644 → 0
View file @ 2545acdb
This source diff could not be displayed because it is too large. You can view the blob instead.
Static.bundle/js/app.8fe45ebf.js.map deleted 100644 → 0
View file @ 2545acdb
This source diff could not be displayed because it is too large. You can view the blob instead.
android/app/build.gradle
View file @ 16aaf3fc
......@@ -39,7 +39,7 @@ import com.android.build.OutputFile
* // bundleInBeta: true,
*
* // whether to disable dev mode in custom build variants (by default only disabled in release)
* // for example: to disable dev mode in the staging build type (if configured)
* // for example: to disable dev mode in+ the staging build type (if configured)
* devDisabledInStaging: true,
* // The configuration property can be in the following formats
* // 'devDisabledIn${productFlavor}${buildType}'
......@@ -121,6 +121,17 @@ def jscFlavor = 'org.webkit:android-jsc:+'
def enableHermes = project.ext.react.get("enableHermes", false);
android {
// packagingOptions {
// pickFirst '**/*.so'
// }
packagingOptions {
pickFirst '**/armeabi-v7a/libc++_shared.so'
pickFirst '**/x86/libc++_shared.so'
pickFirst '**/arm64-v8a/libc++_shared.so'
pickFirst '**/x86_64/libc++_shared.so'
pickFirst '**/x86/libjsc.so'
pickFirst '**/armeabi-v7a/libjsc.so'
}
compileSdkVersion rootProject.ext.compileSdkVersion
compileOptions {
......@@ -129,6 +140,17 @@ android {
}
defaultConfig {
configurations.all {
resolutionStrategy {
force 'androidx.appcompat:appcompat:1.2.0'
force 'androidx.appcompat:appcompat-resources:1.2.0'
force 'androidx.core:core-ktx:1.3.0'
force 'androidx.core:core:1.3.0'
force "com.facebook.soloader:soloader:0.9.0"
force "androidx.tracing:tracing:1.0.0"
}
}
applicationId "com.fenghua_student_client"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
......@@ -197,16 +219,28 @@ android {
}
dependencies {
// def appcompat_version = "1.3.1"
// implementation "androidx.appcompat:appcompat:$appcompat_version"
//// // For loading and tinting drawables on older versions of the platform
// implementation "androidx.appcompat:appcompat-resources:$appcompat_version"
// implementation "androidx.tracing:tracing:1.0.0"
// implementation "androidx.core:core-ktx:1.6.0"
// implementation 'com.android.support:support-compat:+'
// implementation 'com.android.support:appcompat-v7:+'
// implementation 'com.android.support:support-v4:26.1.0'
implementation fileTree(dir: "libs", include: ["*.jar"])
// 数字请根据最新版自行添加
implementation 'com.github.netless-io:whiteboard-android:2.15.6'
//noinspection GradleDynamicVersion
implementation "com.facebook.react:react-native:+" // From node_modules
implementation "com.facebook.react:react-native:0.64.0" // From node_modules
implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
// implementation 'androidx.appcompat:appcompat:1.1.0'
implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
implementation project(':react-native-splash-screen')
implementation 'com.github.yalantis:ucrop:2.2.2-native'
debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
......
android/app/src/main/assets/Static.bundle/index.html
View file @ 16aaf3fc
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=favicon.ico><title>Whiteboard</title><link href=css/app.6d43a2f3.css rel=preload as=style><link href=css/chunk-vendors.a7bbc042.css rel=preload as=style><link href=js/app.8fe45ebf.js rel=preload as=script><link href=js/chunk-vendors.9912874f.js rel=preload as=script><link href=css/chunk-vendors.a7bbc042.css rel=stylesheet><link href=css/app.6d43a2f3.css rel=stylesheet></head><body><noscript><strong>We're sorry but Whiteboard doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=js/chunk-vendors.9912874f.js></script><script src=js/app.8fe45ebf.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=favicon.ico><title>Whiteboard</title><link href=css/app.6d43a2f3.css rel=preload as=style><link href=css/chunk-vendors.a7bbc042.css rel=preload as=style><link href=js/app.17060658.js rel=preload as=script><link href=js/chunk-vendors.9912874f.js rel=preload as=script><link href=css/chunk-vendors.a7bbc042.css rel=stylesheet><link href=css/app.6d43a2f3.css rel=stylesheet></head><body><noscript><strong>We're sorry but Whiteboard doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=js/chunk-vendors.9912874f.js></script><script src=js/app.17060658.js></script></body></html>
\ No newline at end of file
android/app/src/main/assets/Static.bundle/js/app.17060658.js.map 0 → 100644
View file @ 16aaf3fc
This source diff could not be displayed because it is too large. You can view the blob instead.
android/app/src/main/assets/Static.bundle/js/app.7f8bb2f3.js.map deleted 100644 → 0
View file @ 2545acdb
This source diff could not be displayed because it is too large. You can view the blob instead.
android/app/src/main/assets/Static.bundle/js/app.8fe45ebf.js.map deleted 100644 → 0
View file @ 2545acdb
This source diff could not be displayed because it is too large. You can view the blob instead.
android/app/src/main/java/com/fenghua_student_client/MainActivity.java
View file @ 16aaf3fc
......@@ -2,9 +2,11 @@ package com.fenghua_student_client;
import android.app.Activity;
import android.content.pm.PackageManager;
import android.os.Build;
import android.os.Bundle;
import android.view.View;
import androidx.core.app.ActivityCompat;
import org.devio.rn.splashscreen.SplashScreen;
import com.facebook.react.ReactActivity;
......@@ -34,10 +36,28 @@ public class MainActivity extends ReactActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
SplashScreen.show(this);
super.onCreate(savedInstanceState);
hideBottomUIMenu();
// 申请权限
verifyStoragePermissions(this);
}
/**
* Hide virtual buttons, and full-screen
*/
protected void hideBottomUIMenu() {
//hide virtual buttons, and full-screen
if (Build.VERSION.SDK_INT > 11 && Build.VERSION.SDK_INT < 19) {//lower api
View v = this.getWindow().getDecorView();
v.setSystemUiVisibility(View.GONE);
} else if (Build.VERSION.SDK_INT >= 19) {
//for new api versions.
View decorView = getWindow().getDecorView();
int uiOptions = View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
| View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY | View.SYSTEM_UI_FLAG_FULLSCREEN;
decorView.setSystemUiVisibility(uiOptions);
}
}
/**
* Returns the name of the main component registered from JavaScript. This is used to schedule
......
android/app/src/main/res/layout/launch_screen.xml 0 → 100644
View file @ 16aaf3fc
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:src="@drawable/_launch" />
</LinearLayout>
\ No newline at end of file
android/app/src/main/res/values/styles.xml
View file @ 16aaf3fc
......@@ -4,6 +4,8 @@
<style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
<!-- Customize your theme here. -->
<item name="android:textColor">#000000</item>
<item name="android:navigationBarColor">#00000000</item>
<item name="android:windowIsTranslucent">true</item>
</style>
</resources>
android/build.gradle
View file @ 16aaf3fc
......@@ -6,6 +6,7 @@ buildscript {
minSdkVersion = 21
compileSdkVersion = 29
targetSdkVersion = 29
kotlinVersion = "1.6.0"
ndkVersion = "20.1.5948944"
}
repositories {
......@@ -26,6 +27,7 @@ buildscript {
allprojects {
repositories {
mavenLocal()
maven {
// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
......
css/Live.css.ts
View file @ 16aaf3fc
......@@ -48,11 +48,14 @@ let LiveCSS = StyleSheet.create({
fontSize: Constants.baseFontSize * 1.2
},
myVideoWrapper: {
width: Constants.unitWidth * 150,
height: Constants.unitWidth * 86,
// width: Constants.unitWidth * 150,
// height: Constants.unitWidth * 86,
// width:Constants.height / 9,
height:'100%',
marginLeft: Constants.unitWidth * 10,
marginRight: Constants.unitWidth * 10,
backgroundColor: 'rgba(0, 0, 0, 0.4)'
backgroundColor: 'rgba(0, 0, 0, 0.4)',
// resizeMode: "cover",
},
frameWrapper: {
width: Constants.unitWidth * 1536,
......@@ -180,12 +183,17 @@ let LiveCSS = StyleSheet.create({
videoBg: {
width: Constants.unitWidth * 50,
height: Constants.unitWidth * 50,
marginTop: Constants.unitWidth * 18,
marginLeft: Constants.unitWidth * 50,
left:'50%',
top:'50%',
marginTop: Constants.unitWidth * -25,
marginLeft: Constants.unitWidth * -25,
// resizeMode: "cover",
},
videoInfoWrapper: {
flexDirection: 'row',
width: Constants.unitWidth * 150,
// width: Constants.unitWidth * 150,
width:'100%',
height: Constants.unitWidth * 17,
backgroundColor: 'rgba(0, 0, 0, 0.5)',
position: 'absolute',
......@@ -218,15 +226,18 @@ let LiveCSS = StyleSheet.create({
marginRight: Constants.unitWidth * 5
},
headerRow: {
height: Constants.unitWidth * 40,
height: Constants.unitWidth * 28,
backgroundColor: '#0E5C4A',
flexDirection: 'row',
alignItems: 'center',
position:'relative'
},
headerRowLeft: {
height: Constants.unitWidth * 40,
height: Constants.unitWidth * 28,
flexDirection: 'row',
alignItems: 'center',
position:'absolute',
left:1,
},
leftTriangle: {
width: Constants.unitWidth * 20,
......
ios/fenghua_student_client/Info.plist
View file @ 16aaf3fc
......@@ -5,7 +5,7 @@
<key>CFBundleDevelopmentRegion</key>
<string>zh_CN</string>
<key>CFBundleDisplayName</key>
<string>枫华教育</string>
<string>枫华学生端</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
......
package-lock.json deleted 100644 → 0
View file @ 2545acdb
This diff is collapsed.
src/components/Like.tsx
View file @ 16aaf3fc
......@@ -6,7 +6,7 @@ import Sound from 'react-native-sound';
Sound.setCategory('Playback');
const _centerX = Constants.height * 0.5;
const _centerY = (Constants.width - Constants.statusBarHeight - Constants.unitWidth * 124) * 0.5 ;
const _centerY = (Constants.width - Constants.statusBarHeight ) * 0.5 ;
const _width = Constants.unitWidth * 375;
const _height = Constants.unitWidth * 375;
const _widthAnim = new Animated.Value(Constants.unitWidth * 0);
......
src/components/Login.tsx
View file @ 16aaf3fc
......@@ -276,10 +276,11 @@ export default class Login extends Component {
<View style={{
zIndex: 1000
}}>
<StatusBar
{/* <StatusBar
translucent={true}
hidden={true}
barStyle="dark-content"
/>
/> */}
<KeyboardAwareScrollView
scrollEventThrottle={200} showsVerticalScrollIndicator={false}
>
......@@ -329,7 +330,7 @@ export default class Login extends Component {
</View>
{/* <Image source={require('../../images/common/jiantouba.png')} style={LoginCSS.jiantou}/> */}
<TextInput maxLength={11} allowFontScaling={false}
placeholderTextColor="#919191" placeholder="请输入学号"
placeholderTextColor="#919191" placeholder="请输入学号v0.3.1"
style={LoginCSS.mobile} onChangeText={(text) => {
this.setState({
mobile: text
......
src/live/Index.tsx
View file @ 16aaf3fc
This diff is collapsed.
yarn.lock
View file @ 16aaf3fc
......@@ -1250,7 +1250,7 @@
hermes-profile-transformer "^0.0.6"
ip "^1.1.5"
"@react-native-community/cli-platform-android@^5.0.1", "@react-native-community/cli-platform-android@^5.0.1-alpha.0":
"@react-native-community/cli-platform-android@^5.0.1", "@react-native-community/cli-platform-android@^5.0.1-alpha.1":
version "5.0.1"
resolved "https://registry.npmmirror.com/@react-native-community/cli-platform-android/download/@react-native-community/cli-platform-android-5.0.1.tgz#7f761e1818e5a099877ec59a1b739553fd6a6905"
integrity sha1-f3YeGBjloJmHfsWaG3OVU/1qaQU=
......@@ -1266,10 +1266,10 @@
slash "^3.0.0"
xmldoc "^1.1.2"
"@react-native-community/cli-platform-ios@^5.0.1-alpha.0":
"@react-native-community/cli-platform-ios@^5.0.1-alpha.1":
version "5.0.2"
resolved "https://registry.npmmirror.com/@react-native-community/cli-platform-ios/download/@react-native-community/cli-platform-ios-5.0.2.tgz#62485534053c0dad28a67de188248de177f4b0fb"
integrity sha1-YkhVNAU8Da0opn3hiCSN4Xf0sPs=
resolved "https://registry.npmmirror.com/@react-native-community/cli-platform-ios/-/cli-platform-ios-5.0.2.tgz#62485534053c0dad28a67de188248de177f4b0fb"
integrity sha512-IAJ2B3j2BTsQUJZ4R6cVvnTbPq0Vza7+dOgP81ISz2BKRtQ0VqNFv+VOALH2jLaDzf4t7NFlskzIXFqWqy2BLg==
dependencies:
"@react-native-community/cli-tools" "^5.0.1"
chalk "^3.0.0"
......@@ -1313,10 +1313,10 @@
dependencies:
ora "^3.4.0"
"@react-native-community/cli@^5.0.1-alpha.0":
"@react-native-community/cli@^5.0.1-alpha.1":
version "5.0.1"
resolved "https://registry.npmmirror.com/@react-native-community/cli/download/@react-native-community/cli-5.0.1.tgz#1f7a66d813d5daf102e593f3c550650fa0cc8314"
integrity sha1-H3pm2BPV2vEC5ZPzxVBlD6DMgxQ=
resolved "https://registry.npmmirror.com/@react-native-community/cli/-/cli-5.0.1.tgz#1f7a66d813d5daf102e593f3c550650fa0cc8314"
integrity sha512-9VzSYUYSEqxEH5Ib2UNSdn2eyPiYZ4T7Y79o9DKtRBuSaUIwbCUdZtIm+UUjBpLS1XYBkW26FqL8/UdZDmQvXw==
dependencies:
"@react-native-community/cli-debugger-ui" "^5.0.1"
"@react-native-community/cli-hermes" "^5.0.1"
......@@ -1385,11 +1385,6 @@
resolved "https://registry.npm.taobao.org/@react-native-community/masked-view/download/@react-native-community/masked-view-0.1.10.tgz#5dda643e19e587793bc2034dd9bf7398ad43d401"
integrity sha1-XdpkPhnlh3k7wgNN2b9zmK1D1AE=
"@react-native-picker/picker@^1.16.1":
version "1.16.1"
resolved "https://registry.nlark.com/@react-native-picker/picker/download/@react-native-picker/picker-1.16.1.tgz?cache=0&sync_timestamp=1621678051637&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40react-native-picker%2Fpicker%2Fdownload%2F%40react-native-picker%2Fpicker-1.16.1.tgz#cc5d05b0d651445afa519c67824d8af3e43fa10c"
integrity sha1-zF0FsNZRRFr6UZxngk2K8+Q/oQw=
"@react-native/assets@1.0.0":
version "1.0.0"
resolved "https://registry.npm.taobao.org/@react-native/assets/download/@react-native/assets-1.0.0.tgz#c6f9bf63d274bafc8e970628de24986b30a55c8e"
......@@ -6151,10 +6146,10 @@ react-native-device-info@^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==
react-native-document-picker@8.1.0:
version "8.1.0"
resolved "https://registry.npmmirror.com/react-native-document-picker/-/react-native-document-picker-8.1.0.tgz#e167a98b6fcdd1aee08597793029101d674eab83"
integrity sha512-FdaehvEoqkVkMTkIy09wpgHUHh9SskI1k8ug8Dwkwk7MJ+XxzrphAk/mXZtu5RkM1Iwxmd82QfwiQJxrZ2LSVg==
dependencies:
invariant "^2.2.4"
......@@ -6463,15 +6458,15 @@ react-native-wheel-picker@^1.2.0:
resolved "https://registry.nlark.com/react-native-wheel-picker/download/react-native-wheel-picker-1.2.0.tgz#0503e37b3326856724501679bdf5697e0dd247a6"
integrity sha1-BQPjezMmhWckUBZ5vfVpfg3SR6Y=
react-native@0.64.0:
version "0.64.0"
resolved "https://registry.npmmirror.com/react-native/download/react-native-0.64.0.tgz#c3bde5b638bf8bcf12bae6e094930d39cb942ab7"
integrity sha1-w73ltji/i88SuubglJMNOcuUKrc=
react-native@0.64.4:
version "0.64.4"
resolved "https://registry.npmmirror.com/react-native/-/react-native-0.64.4.tgz#f9870f6951378421881cc66f6b5a6451bef7254d"
integrity sha512-nxYt/NrTmGyW6+tOd+Hqp4O8uJ2LLZkN7ispMPDprAq7bwvLkF/GXmDQCZHAEyqXuhIztTtMX41KqFQ6UMCUJQ==
dependencies:
"@jest/create-cache-key-function" "^26.5.0"
"@react-native-community/cli" "^5.0.1-alpha.0"
"@react-native-community/cli-platform-android" "^5.0.1-alpha.0"
"@react-native-community/cli-platform-ios" "^5.0.1-alpha.0"
"@react-native-community/cli" "^5.0.1-alpha.1"
"@react-native-community/cli-platform-android" "^5.0.1-alpha.1"
"@react-native-community/cli-platform-ios" "^5.0.1-alpha.1"
"@react-native/assets" "1.0.0"
"@react-native/normalize-color" "1.0.0"
"@react-native/polyfills" "1.0.0"
......
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