Skip to content

G
gaohuaxue-mobile-app
Commit 5279343d authored by 赵振东's avatar 赵振东
Browse files
Options

fix: 解决冲突

parent 61076879
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 180 deletions
.gitignore
View file @ 5279343d
......@@ -4,7 +4,6 @@
# Xcode
#
bundle
build/
*.pbxuser
!default.pbxuser
......@@ -72,4 +71,4 @@ buck-out/
!.vscode/extensions.json
# IDEs and editors
/.idea
/.idea
\ No newline at end of file
Gemfile.lock deleted 100644 → 0
View file @ 61076879
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.6)
rexml
activesupport (7.0.4.3)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
addressable (2.8.1)
public_suffix (>= 2.0.2, < 6.0)
algoliasearch (1.27.5)
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
atomos (0.1.3)
claide (1.1.0)
cocoapods (1.12.0)
addressable (~> 2.8)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.12.0)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.6.0, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
cocoapods-search (>= 1.0.0, < 2.0)
cocoapods-trunk (>= 1.6.0, < 2.0)
cocoapods-try (>= 1.1.0, < 2.0)
colored2 (~> 3.1)
escape (~> 0.0.4)
fourflusher (>= 2.3.0, < 3.0)
gh_inspector (~> 1.0)
molinillo (~> 0.8.0)
nap (~> 1.0)
ruby-macho (>= 2.3.0, < 3.0)
xcodeproj (>= 1.21.0, < 2.0)
cocoapods-core (1.12.0)
activesupport (>= 5.0, < 8)
addressable (~> 2.8)
algoliasearch (~> 1.0)
concurrent-ruby (~> 1.1)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
netrc (~> 0.11)
public_suffix (~> 4.0)
typhoeus (~> 1.0)
cocoapods-deintegrate (1.0.5)
cocoapods-downloader (1.6.3)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.1)
cocoapods-trunk (1.6.0)
nap (>= 0.8, < 2.0)
netrc (~> 0.11)
cocoapods-try (1.2.0)
colored2 (3.1.2)
concurrent-ruby (1.2.2)
escape (0.0.4)
ethon (0.16.0)
ffi (>= 1.15.0)
ffi (1.15.5)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
httpclient (2.8.3)
i18n (1.12.0)
concurrent-ruby (~> 1.0)
json (2.3.0)
minitest (5.13.0)
molinillo (0.8.0)
nanaimo (0.3.0)
nap (1.1.0)
netrc (0.11.0)
public_suffix (4.0.7)
rexml (3.2.5)
ruby-macho (2.5.1)
typhoeus (1.4.0)
ethon (>= 0.9.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
xcodeproj (1.22.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.3.0)
rexml (~> 3.2.4)
PLATFORMS
ruby
DEPENDENCIES
cocoapods (~> 1.11, >= 1.11.2)
RUBY VERSION
ruby 2.7.5p203
BUNDLED WITH
2.1.4
app.json
View file @ 5279343d
{
"name": "highchem",
"displayName": "highchem"
"name": "gaohuaxue",
"displayName": "gaohuaxue"
}
ios/Podfile
View file @ 5279343d
......@@ -4,7 +4,7 @@ require_relative '../node_modules/@react-native-community/cli-platform-ios/nativ
platform :ios, '12.4'
install! 'cocoapods', :deterministic_uuids => false
target 'highchem' do
target 'gaohuaxue' do
config = use_native_modules!
# Flags change depending on the env values.
......@@ -26,7 +26,7 @@ target 'highchem' do
:app_path => "#{Pod::Config.instance.installation_root}/.."
)
target 'highchemTests' do
target 'gaohuaxueTests' do
inherit! :complete
# Pods for testing
end
......
ios/Podfile.lock
View file @ 5279343d
......@@ -302,21 +302,13 @@ PODS:
- React-jsinspector (0.70.6)
- React-logger (0.70.6):
- glog
- react-native-cameraroll (5.2.3):
- React-Core
- react-native-config (1.5.0):
- react-native-config/App (= 1.5.0)
- react-native-config/App (1.5.0):
- React-Core
- react-native-document-picker (8.1.3):
- React-Core
- react-native-safe-area-context (4.4.1):
- RCT-Folly
- RCTRequired
- RCTTypeSafety
- React-Core
- ReactCommon/turbomodule/core
- react-native-webview (11.26.1):
- react-native-webview (11.24.0):
- React-Core
- React-perflogger (0.70.6)
- React-RCTActionSheet (0.70.6):
......@@ -384,15 +376,11 @@ PODS:
- React-jsi (= 0.70.6)
- React-logger (= 0.70.6)
- React-perflogger (= 0.70.6)
- rn-fetch-blob (0.12.0):
- React-Core
- RNCAsyncStorage (1.17.11):
- React-Core
- RNScreens (3.19.0):
- RNScreens (3.18.2):
- React-Core
- React-RCTImage
- RNSVG (13.8.0):
- React-Core
- SocketRocket (0.6.0)
- Yoga (1.14.0)
- YogaKit (1.18.1):
......@@ -445,9 +433,6 @@ DEPENDENCIES:
- React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`)
- React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`)
- React-logger (from `../node_modules/react-native/ReactCommon/logger`)
- "react-native-cameraroll (from `../node_modules/@react-native-camera-roll/camera-roll`)"
- react-native-config (from `../node_modules/react-native-config`)
- react-native-document-picker (from `../node_modules/react-native-document-picker`)
- react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`)
- react-native-webview (from `../node_modules/react-native-webview`)
- React-perflogger (from `../node_modules/react-native/ReactCommon/reactperflogger`)
......@@ -462,10 +447,8 @@ DEPENDENCIES:
- React-RCTVibration (from `../node_modules/react-native/Libraries/Vibration`)
- React-runtimeexecutor (from `../node_modules/react-native/ReactCommon/runtimeexecutor`)
- ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`)
- rn-fetch-blob (from `../node_modules/rn-fetch-blob`)
- "RNCAsyncStorage (from `../node_modules/@react-native-async-storage/async-storage`)"
- RNScreens (from `../node_modules/react-native-screens`)
- RNSVG (from `../node_modules/react-native-svg`)
- Yoga (from `../node_modules/react-native/ReactCommon/yoga`)
SPEC REPOS:
......@@ -529,12 +512,6 @@ EXTERNAL SOURCES:
:path: "../node_modules/react-native/ReactCommon/jsinspector"
React-logger:
:path: "../node_modules/react-native/ReactCommon/logger"
react-native-cameraroll:
:path: "../node_modules/@react-native-camera-roll/camera-roll"
react-native-config:
:path: "../node_modules/react-native-config"
react-native-document-picker:
:path: "../node_modules/react-native-document-picker"
react-native-safe-area-context:
:path: "../node_modules/react-native-safe-area-context"
react-native-webview:
......@@ -563,14 +540,10 @@ EXTERNAL SOURCES:
:path: "../node_modules/react-native/ReactCommon/runtimeexecutor"
ReactCommon:
:path: "../node_modules/react-native/ReactCommon"
rn-fetch-blob:
:path: "../node_modules/rn-fetch-blob"
RNCAsyncStorage:
:path: "../node_modules/@react-native-async-storage/async-storage"
RNScreens:
:path: "../node_modules/react-native-screens"
RNSVG:
:path: "../node_modules/react-native-svg"
Yoga:
:path: "../node_modules/react-native/ReactCommon/yoga"
......@@ -609,11 +582,8 @@ SPEC CHECKSUMS:
React-jsiexecutor: b4a65947391c658450151275aa406f2b8263178f
React-jsinspector: 60769e5a0a6d4b32294a2456077f59d0266f9a8b
React-logger: 1623c216abaa88974afce404dc8f479406bbc3a0
react-native-cameraroll: 5b25d0be40185d02e522bf2abf8a1ba4e8faa107
react-native-config: 5330c8258265c1e5fdb8c009d2cabd6badd96727
react-native-document-picker: 958e2bc82e128be69055be261aeac8d872c8d34c
react-native-safe-area-context: 99b24a0c5acd0d5dcac2b1a7f18c49ea317be99a
react-native-webview: 9f111dfbcfc826084d6c507f569e5e03342ee1c1
react-native-webview: 6408bc328e65042d240d0ebd62baa76ffd23b1aa
React-perflogger: 8c79399b0500a30ee8152d0f9f11beae7fc36595
React-RCTActionSheet: 7316773acabb374642b926c19aef1c115df5c466
React-RCTAnimation: 5341e288375451297057391227f691d9b2326c3d
......@@ -626,14 +596,12 @@ SPEC CHECKSUMS:
React-RCTVibration: c75ceef7aa60a33b2d5731ebe5800ddde40cefc4
React-runtimeexecutor: 15437b576139df27635400de0599d9844f1ab817
ReactCommon: 349be31adeecffc7986a0de875d7fb0dcf4e251c
rn-fetch-blob: f065bb7ab7fb48dd002629f8bdcb0336602d3cba
RNCAsyncStorage: 8616bd5a58af409453ea4e1b246521bb76578d60
RNScreens: ea4cd3a853063cda19a4e3c28d2e52180c80f4eb
RNSVG: c1e76b81c76cdcd34b4e1188852892dc280eb902
RNScreens: 34cc502acf1b916c582c60003dc3089fa01dc66d
SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608
Yoga: 99caf8d5ab45e9d637ee6e0174ec16fbbb01bcfc
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
PODFILE CHECKSUM: 4a5cffad0a65a3d15c9b4fc6fd9d3ffac583237d
PODFILE CHECKSUM: be7f7bcd44c34eab43e44bd82546804f3c9c69a2
COCOAPODS: 1.12.0
COCOAPODS: 1.11.2
ios/highchem.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted 100644 → 0
View file @ 61076879
<?xml version="1.0" encoding="UTF-8"?>
<Workspace
version = "1.0">
<FileRef
location = "self:">
</FileRef>
</Workspace>
ios/highchem.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted 100644 → 0
View file @ 61076879
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
ios/highchem.xcodeproj/xcshareddata/xcschemes/highchem.xcscheme → ios/zhongranSbbbMobileSale.xcodeproj/xcshareddata/xcschemes/zhongranSbbbMobileSale.xcscheme
View file @ 5279343d
......@@ -15,9 +15,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
BuildableName = "highchem.app"
BlueprintName = "highchem"
ReferencedContainer = "container:highchem.xcodeproj">
BuildableName = "gaohuaxue.app"
BlueprintName = "gaohuaxue"
ReferencedContainer = "container:gaohuaxue.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
......@@ -33,9 +33,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "00E356ED1AD99517003FC87E"
BuildableName = "highchemTests.xctest"
BlueprintName = "highchemTests"
ReferencedContainer = "container:highchem.xcodeproj">
BuildableName = "gaohuaxueTests.xctest"
BlueprintName = "gaohuaxueTests"
ReferencedContainer = "container:gaohuaxue.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
......@@ -55,9 +55,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
BuildableName = "highchem.app"
BlueprintName = "highchem"
ReferencedContainer = "container:highchem.xcodeproj">
BuildableName = "gaohuaxue.app"
BlueprintName = "gaohuaxue"
ReferencedContainer = "container:gaohuaxue.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
......@@ -72,9 +72,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
BuildableName = "highchem.app"
BlueprintName = "highchem"
ReferencedContainer = "container:highchem.xcodeproj">
BuildableName = "gaohuaxue.app"
BlueprintName = "gaohuaxue"
ReferencedContainer = "container:gaohuaxue.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
......
ios/highchem.xcworkspace/contents.xcworkspacedata → ios/zhongranSbbbMobileSale.xcworkspace/contents.xcworkspacedata
View file @ 5279343d
......@@ -2,7 +2,7 @@
<Workspace
version = "1.0">
<FileRef
location = "group:highchem.xcodeproj">
location = "group:gaohuaxue.xcodeproj">
</FileRef>
<FileRef
location = "group:Pods/Pods.xcodeproj">
......
ios/highchem/AppDelegate.mm → ios/zhongranSbbbMobileSale/AppDelegate.mm
View file @ 5279343d
......@@ -44,7 +44,7 @@ static NSString *const kRNConcurrentRoot = @"concurrentRoot";
#endif
NSDictionary *initProps = [self prepareInitialProps];
UIView *rootView = RCTAppSetupDefaultRootView(bridge, @"highchem", initProps);
UIView *rootView = RCTAppSetupDefaultRootView(bridge, @"gaohuaxue", initProps);
if (@available(iOS 13.0, *)) {
rootView.backgroundColor = [UIColor systemBackgroundColor];
......@@ -87,7 +87,7 @@ static NSString *const kRNConcurrentRoot = @"concurrentRoot";
#if DEBUG
return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index"];
#else
return [[NSBundle mainBundle] URLForResource:@"bundle/index" withExtension:@"jsbundle"];
return [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
#endif
}
......
ios/highchem/Info.plist → ios/zhongranSbbbMobileSale/Info.plist
View file @ 5279343d
......@@ -5,7 +5,7 @@
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleDisplayName</key>
<string>highchem</string>
<string>gaohuaxue</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
......@@ -26,8 +26,6 @@
<true/>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSAllowsArbitraryLoads</key>
<true/>
<key>NSExceptionDomains</key>
<dict>
<key>localhost</key>
......
ios/highchem/LaunchScreen.storyboard → ios/zhongranSbbbMobileSale/LaunchScreen.storyboard
View file @ 5279343d
......@@ -16,7 +16,7 @@
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="highchem" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="GJd-Yh-RWb">
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="gaohuaxue" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="GJd-Yh-RWb">
<rect key="frame" x="0.0" y="202" width="375" height="43"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
<nil key="highlightedColor"/>
......
ios/highchemTests/highchemTests.m → ios/zhongranSbbbMobileSaleTests/zhongranSbbbMobileSaleTests.m
View file @ 5279343d
......@@ -7,11 +7,11 @@
#define TIMEOUT_SECONDS 600
#define TEXT_TO_LOOK_FOR @"Welcome to React"
@interface highchemTests : XCTestCase
@interface gaohuaxueTests : XCTestCase
@end
@implementation highchemTests
@implementation gaohuaxueTests
- (BOOL)findSubviewInView:(UIView *)view matching:(BOOL (^)(UIView *view))test
{
......
package.json
View file @ 5279343d
......@@ -13,7 +13,6 @@
"test": "jest",
"lint": "eslint . --ext .js,.jsx,.ts,.tsx",
"format": "prettier --write \"src/**/*.{js,jsx,ts,tsx,json}\"",
"bundle-ios": "node node_modules/react-native/local-cli/cli.js bundle --entry-file index.js --platform ios --dev false --bundle-output ./ios/bundle/index.jsbundle --assets-dest ./ios/bundle",
"build-android-release": "cd android && ./gradlew assembleRelease",
"build-android-debug": "cd android && ./gradlew assembleDebug",
"gradlewClean": "cd android && ./gradlew clean"
......@@ -36,6 +35,7 @@
"expo-blur": "~8.2.0",
"expo-clipboard": "~1.0.1",
"i18next": "^20.5.0",
"jpush-react-native": "2.8.2",
"mobx": "^6.7.0",
"mobx-react-lite": "^3.4.0",
"prettier": "^2.8.0",
......
src/views/messageCenter/PlatformMsg/index.tsx
View file @ 5279343d
......@@ -20,7 +20,7 @@ import NavBar from '../../../components/NavBar';
import Loading from '../../../components/Loading';
import Toast from 'react-native-root-toast';
import Confirm from '../../../components/Confirm';
// import JPush from 'jpush-react-native';
import JPush from 'jpush-react-native';
export type DataIndexType = "system" | "trade" | "purchase" | "afterSale" | "capital"
interface RouteParams {
......
yarn.lock
View file @ 5279343d
......@@ -5376,6 +5376,11 @@ joi@^17.2.1:
"@sideway/formula" "^3.0.0"
"@sideway/pinpoint" "^2.0.0"
jpush-react-native@2.8.2:
version "2.8.2"
resolved "https://registry.npmmirror.com/jpush-react-native/-/jpush-react-native-2.8.2.tgz#db7e91811ab5395a7d60a08d0092c780f8c14d3d"
integrity sha512-yyRPezx7symiC9d6vYc2dwLC0PqSuL/YrjtXHdUi4/bl3IZD95KQ4s8ZXJjZqx7ibqF+cp0ZDc5j7wUmX78j9A==
"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
version "4.0.0"
resolved "http://npm.shushangyun.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
......
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