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