Skip to content

zhangzhonghua / BoneHouse_Business_APP

Go to a project
Commit 8ee8d55e by wong.peiyi
Options

Merge branch 'develop' into product

parents 7c031b4e 89116767
Expand all
Inline Side-by-side
Showing with 353 additions and 73 deletions
App.js
......@@ -29,8 +29,6 @@ const codepushOptions = {
// ON_APP_START 开机时检测
// MANUAL 手动
checkFrequency: CodePush.CheckFrequency.ON_APP_RESUME,
installMode: CodePush.InstallMode.ON_NEXT_RESTART,
updateDialog: false,
}
class App extends Component {
......@@ -45,7 +43,32 @@ class App extends Component {
}
syncImmediate() {
CodePush.sync({})
CodePush.sync({
//安装模式
//ON_NEXT_RESUME 下次恢复到前台时
//ON_NEXT_RESTART 下一次重启时
//IMMEDIATE 马上更新
installMode : CodePush.InstallMode.IMMEDIATE ,
//对话框
updateDialog : {
//是否显示更新描述
appendReleaseDescription : false ,
//更新描述的前缀。 默认为"Description"
descriptionPrefix : "更新内容：" ,
//强制更新按钮文字，默认为continue
mandatoryContinueButtonLabel : "立即更新" ,
//强制更新时的信息. 默认为"An update is available that must be installed."
mandatoryUpdateMessage : "必须更新后才能使用" ,
//非强制更新时，按钮文字,默认为"ignore"
optionalIgnoreButtonLabel : '稍后' ,
//非强制更新时，确认按钮文字. 默认为"Install"
optionalInstallButtonLabel : '后台更新' ,
//非强制更新时，检查到更新的消息文本
optionalUpdateMessage : '有新版本了，是否更新？',
//Alert窗口的标题
title : '更新提示'
}
})
}
render() {
......
android/app/src/main/assets/index.android.bundle deleted 100644 → 0
This diff could not be displayed because it is too large.
app/action/EquipAction.js
......@@ -171,6 +171,10 @@ export const uploadEquipImg = async (global_domain_config, params) => {
return await UploadRequest(global_domain_config, getUrlParams('/dingding/upload_media', { access_token }), formData)
}
export const reqOrgDepartments = async (global_domain_config, params) => {
return await GetRequest(global_domain_config, getUrlParams('/sale/sale_relationship/search', params))
}
// 提交数据
export function requestEquipSumbit({access_token, ...params}) {
return (dispatch, getState) => {
......
app/action/HistorAction.js
......@@ -37,6 +37,10 @@ export const requestHistorSurgeryType = async (global_domain_config, params) =>
return await GetRequest(global_domain_config, getUrlParams('/system/value_set/search', params))
}
export const reqOrgDepartments = async (global_domain_config, params) => {
return await GetRequest(global_domain_config, getUrlParams('/sale/sale_relationship/search', params))
}
// 借货订单查询 params: {access_token: '', ...}
export function requestGetAllBorrow(params) {
return (dispatch, getState) => {
......
app/action/LoginAction.js
......@@ -6,7 +6,8 @@ import {
AUTO_LOGIN_SUCCESS,
AUTO_LOGIN_FAILURE,
SET_DOMAIN_CONFIGURATE,
SET_VERSION_APK
SET_VERSION_APK,
SET_DOMAIN_FROM_ORIGIN
} from '../base/ActionTypes';
import { GetRequest, PostRequest } from '../network/RequestUtils';
import { getUrlParams, show, showWarnErrorMessage, showErrorMessage } from '../utils/Utils';
......@@ -116,6 +117,13 @@ export function setDomainConfigurate(domainVal) {
}
}
export function setDomainFromOrigin(hasSet) {
return {
type: SET_DOMAIN_FROM_ORIGIN,
data: hasSet
}
}
//系统配置文件查询接口 access_token profile_code
export const requestSysProfile = async (global_domain_config, params) => {
return await GetRequest(global_domain_config, getUrlParams('/system/sys_profile/search', params))
......
app/action/QuickAction.js
......@@ -155,6 +155,10 @@ export const reqQuickTemplateCollect = async (global_domain_config, params) => {
return await GetRequest(global_domain_config, getUrlParams('/surgery/template_header/search', params))
}
export const reqOrgDepartments = async (global_domain_config, params) => {
return await GetRequest(global_domain_config, getUrlParams('/sale/sale_relationship/search', params))
}
// 获取手术类型 params={access_token:'', value_set_code:'ORTHOPEDICS_PRODUCT_CLASS'}
export function requestQuickSurgeryType(params) {
return (dispatch, getState) => {
......
app/action/SelfAction.js
import { PostRequest, GetRequest, UploadRequest } from '../network/RequestUtils';
import { show, getUrlParams, showWarnErrorMessage, showErrorMessage } from '../utils/Utils';
import { show, getUrlParams, showWarnErrorMessage, showErrorMessage, dedupQuoteArray } from '../utils/Utils';
import { exitLoginStatus } from './LoginAction';
import {
SELF_ORDER_LIST_DOING,
......@@ -44,10 +44,50 @@ export function requestSelfOrganizations(params) {
}
}
// 获取未定单据借货设置 params={access_token:'', org_code:'', customer_code: '', bill_to_site_code: '', ship_to_site_code: '', process_code: ''}
export function requestQuickSurColSetting(params) {
return (dispatch, getState) => {
dispatch(requestListDataing());
let {global_domain_config} = getState().login
GetRequest(global_domain_config, getUrlParams('/surgery/collect_setting/search', params))
.then(res => {
console.log('获取未定单据借货设置 res=====', res);
if(res.error_code == 0) {
let { data } = res
let filterOpt = dedupQuoteArray(data, 'source_inv_code')
dispatch(requestListDataSuccess(filterOpt));
}else {
showWarnErrorMessage(dispatch, res, exitLoginStatus, requestListDataFail);
}
// else if(res.error_code === 41006) {
// show('登录过期，请重新登录');
// dispatch(exitLoginStatus());
// }else if(res.status === 404){
// show('请求接口不存在，请联系管理员！')
// dispatch(requestListDataFail());
// } else {
// let error_msg = res.error_msg || res.message
// show(error_msg);
// dispatch(requestListDataFail());
// }
})
.catch(err => {
// console.log('------err-====获取未定单据借货设置----', Object.keys(err), err)
// show(err.error);
// dispatch(requestListDataFail());
showErrorMessage(dispatch, err, requestListDataFail, '获取未定单据借货设置');
})
}
}
export const reqSelfOrganizations = async (global_domain_config, params) => {
return await GetRequest(global_domain_config, getUrlParams('/authorized_inventory/search', params))
}
export const reqOrgDepartments = async (global_domain_config, params) => {
return await GetRequest(global_domain_config, getUrlParams('/sale/sale_relationship/search', params))
}
// 获取客户名称 params={access_token:'', org_code:'', seller_code:''}
export function requestSelfSurgeryHospital(params) {
......
app/action/TransAction.js
......@@ -48,6 +48,10 @@ export const reqTransOrganizations = async (global_domain_config, params) => {
return await GetRequest(global_domain_config, getUrlParams('/authorized_inventory/search', params))
}
export const reqOrgDepartments = async (global_domain_config, params) => {
return await GetRequest(global_domain_config, getUrlParams('/sale/sale_relationship/search', params))
}
// 获取客户名称 params={access_token:'', org_code:'', seller_code:''}
export function requestTransSurgeryHospital(params) {
return (dispatch, getState) => {
......
app/base/ActionTypes.js
......@@ -7,6 +7,7 @@ export const EXIT_LOGIN = "EXIT_LOGIN"
export const AUTO_LOGIN_SUCCESS = "AUTO_LOGIN_SUCCESS"
export const AUTO_LOGIN_FAILURE = "AUTO_LOGIN_FAILURE"
export const SET_DOMAIN_CONFIGURATE="SET_DOMAIN_CONFIGURATE"
export const SET_DOMAIN_FROM_ORIGIN = 'SET_DOMAIN_FROM_ORIGIN'
export const SET_VERSION_APK="SET_VERSION_APK"
//-----------self order---------------------
export const SELF_ORDER_LIST_NO = "SELF_ORDER_LIST_NO"
......
app/containers/common/DialogModel.js
......@@ -218,7 +218,9 @@ const styles = StyleSheet.create({
},
list_item_text: {
fontSize: 16,
color: third_text_color
color: third_text_color,
width: '100%',
textAlign: 'center',
},
curr_item: {
color: first_text_color,
......@@ -244,7 +246,10 @@ const styles = StyleSheet.create({
height: 'auto'
},
list_txt_box: {
flex: 1
flex: 1,
width: '100%',
alignItems: 'center',
justifyContent: 'center',
},
list_img_box: {
width: pxSize(60),
......
app/containers/equipConsu/module/ConsumDetailsPage.js
......@@ -11,6 +11,7 @@ import LodingModel from '../../common/LodingModel';
import { exitLoginStatus } from '../../../action/LoginAction';
import { OBS_MOBILE_EQU_CON_DISPLAY_PRICE } from '../../../base/BaseConstants';
import { LOGIN_NO } from '../../../base/ActionTypes';
import moment from 'moment';
const CONSUM_SEARCH_VALUE_BAR_CODE = 'CONSUM_SEARCH_VALUE_BAR_CODE';
......@@ -300,19 +301,31 @@ class ConsumDetailsPage extends Component {
</View>
<View style={styles.sub_list_rig}>
<Text style={styles.rig_tit}>
{index+1}. {item.manufacturer_product_code ? item.manufacturer_product_code : '厂家产品代码无'}
{index+1}. {item.manufacturer_product_code || '无厂家产品代码'}
</Text>
<Text style={[styles.rig_ser, styles.te_ot_str]}>
物料名称 ：{item.item_name ? item.item_name : '无'}
<Text style={[styles.rig_ser, styles.te_ot_str]} numberOfLines={1}>
物料名称 ：{item.item_name || '无'}
</Text>
<Text style={[styles.rig_ser, styles.te_ot_one]}>
通用名称 ：{item.general_name ? item.general_name : '无'}
<Text style={[styles.rig_ser, styles.te_ot_one]} numberOfLines={1}>
通用名称 ：{item.general_name || '无'}
</Text>
<Text style={[styles.rig_ser, styles.te_ot_one]}>
规格型号：{item.specification ? item.specification : '无'}
<Text style={[styles.rig_ser, styles.te_ot_one]} numberOfLines={1}>
规格型号：{item.specification || '无'}
</Text>
<Text style={[styles.rig_ser, styles.te_ot_thr]}>
序列号：{item.serial_number ? item.serial_number : '无'}
<Text style={[styles.rig_ser, styles.te_ot_thr]} numberOfLines={1}>
序列号：{item.serial_number_v || item.serial_number || '无'}
</Text>
<Text style={[styles.rig_ser, styles.te_ot_thr]} numberOfLines={1}>
生产批号：{item.production_batch_number || '无'}
</Text>
<Text style={[styles.rig_ser, styles.te_ot_thr]} numberOfLines={1}>
生产序号：{item.production_serial_number || '无'}
</Text>
<Text style={[styles.rig_ser, styles.te_ot_thr]} numberOfLines={1}>
生产日期：{item.production_date && moment(item.production_date).format('YYYY-MM-DD') || '无'}
</Text>
<Text style={[styles.rig_ser, styles.te_ot_thr]} numberOfLines={1}>
过期日期：{item.expiration_date && moment(item.expiration_date).format('YYYY-MM-DD') || '无'}
</Text>
</View>
</TouchableOpacity>
......@@ -430,7 +443,7 @@ const styles = StyleSheet.create({
},
rig_ser: {
fontSize: third_text_size,
fontFamily: font_family_regular
fontFamily: font_family_regular,
},
te_ot_str: {
fontFamily: font_family_semibold,
......
app/containers/historicalOrder/module/LineOrderPage.js
......@@ -487,7 +487,7 @@ class LineOrderPage extends Component {
subColumns.map(col => {
const obj = this.state[col.obj] || orderSupOptions
if(!!col.ifShow && !col.ifShow()) return null
console.log(Object.prototype.toString.call(col.prop))
return (
<View key={col.name} style={styles.fo_cell_box}>
<View style={{minWidth: pxSize(70), }}>
......
app/containers/login/LoginPage.js
......@@ -28,7 +28,7 @@ import {
safe_view,
font_family_medium
} from '../../base/BaseStyle';
import { requestLogin, autoLogin, setDomainConfigurate, setVersionApk } from '../../action/LoginAction';
import { requestLogin, autoLogin, setDomainConfigurate, setVersionApk, setDomainFromOrigin } from '../../action/LoginAction';
import { show, isEmpty } from '../../utils/Utils';
import { LOGIN_DOING, LOGIN_SUCCESS, LOGIN_FAILURE, LOGIN_NO } from '../../base/ActionTypes';
import StatusBarView from '../common/StatusBarView';
......@@ -67,7 +67,10 @@ class LoginPage extends Component{
async setDefaultDomain() {
try {
const baseUrl = await NativeModules.RNToolsManager.getBaseUrl()
if (baseUrl && !this.props.hasSet) {
this.props.setDomainConfigurate(baseUrl)
this.props.setDomainFromOrigin(true)
}
} catch (error) {
console.log('do not suppor getBaseUrl')
}
......@@ -507,7 +510,8 @@ const mapStateToProps = (state) => ({
loginState:state.login.loginState,
username:state.login.username,
password:state.login.password,
global_domain_config:state.login.global_domain_config
global_domain_config:state.login.global_domain_config,
hasSet:state.login.hasSetDomainFromOrigin
})
const mapDispatchToProps = (dispatch) => ({
......@@ -523,6 +527,9 @@ const mapDispatchToProps = (dispatch) => ({
setVersionApk: (versionApk) => {
dispatch(setVersionApk(versionApk))
},
setDomainFromOrigin: (hasSet) => {
dispatch(setDomainFromOrigin(hasSet))
}
})
export default connect(mapStateToProps, mapDispatchToProps)(LoginPage)
app/containers/selfOrder/module/ChooseProductPage.js
......@@ -12,6 +12,7 @@ import { reqPurSupplierSearch, reqProCategorySearch, reqSurTempHeadSearch, reqNa
import LoadingModel from '../../common/listDataComponent/LoadingModel';
import LocalVariable from '../../common/LocalVariable';
import { exitLoginStatus } from '../../../action/LoginAction';
import * as R from 'ramda';
class ChooseProductPage extends Component {
constructor(props) {
......@@ -363,21 +364,16 @@ class ChooseProductPage extends Component {
if (leIndex === leftActiveIndex) {
// 当前选择项
leItem[LocalVariable.SELECTED_QUQNTITY] = count
if (leItem[LocalVariable.LOCAL_SECOND_DATA].length > 0) {
leItem[LocalVariable.SELECTED_DATA_ARR] = []
leItem[LocalVariable.LOCAL_SECOND_DATA].forEach(function (chItem) {
if (chItem[coutFieName]) {
leItem[LocalVariable.SELECTED_DATA_ARR].push(chItem)
}
})
}
const selectData = R.filter(R.compose(R.lt(0), R.prop(coutFieName)))(leItem[LocalVariable.LOCAL_SECOND_DATA])
leItem.selectedArr = selectData
// 原本是赋值给这个对象属性的，但不知道哪里这个对象属性会把第四个以后的所选耗材放到第四个上，
// 所以最后计算的时候使用属性 selectedArr
leItem[LocalVariable.SELECTED_DATA_ARR] = R.clone(selectData)
}
top_sel_sum += leItem[LocalVariable.SELECTED_QUQNTITY]
})
topProcOptionList[topActiveIndex][LocalVariable.SELECTED_QUQNTITY] = top_sel_sum
this.setState({
topProcOptionList
})
this.setState({ topProcOptionList })
}
// 关闭已选弹窗
......@@ -543,7 +539,6 @@ class ChooseProductPage extends Component {
})
}
})
this.setState({
topProcOptionList: topProcOptionList
})
......
app/reducers/module/login.js
......@@ -7,7 +7,8 @@ import {
AUTO_LOGIN_SUCCESS,
AUTO_LOGIN_FAILURE,
SET_DOMAIN_CONFIGURATE,
SET_VERSION_APK
SET_VERSION_APK,
SET_DOMAIN_FROM_ORIGIN
} from '../../base/ActionTypes';
// 登录状态
......@@ -18,6 +19,7 @@ const defaultState = {
username:'',
password:'',
global_domain_config: 'https://obs.uat.guke.tech',
hasSetDomainFromOrigin: false,
local_version_apk: '',
// 默认【深圳仓】https://obs.uat.guke.tech；【十方uat】https://obs.uat.sfrx.guke.tech；【十方pro】https://obs.sfrx.orth.tech
// 【国药dev】https://obs.dev.guke.tech；【国药pro】https://obs-pro.gyjtsx.com
......@@ -63,6 +65,10 @@ export default login = (state = defaultState, action) => {
return Object.assign({}, state, {
global_domain_config: action.global_domain_config
})
case SET_DOMAIN_FROM_ORIGIN:
return Object.assign({}, state, {
hasSetDomainFromOrigin: action.data
})
case SET_VERSION_APK:
return Object.assign({}, state, {
local_version_apk: action.local_version_apk
......
app/utils/Utils.js
import Toast from 'react-native-root-toast';
import { Dimensions, Platform, NativeModules, PixelRatio, Text } from "react-native";
import * as R from 'ramda';
/**
* 提示框
......@@ -319,3 +320,10 @@ export const showErrorMessage = (dispatch, err, errorCallback, logTit) => {
show(error_msg);
dispatch(errorCallback());
}
/**
* 空值或空判断
*/
export const isBlank = R.anyPass([R.isNil, R.isEmpty])
export const isNotBlank = R.complement(isBlank)
ios/BoneHouse_Business_APP.xcodeproj/project.pbxproj
......@@ -22,7 +22,6 @@
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
140ED2AC1D01E1AD002B40FF /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; };
146834051AC3E58100842450 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; };
2D02E4BC1E0B4A80006451C7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; };
2D02E4BD1E0B4A84006451C7 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
2D02E4BF1E0B4AB3006451C7 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
......@@ -42,6 +41,7 @@
A32499D5AE884F6F872774E4 /* libRNGestureHandler-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A3D4AB90D45046B6BFE7C6D9 /* libRNGestureHandler-tvOS.a */; };
AB5CF7B125F35664008DF3C6 /* libSplashScreen.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 98464320248115E6000A6140 /* libSplashScreen.a */; };
AB5CF7B225F3568D008DF3C6 /* libRNAudio.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ECD74ED82474DDFC005B4208 /* libRNAudio.a */; };
ABDDF166261577F5009E84C3 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; };
ABFEE38D25F36AC400727C35 /* libCodePush.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ABB463F125F0C45400F9E705 /* libCodePush.a */; };
ABFEE38E25F36AE800727C35 /* libRNFetchBlob.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9867E22025BED25B00C29E9D /* libRNFetchBlob.a */; };
ABFEE44225F37BE200727C35 /* libRNGestureHandler.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ECD74ECB2474DDFC005B4208 /* libRNGestureHandler.a */; };
......@@ -493,9 +493,9 @@
buildActionMask = 2147483647;
files = (
ED297163215061F000B7C4FE /* JavaScriptCore.framework in Frameworks */,
ABDDF166261577F5009E84C3 /* libReact.a in Frameworks */,
ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */,
11D1A2F320CAFA9E000508D9 /* libRCTAnimation.a in Frameworks */,
146834051AC3E58100842450 /* libReact.a in Frameworks */,
00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */,
00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */,
00C302E81ABCBA2D00DB3ED1 /* libRCTImage.a in Frameworks */,
......@@ -1676,12 +1676,12 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "";
CODEPUSH_KEY = "";
CURRENT_PROJECT_VERSION = 1.2.11;
CURRENT_PROJECT_VERSION = 1.2.13;
DEAD_CODE_STRIPPING = NO;
DEVELOPMENT_TEAM = 2BWXWUS2NV;
FRAMEWORK_SEARCH_PATHS = "";
HEADER_SEARCH_PATHS = (
"$(inherited)",
"$(inherited)/**",
"$(SRCROOT)/../node_modules/react-native/React/**",
"$(SRCROOT)/../node_modules/react-native-audio/ios",
"$(SRCROOT)/../node_modules/react-native-gesture-handler/ios/**",
......@@ -1707,8 +1707,9 @@
"$(SRCROOT)/../node_modules/react-native-fs/**",
"$(SRCROOT)/../node_modules/rn-fetch-blob/**",
"$(SRCROOT)/../node_modules/react-native-splash-screen/ios/build/**",
"$(SRCROOT)/../node_modules/react-native/**",
);
MARKETING_VERSION = 1.2.10;
MARKETING_VERSION = 1.2.11;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
......@@ -1728,11 +1729,11 @@
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "";
CODEPUSH_KEY = "PanMvkUOw_lNr2S5F-LG0nzMjj0Mo49v-wxeWm";
CODE_SIGN_IDENTITY = "Apple Development";
CURRENT_PROJECT_VERSION = 1.2.11;
CURRENT_PROJECT_VERSION = 1.2.13;
DEVELOPMENT_TEAM = 2BWXWUS2NV;
FRAMEWORK_SEARCH_PATHS = "";
HEADER_SEARCH_PATHS = (
"$(inherited)",
"$(inherited)/**",
"$(SRCROOT)/../node_modules/react-native/React/**",
"$(SRCROOT)/../node_modules/react-native-audio/ios",
"$(SRCROOT)/../node_modules/react-native-gesture-handler/ios/**",
......@@ -1742,7 +1743,7 @@
"$(SRCROOT)/../node_modules/react-native-image-picker/ios",
"$(SRCROOT)/../node_modules/react-native-date-picker/ios/RNDatePicker",
"$(SRCROOT)/../node_modules/react-native-fs/**",
"$(SRCROOT)/../node_modules/rn-fetch-blob/ios/**",
"$(SRCROOT)/../node_modules/rn-fetch-blob/**",
"$(SRCROOT)/../node_modules/react-native-code-push/ios/CodePush/**",
);
INFOPLIST_FILE = BoneHouse_Business_APP/Info.plist;
......@@ -1758,8 +1759,9 @@
"$(SRCROOT)/../node_modules/react-native-fs/**",
"$(SRCROOT)/../node_modules/rn-fetch-blob/**",
"$(SRCROOT)/../node_modules/react-native-splash-screen/ios/build/**",
"$(SRCROOT)/../node_modules/react-native/**",
);
MARKETING_VERSION = 1.2.10;
MARKETING_VERSION = 1.2.11;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
......@@ -2007,6 +2009,8 @@
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
SYSTEM_HEADER_SEARCH_PATHS = "$(SRCROOT)/../node_modules/react-native/React/**";
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../node_modules/react-native/React/**";
};
name = Debug;
};
......@@ -2053,6 +2057,8 @@
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SYSTEM_HEADER_SEARCH_PATHS = "$(SRCROOT)/../node_modules/react-native/React/**";
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../node_modules/react-native/React/**";
VALIDATE_PRODUCT = YES;
};
name = Release;
......@@ -2100,6 +2106,8 @@
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SYSTEM_HEADER_SEARCH_PATHS = "$(SRCROOT)/../node_modules/react-native/React/**";
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../node_modules/react-native/React/**";
VALIDATE_PRODUCT = YES;
};
name = Staging;
......@@ -2111,7 +2119,7 @@
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "";
CODEPUSH_KEY = "0Jf6O1u52LayZPBbWMss7v-AZStc-LBdjjw9j";
CODE_SIGN_IDENTITY = "Apple Development";
CURRENT_PROJECT_VERSION = 1.2.11;
CURRENT_PROJECT_VERSION = 1.2.13;
DEVELOPMENT_TEAM = 2BWXWUS2NV;
HEADER_SEARCH_PATHS = (
"$(inherited)/**",
......@@ -2130,7 +2138,19 @@
INFOPLIST_FILE = BoneHouse_Business_APP/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 1.2.10;
LIBRARY_SEARCH_PATHS = (
"$(SRCROOT)/../node_modules/react-native-audio/**",
"$(SRCROOT)/../node_modules/react-native-gesture-handler/**",
"$(SRCROOT)/../node_modules/react-native-sound/**",
"$(SRCROOT)/../node_modules/react-native-camera/**",
"$(SRCROOT)/../node_modules/react-native-image-picker/**",
"$(SRCROOT)/../node_modules/react-native-date-picker/**",
"$(SRCROOT)/../node_modules/react-native-fs/**",
"$(SRCROOT)/../node_modules/rn-fetch-blob/**",
"$(SRCROOT)/../node_modules/react-native-splash-screen/ios/build/**",
"$(SRCROOT)/../node_modules/react-native/**",
);
MARKETING_VERSION = 1.2.11;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
......
ios/BoneHouse_Business_APP.xcodeproj/xcshareddata/xcschemes/BoneHouse_Business_APP.xcscheme
......@@ -119,7 +119,7 @@
buildConfiguration = "Release">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Staging"
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
ios/BoneHouse_Business_APP/AppDelegate.h
......@@ -4,8 +4,11 @@
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/
#if __has_include(<React/RCTBridgeDelegate.h>)
#import <React/RCTBridgeDelegate.h>
#else
#import "RCTBridgeDelegate.h"
#endif
#import <UIKit/UIKit.h>
@interface AppDelegate : UIResponder <UIApplicationDelegate, RCTBridgeDelegate>
......
ios/BoneHouse_Business_APP/AppDelegate.m
......@@ -6,10 +6,15 @@
*/
#import "AppDelegate.h"
#if __has_include(<React/RCTBridge.h>)
#import <React/RCTBridge.h>
#import <React/RCTBundleURLProvider.h>
#import <React/RCTRootView.h>
#else
#import "RCTBridge.h"
#import "RCTBundleURLProvider.h"
#import "RCTRootView.h"
#endif
#import "CodePush.h"
#import "RNSplashScreen.h" // 导入启动页组件库
......
ios/BoneHouse_Business_APP/Info.plist
......@@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.2.5</string>
<string>1.2.6</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
......
ios/BoneHouse_Business_APPTests/BoneHouse_Business_APPTests.m
......@@ -7,9 +7,14 @@
#import <UIKit/UIKit.h>
#import <XCTest/XCTest.h>
#if __has_include(<React/RCTLog.h>)
#import <React/RCTLog.h>
#import <React/RCTRootView.h>
#else
#import "RCTLog.h"
#import "RCTRootView.h"
#endif
#define TIMEOUT_SECONDS 600
#define TEXT_TO_LOOK_FOR @"Welcome to React Native!"
......
ios/RNToolsManager.h
......@@ -13,8 +13,11 @@
#endif /* RNToolsManager_h */
#import <Foundation/Foundation.h>
//#import <React/RCTBridgeModule.h>
#if __has_include(<React/RCTBridgeModule.h>)
#import <React/RCTBridgeModule.h>
#else
#import "RCTBridgeModule.h"
#endif
@interface RNToolsManager : NSObject <RCTBridgeModule>
......
ios/RNToolsManager.m
......@@ -7,8 +7,8 @@
//
#import <Foundation/Foundation.h>
#import "RNToolsManager.h"
@implementation RNToolsManager
@synthesize bridge = _bridge;
......
package.json
{
"name": "BoneHouse_Business_APP",
"version": "1.2.5",
"version": "1.2.6",
"private": true,
"scripts": {
"postinstall": "npx jetify",
......@@ -8,7 +8,9 @@
"test": "jest"
},
"dependencies": {
"@types/ramda": "^0.27.39",
"moment": "2.29.1",
"ramda": "^0.27.1",
"react": "16.8.3",
"react-native": "0.59.9",
"react-native-audio": "4.3.0",
......
yarn.lock
......@@ -937,6 +937,13 @@
"@types/istanbul-lib-coverage" "*"
"@types/istanbul-lib-report" "*"
"@types/ramda@^0.27.39":
version "0.27.39"
resolved "https://registry.npm.taobao.org/@types/ramda/download/@types/ramda-0.27.39.tgz?cache=0&sync_timestamp=1615893039310&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Framda%2Fdownload%2F%40types%2Framda-0.27.39.tgz#7541d9d745a2003c8f635897dff8c65c12be9327"
integrity sha1-dUHZ10WiADyPY1iX3/jGXBK+kyc=
dependencies:
ts-toolbelt "^6.15.1"
"@types/stack-utils@^1.0.1":
version "1.0.1"
resolved "https://registry.npm.taobao.org/@types/stack-utils/download/@types/stack-utils-1.0.1.tgz?cache=0&sync_timestamp=1605057309059&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fstack-utils%2Fdownload%2F%40types%2Fstack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"
......@@ -5155,6 +5162,11 @@ querystringify@^2.1.1:
resolved "https://registry.npm.taobao.org/querystringify/download/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6"
integrity sha1-M0WUG0FTy50ILY7uTNogFqmu9/Y=
ramda@^0.27.1:
version "0.27.1"
resolved "https://registry.npm.taobao.org/ramda/download/ramda-0.27.1.tgz#66fc2df3ef873874ffc2da6aa8984658abacf5c9"
integrity sha1-Zvwt8++HOHT/wtpqqJhGWKus9ck=
randomatic@^3.0.0:
version "3.1.1"
resolved "https://registry.npm.taobao.org/randomatic/download/randomatic-3.1.1.tgz#b776efc59375984e36c537b2f51a1f0aff0da1ed"
......@@ -6519,6 +6531,11 @@ tr46@^1.0.1:
dependencies:
punycode "^2.1.0"
ts-toolbelt@^6.15.1:
version "6.15.5"
resolved "https://registry.npm.taobao.org/ts-toolbelt/download/ts-toolbelt-6.15.5.tgz#cb3b43ed725cb63644782c64fbcad7d8f28c0a83"
integrity sha1-yztD7XJctjZEeCxk+8rX2PKMCoM=
tslib@^1.9.0:
version "1.14.1"
resolved "https://registry.npm.taobao.org/tslib/download/tslib-1.14.1.tgz?cache=0&sync_timestamp=1609887539329&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftslib%2Fdownload%2Ftslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
......
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 sign in to comment