android running bug fixed

master
hamed 3 years ago
parent 333d31e343
commit f72eacfa95
  1. 2
      App.js
  2. 5
      android/app/build.gradle
  3. 0
      android/gradlew
  4. 16
      ios/Podfile.lock
  5. 4
      ios/RnDanovin.xcodeproj/project.pbxproj
  6. 12888
      package-lock.json
  7. 2
      package.json
  8. 42
      src/components/Video.js
  9. 2
      src/screens/Home/components/Header.js
  10. 2
      src/screens/Otp/index.js
  11. 2
      src/services/api/utils.js

@ -13,7 +13,7 @@ import { applyMiddleware, createStore, compose } from 'redux';
import { createLogger } from 'redux-logger'; import { createLogger } from 'redux-logger';
import thunk from 'redux-thunk'; import thunk from 'redux-thunk';
import { persistStore, persistReducer } from 'redux-persist'; import { persistStore, persistReducer } from 'redux-persist';
import AsyncStorage from '@react-native-community/async-storage'; import AsyncStorage from '@react-native-async-storage/async-storage';
import autoMergeLevel2 from 'redux-persist/lib/stateReconciler/autoMergeLevel2'; import autoMergeLevel2 from 'redux-persist/lib/stateReconciler/autoMergeLevel2';
import allReducers from './src/reducers'; import allReducers from './src/reducers';
import Navigator from './navigation'; import Navigator from './navigation';

