Skip to content

J
jueqing
Commit a35027b2 by Ken Nakahira
Options

Revert "提交更新代码" 

This reverts commit ae3cfa0a
parent 9860459b
Showing with 53 additions and 97 deletions
pages/index/index.vue
......@@ -368,10 +368,9 @@
:style="{height: boxHeight + 'rpx'}"
:scroll-into-view="bottomElement_pangbai"
class="pangbai_content"
id="pangbaiBox"
>
<view id="scrollView">
<view class="npc" :style="{fontSize: fontSize + 'rpx'}" id="pangbaiCntainer">
<view class="npc" :style="{fontSize: fontSize + 'rpx'}">
{{yyds_pangbai}}
</view>
<!-- 最后一个元素，用于滚动定位 -->
......@@ -379,7 +378,7 @@
</view>
</scroll-view>
<image
@click="debouncedNextTips"
@click="nextTips"
src="../../static/UI/继续.png"
class="tre"
mode="scaleToFill"
......@@ -513,7 +512,6 @@ export default {
total_val:[],
fontSize:0,
boxHeight:210,
debouncedNextTips:null,
quotedData:[]
}
},
......@@ -578,7 +576,6 @@ export default {
//获取历史聊天记录 根据历史记录处理决定 websocket 的连接
this.getHistory()
this.calcFontSize(26)
this.created()
//讲完话以后 向服务器发送数据
recorderManager.onStop( res=> {
......@@ -701,46 +698,17 @@ export default {
this.loadingBG = true
},
nextTips(){
// 结算当前语音的递归 进行下一次语音
//结算当前语音的递归 进行下一次语音
// this.EPlayer.onEnded()
this.$nextTick(() => {
this.jumping = true
clearInterval(this.Strem)
if(this.EPlayer) {
this.EPlayer.stop()
}
if(this.glod_dp && this.str != "") {
console.log('Text Appended')
this.realVoice(this.str)
} else {
this.yyds_pangbai += this.str
}
this.str = ''
this.jumping = false
this.EPlayer.onended()
console.log('------------------')
});
this.jumping = true
clearInterval(this.Strem)
this.EPlayer.stop()
if(!this.kill){
this.yyds_pangbai += this.str
}
this.jumping = false
this.EPlayer.onended()
},
realVoice(text){
this.yyds_dp = text
this.yyds_pangbai += " “ "+text+ " ” "
},
debounce(fn, interval) {
var timer;
var gapTime = interval;//间隔时间，如果interval不传，则默认1000ms
return function() {
clearTimeout(timer);
var context = this;
var args = arguments;//保存此处的arguments，因为setTimeout是全局的，arguments不是防抖函数需要的。
timer = setTimeout(function() {
fn.apply(context,args);
}, gapTime);
};
},
created() {
// Bind the debounced version of nextTips
this.debouncedNextTips = this.debounce(this.nextTips, 750);
},
handleCloseDialog(){
this.show = false
},
......@@ -1783,7 +1751,7 @@ export default {
if (Cobj2.content != "") {
setTimeout(() => {
this.FetchAbuffer(Cobj2, voicer, Sarry)
}, 500)
}, 1000)
}
}).catch(err=>{
console.log(1223,err)
......@@ -1812,7 +1780,7 @@ export default {
if (Cobj.content != "") {
setTimeout(() => {
this.FetchAbuffer_real(Cobj, voicer, Sarry)
}, 500)
}, 1000)
}
})
},
......@@ -1820,49 +1788,47 @@ export default {
execFile(data,ISLIU_content){
// let arrObj = data;
// const content = arrObj[0].text;
// quoted为真 或为假 表示 真假音线
// //quoted为真 或为假 表示 真假音线
// const voicer = arrObj[0].quoted ?
// this.currentPageData.voiceGroups[1] :
// this.currentPageData.voiceGroups[0]
// const voicer = arrObj[0].quoted ? this.currentPageData.voiceGroups[1] : this.currentPageData.voiceGroups[0];
let arrObj = data;
console.log('arrObj_execFile',arrObj)
const content = arrObj[0].text;
const voicer = arrObj[0].voicer;
this.GoSay(content,voicer,(text, falg)=>{
if(!arrObj || arrObj.length == 0) {return}
if(arrObj[0].quoted){
if(text!==""&&!falg){
console.log('Quote Added')
this.glod_dp = true
// this.glod_user = false
this.yyds_dp = text
this.yyds_pangbai += " “ "+text+ " ” "
}
if (falg) {
console.log('GoSound讲话完毕！')
arrObj.shift()
console.log('arrObj',arrObj)
if(arrObj.length!==0){
this.execFile(arrObj)
}
}
}else {
if (text !== "" && !falg) {
this.kill = false
this.delayText(text)
}
if (falg) {
console.log('GoSay讲话完毕！')
this.kill = true
arrObj.shift()
console.log('arrObj', arrObj)
if (arrObj.length !== 0) {
this.execFile(arrObj)
}
}
}
if(arrObj[0].quoted){
if(text!==""&&!falg){
this.glod_dp = true
// this.glod_user = false
this.yyds_dp = text
this.yyds_pangbai += " “ "+text+ " ” "
}
if (falg) {
console.log('GoSound讲话完毕！')
arrObj.shift()
console.log('arrObj',arrObj)
if(arrObj.length!==0){
this.execFile(arrObj)
}
}
}else{
if(text!==""&&!falg){
this.kill = false
this.delayText(text)
}
if (falg) {
console.log('GoSay讲话完毕！')
this.kill = true
arrObj.shift()
console.log('arrObj',arrObj)
if(arrObj.length!==0){
this.execFile(arrObj)
}
}
}
})
// if(this.soundVoice[voicer]){
......@@ -1922,7 +1888,7 @@ export default {
if(count.length==0){
clearInterval(this.Strem)
}
}, 50);
}, 100);
},
createSSML(text, voiceName) {
......@@ -1938,13 +1904,11 @@ export default {
// GoSound 真人音线
GoSound(content, voicer, CB) {
// 要读的文字 声线 回调
console.log('First')
const that = this
let Sarry = [];
this.Cobj = this.computeLen({ content });
this.str = this.Cobj.Sr
this.glod_dp = true
uni.request({
url: 'https://admin.mindepoch.com:8089/VoiceMode/GetVoiceEcho',
method: 'post',
......@@ -2020,8 +1984,6 @@ export default {
that.jumping = false
Rfunc()
}else{
console.log('Checkpoint')
this.str = Sobj.S
that.tempFilePath2 = wx.env.USER_DATA_PATH + `/tempAudio_${new Date().getTime()}.mp3`;
FileSystemManager.writeFile({
filePath: that.tempFilePath2,
......@@ -2048,7 +2010,7 @@ export default {
if (that.Cobj.content != "") {
setTimeout(() => {
that.FetchAbuffer_real(that.Cobj, voicer, Sarry, CB)
}, 2000)
}, 5000)
}
},
fail:(err)=>{
......@@ -2104,7 +2066,6 @@ export default {
console.log('oooGoSayooo')
this.EPlayer.cb = CB
var Rfunc = () => {
console.log('Sarry',Sarry)
if(this.jumping){
return
}
......@@ -2142,8 +2103,6 @@ export default {
this.jumping = false
Rfunc()
}else{
console.log('Checkpoint')
this.str = Sobj.S
this.tempFilePath2 = wx.env.USER_DATA_PATH + `/tempAudio_${new Date().getTime()}.mp3`;
// const mark = that.Cobj2.Sr
FileSystemManager.writeFile({
......@@ -2169,7 +2128,7 @@ export default {
if (this.Cobj2.content != "") {
setTimeout(() => {
this.FetchAbuffer(this.Cobj2, voicer, Sarry, CB)
}, 2000)
}, 5000)
}
},
......@@ -3184,7 +3143,7 @@ export default {
bottom:0;
left:50%;
transform:translateX(-50%);
padding-bottom: 40rpx;
padding-bottom: 30rpx;
}
.pangbai_title{
height: 76rpx;
......@@ -3356,6 +3315,7 @@ export default {
.tre{
position:absolute;
right:30rpx;
bottom:-250rpx;
width:36rpx;
height:27rpx;
z-index:99;
......
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
This source diff could not be displayed because it is too large. You can view the blob instead.
unpackage/dist/dev/mp-weixin/pages/index/index.js
This source diff could not be displayed because it is too large. You can view the blob instead.
unpackage/dist/dev/mp-weixin/pages/index/index.wxss
......@@ -958,7 +958,7 @@ to {
left:50%;
-webkit-transform:translateX(-50%);
transform:translateX(-50%);
padding-bottom: 40rpx;
padding-bottom: 30rpx;
}
.pangbai_title.data-v-57280228{
height: 76rpx;
......@@ -1128,6 +1128,7 @@ to {
.tre.data-v-57280228{
position:absolute;
right:30rpx;
bottom:-250rpx;
width:36rpx;
height:27rpx;
z-index:99;
......
unpackage/dist/dev/mp-weixin/project.config.json
......@@ -6,11 +6,6 @@
},
"setting": {
"urlCheck": false,
"es6": false,
"postcss": false,
"minified": false,
"newFeature": true,
"bigPackageSizeSupport": true,
"babelSetting": {
"ignore": [],
"disablePlugins": [],
......
unpackage/dist/dev/mp-weixin/uni_modules/zebra-swiper/components/z-swiper/z-swiper.js
This source diff could not be displayed because it is too large. You can view the blob instead.
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