@ -133,7 +133,7 @@ android {
defaultConfig { defaultConfig {
applicationId "com.rndanovin" applicationId "com.rndanovin"
minSdkVersion 21 minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
@ -192,8 +192,6 @@ android {
} }
dependencies { dependencies {
implementation 'androidx.multidex:multidex:2.0.1'
implementation fileTree(dir: "libs", include: ["*.jar"]) implementation fileTree(dir: "libs", include: ["*.jar"])
//noinspection GradleDynamicVersion //noinspection GradleDynamicVersion
implementation "com.facebook.react:react-native:+" // From node_modules implementation "com.facebook.react:react-native:+" // From node_modules
@ -220,6 +218,7 @@ dependencies {
} else { } else {
implementation jscFlavor implementation jscFlavor
} }
implementation 'androidx.multidex:multidex:2.0.1'
} }
// Run this once to be able to run the application with BUCK // Run this once to be able to run the application with BUCK

@ -567,7 +567,7 @@ SPEC CHECKSUMS:
glog: 5337263514dd6f09803962437687240c5dc39aa4 glog: 5337263514dd6f09803962437687240c5dc39aa4
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b
Permission-Camera: 0db4fd6e1c556c1cf47f38b989a8084cea3ec3dd Permission-Camera: 1f383e3f9a38ba393c63ba9b09a4726f94eda769
RCT-Folly: a21c126816d8025b547704b777a2ba552f3d9fa9 RCT-Folly: a21c126816d8025b547704b777a2ba552f3d9fa9
RCTRequired: e4a18a90004e0ed97bba9081099104fd0f658dc9 RCTRequired: e4a18a90004e0ed97bba9081099104fd0f658dc9
RCTTypeSafety: 8a3c31d38de58e1a6a7df6e4e643644a60b00e22 RCTTypeSafety: 8a3c31d38de58e1a6a7df6e4e643644a60b00e22
@ -580,10 +580,10 @@ SPEC CHECKSUMS:
React-jsiexecutor: 6a05173dc0142abc582bd4edd2d23146b8cc218a React-jsiexecutor: 6a05173dc0142abc582bd4edd2d23146b8cc218a
React-jsinspector: be95ad424ba9f7b817aff22732eb9b1b810a000a React-jsinspector: be95ad424ba9f7b817aff22732eb9b1b810a000a
React-logger: 9a9cd87d4ea681ae929b32ef580638ff1b50fb24 React-logger: 9a9cd87d4ea681ae929b32ef580638ff1b50fb24
react-native-camera: 3eae183c1d111103963f3dd913b65d01aef8110f react-native-camera: 210a872c84d3aa0982a9223047ef9e743ed694fa
react-native-restart: 733a51ad137f15b0f8dc34c4082e55af7da00979 react-native-restart: d4ea7637e193da7558d229b3704d500ec0d75f9c
react-native-safe-area-context: 584dc04881deb49474363f3be89e4ca0e854c057 react-native-safe-area-context: 5cf05f49df9d17261e40e518481f2e334c6cd4b5
react-native-video: a4c2635d0802f983594b7057e1bce8f442f0ad28 react-native-video: 77ce22be7abff9e373527ca10106a99dea3ba56c
React-perflogger: 1f554c2b684e2f484f9edcdfdaeedab039fbaca8 React-perflogger: 1f554c2b684e2f484f9edcdfdaeedab039fbaca8
React-RCTActionSheet: 610d5a5d71ab4808734782c8bca6a12ec3563672 React-RCTActionSheet: 610d5a5d71ab4808734782c8bca6a12ec3563672
React-RCTAnimation: ec6ed97370ace32724c253f29f0586cafcab8126 React-RCTAnimation: ec6ed97370ace32724c253f29f0586cafcab8126
@ -596,9 +596,9 @@ SPEC CHECKSUMS:
React-RCTVibration: 53b92d54b923283638cb0186da7a5c2d2b70a49b React-RCTVibration: 53b92d54b923283638cb0186da7a5c2d2b70a49b
React-runtimeexecutor: 4bb657a97aa74568d9ed634c8bd478299bb8a3a6 React-runtimeexecutor: 4bb657a97aa74568d9ed634c8bd478299bb8a3a6
ReactCommon: eb059748e842a1a86025ebbd4ac9d99e74492f88 ReactCommon: eb059748e842a1a86025ebbd4ac9d99e74492f88
RNCAsyncStorage: 26f25150da507524a7815f2ada06ca0967f65633 RNCAsyncStorage: d599364c12b1ddb042cc2d7ab6f8258962b83097
RNDeviceInfo: ec64a28e7ddf30399f34c04708fdf702560d083a RNDeviceInfo: 3b3bbe00f478907223daa580b6882f0bae162f72
RNPermissions: 4b54095940aea8c03fa3e6c92d4ac3647b31ed4e RNPermissions: b3588a19e12bff03fe21bc46911fd32343666dc0
RNScreens: 6e1ea5787989f92b0671049b808aef64fa1ef98c RNScreens: 6e1ea5787989f92b0671049b808aef64fa1ef98c
RNVectorIcons: 31cebfcf94e8cf8686eb5303ae0357da64d7a5a4 RNVectorIcons: 31cebfcf94e8cf8686eb5303ae0357da64d7a5a4
SPTPersistentCache: df36ea46762d7cf026502bbb86a8b79d0080dff4 SPTPersistentCache: df36ea46762d7cf026502bbb86a8b79d0080dff4

@ -627,7 +627,7 @@
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES; ENABLE_TESTABILITY = YES;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = ""; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 ";
GCC_C_LANGUAGE_STANDARD = gnu99; GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO; GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES; GCC_NO_COMMON_BLOCKS = YES;
@ -693,7 +693,7 @@
COPY_PHASE_STRIP = YES; COPY_PHASE_STRIP = YES;
ENABLE_NS_ASSERTIONS = NO; ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_STRICT_OBJC_MSGSEND = YES;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = ""; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 ";
GCC_C_LANGUAGE_STANDARD = gnu99; GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_NO_COMMON_BLOCKS = YES; GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;

12888
package-lock.json generated

File diff suppressed because it is too large Load Diff

@ -11,7 +11,6 @@
}, },
"dependencies": { "dependencies": {
"@react-native-async-storage/async-storage": "^1.15.9", "@react-native-async-storage/async-storage": "^1.15.9",
"@react-native-community/async-storage": "^1.12.1",
"@react-navigation/bottom-tabs": "^6.0.9", "@react-navigation/bottom-tabs": "^6.0.9",
"@react-navigation/native": "^6.0.6", "@react-navigation/native": "^6.0.6",
"@react-navigation/native-stack": "^6.2.4", "@react-navigation/native-stack": "^6.2.4",
@ -32,7 +31,6 @@
"react-native-select-dropdown": "^1.2.0", "react-native-select-dropdown": "^1.2.0",
"react-native-swiper-flatlist": "^3.0.15", "react-native-swiper-flatlist": "^3.0.15",
"react-native-vector-icons": "^8.1.0", "react-native-vector-icons": "^8.1.0",
"react-native-video": "^5.2.0",
"react-redux": "^7.2.5", "react-redux": "^7.2.5",
"redux": "^4.1.1", "redux": "^4.1.1",
"redux-logger": "^3.0.6", "redux-logger": "^3.0.6",

@ -1,23 +1,23 @@
import {StyleSheet} from 'react-native'; // import {StyleSheet} from 'react-native';
import Video from 'react-native-video'; // import Video from 'react-native-video';
import file from '../assets/video.mp4'; // import file from '../assets/video.mp4';
// Within your render function, assuming you have a file called // // Within your render function, assuming you have a file called
// "background.mp4" in your project. You can include multiple videos // // "background.mp4" in your project. You can include multiple videos
// on a single screen if you like. // // on a single screen if you like.
import React from 'react'; // import React from 'react';
export default function CustomVideo() { // export default function CustomVideo() {
return ( // return (
<Video // <Video
source={file} // Can be a URL or a local file. // source={file} // Can be a URL or a local file.
ref={ref => { // ref={ref => {
this.player = ref; // this.player = ref;
}} // Store reference // }} // Store reference
onBuffer={this.onBuffer} // Callback when remote video is buffering // onBuffer={this.onBuffer} // Callback when remote video is buffering
onError={this.videoError} // Callback when video cannot be loaded // onError={this.videoError} // Callback when video cannot be loaded
style={{width: '100%', height: '100%', borderRadius : 10}} // style={{width: '100%', height: '100%', borderRadius : 10}}
controls // controls
/> // />
); // );
} // }

@ -50,7 +50,7 @@ export default function Header() {
], ],
}, },
]}> ]}>
<Video /> {/* <Video /> */}
</View> </View>
</View> </View>
); );

@ -15,7 +15,7 @@ import Logo from "../../assets/images/logo.png";
import IranFlag from "../Login/components/IranFlag"; import IranFlag from "../Login/components/IranFlag";
import {digitToEn, digitToPersian} from "../../utils"; import {digitToEn, digitToPersian} from "../../utils";
import services from "./services"; import services from "./services";
import AsyncStorage from "@react-native-community/async-storage"; import AsyncStorage from "@react-native-async-storage/async-storage";
import {buildAction} from "../../reducers/DefaultReducer"; import {buildAction} from "../../reducers/DefaultReducer";
import {PROFILE_RECORD} from "../../actions/actionTypes"; import {PROFILE_RECORD} from "../../actions/actionTypes";

@ -1,7 +1,7 @@
import RNRestart from 'react-native-restart'; import RNRestart from 'react-native-restart';
import { toastMessage } from "../../utils/message" import { toastMessage } from "../../utils/message"
import { asyncAlert, asyncAwesomeAlert, asyncApiAwesomeAlert } from "../../utils/AsyncWrappers"; import { asyncAlert, asyncAwesomeAlert, asyncApiAwesomeAlert } from "../../utils/AsyncWrappers";
import AsyncStorage from '@react-native-community/async-storage' import AsyncStorage from '@react-native-async-storage/async-storage'
import DeviceInfo from 'react-native-device-info'; import DeviceInfo from 'react-native-device-info';
import { import {
ImageBackground, ImageBackground,

Loading…
Cancel
Save