hanchong 1 жил өмнө
parent
commit
1d7a6bfb89

+ 11 - 5
pages/data/data.js

@@ -1704,6 +1704,7 @@ Page({
 	sleep_durationCountA: 0,//睡眠时间
 	sns: [],
 	tvEntityIds: [],
+	ifOneMoreTV: false,//数据推送是否有多于一台电视
 	selectedValue: '', // 用于存储选中的值  
 	tvEntityIdsValue: '', // 用于存储选中的值 
 	selectedIndex: 0, // 默认选中第一个选项
@@ -1867,6 +1868,9 @@ Page({
 	  }); 
 	  this.telScreeProjection(selectedOption.entity_id);
 	},
+	tvEntityIdChange: function(e) {
+	  this.telScreeProjection();
+	},
 	onPickerChange: function(e) {
 	 var that = this;
 	 var selectedOption = this.data.sns[e.detail.value];  
@@ -3229,10 +3233,11 @@ initChart00(canvas, width, height,reportId){
 						},
 						success(ress) {
 							console.log('wx.getStorageSync(tvEntityId)='+wx.getStorageSync('tvEntityId'));
-							console.log('tvEntityId='+tvEntityId);
-							if(ress && ress.data && wx.getStorageSync('tvEntityId')){
+							console.log('tvEntityId='+JSON.stringify(tvEntityId));
+							let tvEntityIdss = tvEntityId?tvEntityId:wx.getStorageSync('tvEntityId')
+							if(ress && ress.data && tvEntityIdss){
 								console.log("ress.data=="+JSON.stringify(ress.data.url));
-								console.log("wx.getStorageSync(tvEntityId)=="+wx.getStorageSync('tvEntityId'));
+								console.log("tvEntityIdss=="+tvEntityIdss);
 								wx.request({
 									// url: `${homeApi_http}`+':'+`${homeApi_http_port}`+'/api/services/media_player/play_media', //http 
 									// url: `${homeApi_https}`+'/api/services/media_player/play_media',  //https
@@ -3243,7 +3248,7 @@ initChart00(canvas, width, height,reportId){
 											  'Authorization': 'Bearer ' + token // 在头部设置认证信息,例如使用Bearer Token
 									  },
 									data:{
-									    "entity_id": wx.getStorageSync('tvEntityId'),
+									    "entity_id": tvEntityIdss,
 									//     "media_content_id": ress.data.url,
 										// "media_content_id": 'https://alifei01.cfp.cn/creative/vcg/800/new/VCG41175510742.jpg',
 										// "media_content_id": 'https://alifei01.cfp.cn/creative/vcg/veer/1600water/veer-368621010.jpg',
@@ -3288,7 +3293,7 @@ initChart00(canvas, width, height,reportId){
 									isLoading: false,  
 								});
 								wx.showToast({
-								  title: '电视找不到,推送失败',  
+								  title: '找不到电视,推送失败',  
 								  icon: 'none'  
 								}); 
 							}
@@ -3524,6 +3529,7 @@ initChart00(canvas, width, height,reportId){
 														sleep_durationCountA:that.convertTimeToHoursAndMinutes(sleep_durationCount?sleep_durationCount.toString():'0'),
 														sns:res.data,
 														tvEntityIds:wx.getStorageSync('tvEntityIds'),
+														ifOneMoreTV:(wx.getStorageSync('tvEntityIds') && wx.getStorageSync('tvEntityIds').length>1),
 														hotelname:res.data[0].hn,
 														rdeep_duration_efficiency:rdeep_duration_efficiency_temp,
 														rlight_duration_efficiency:rlight_duration_efficiency_temp,

+ 4 - 2
pages/data/data.wxml

@@ -77,8 +77,10 @@
   		<image class="data-image_c00" src="/static/images/report/yuebao_new.png" mode="aspectFit"></image>
   		<text class="data-text_c00">月报  </text>
   		<image class="data-image_c00" src="/static/images/report/tuisong_new.png" mode="aspectFit"></image>
-  		<text class="data-text_c00" bindtap="telScreeProjection">推送电视  </text>
-
+		<picker mode="selector" range-key="friendly_name1" range="{{tvEntityIds}}" value="{{tvEntityIdsIndex}}" bindchange="tvEntityIdsChange" wx:if="{{ifOneMoreTV}}">
+			<text class="data-text_c00">推送电视  </text>  
+		</picker>
+		<text class="data-text_c00" bindtap="tvEntityIdChange" wx:else>推送电视  </text>
       </view>  
       <view class="data-item_c00 right_c00">   
         <picker mode="selector" range-key="pos" range="{{sns}}" value="{{selectedIndex}}" bindchange="onPickerChange">

+ 8 - 0
pages/index/index.js

@@ -2728,6 +2728,10 @@ onSelect_beep1(e) {
 									  }
 									  obj.friendly_name1 = resData[i].attributes.friendly_name;
 									  tvEntityIdsTemp.push(obj);
+									  // let obj1 = {};
+									  // obj1.entity_id = obj.entity_id;
+									  // obj1.friendly_name1 = resData[i].attributes.friendly_name;
+									  // tvEntityIdsTemp.push(obj1);
 									  tvEntityIdTemp = obj.entity_id;
 									  // console.log('obj===='+obj);
 									  // console.log('tvEntityIdTemp='+tvEntityIdTemp);
@@ -3196,6 +3200,10 @@ onSelect_beep1(e) {
 								  }
 								  obj.friendly_name1 = resData[i].attributes.friendly_name;
 								  tvEntityIdsTemp.push(obj);
+								  // let obj1 = {};
+								  // obj1.entity_id = obj.entity_id;
+								  // obj1.friendly_name1 = resData[i].attributes.friendly_name;
+								  // tvEntityIdsTemp.push(obj1);
 								  tvEntityIdTemp = obj.entity_id;
 								  // console.log('obj===='+obj);
 								  // console.log('tvEntityIdTemp='+tvEntityIdTemp);

+ 3 - 3
pages/index/index.wxml

@@ -131,8 +131,8 @@
 			</view>
 			<view class="data-card__value">
 				<view class="tv_button-container">
-				  <button class=" {{(item.app_id=='com.xiaomi.mitv.tvplayer'||item.app_name=='模拟电视')?'tv_disabled-button':'tv_custom-button'}}" bindtap="tvFanChange" data-id="{{item.entity_id}}" data-fan="TV">电视模式</button>  
-				  <button class=" {{(item.app_id=='com.xiaomi.mitv.tvplayer'||item.app_name=='模拟电视')?'tv_custom-button':'tv_disabled-button'}}" bindtap="tvFanChange" data-id="{{item.entity_id}}" data-fan="HDMI2">机顶盒模式</button>  
+				  <button class=" {{(item.app_id=='com.xiaomi.mitv.tvplayer'||item.app_name=='模拟电视')?'tv_disabled-button':'tv_custom-button'}}" bindtap="tvFanChange" data-id="{{item.entity_id}}" data-fan="当贝桌面">电视模式</button>  
+				  <button class=" {{(item.app_id=='com.xiaomi.mitv.tvplayer'||item.app_name=='模拟电视')?'tv_custom-button':'tv_disabled-button'}}" bindtap="tvFanChange" data-id="{{item.entity_id}}" data-fan="HDMI1">机顶盒模式</button>  
 				</view>
 			</view>
 		  </view>
@@ -189,7 +189,7 @@
 		  			  <view class="data-card__value1">
 		  			  <!-- <button class="{{isButtonPressedHumidityUp ? 'round-gradient-button-pressed' : 'round-gradient-button'}} {{isClickedOnHumidifierUp ? 'clicked' : ''}}" bindtap="onHumidifierUp" style="width: 120rpx;height: 70rpx;" data-state='{{item.state}}' data-id="{{item.entity_id}}" data-domain='{{item.domain}}' data-min='{{item.min}}' data-max='{{item.max}}' data-humidity='{{item.humidity}}'>增加+</button>
 		  			  -->
-					  <slider class="tui-slider-box" bindtouchend="handleTouchEndHumidifier" bindchanging="handleChangingHumidifier" bindchange="changeHumidity" step="1" min="{{item.min}}" max="{{item.max}}" data-id="{{item.entity_id}}" data-index='{{index}}' data-domain='{{item.domain}}' value="{{item.humidity}}" min="{{item.min}}" max="{{item.max}}"  data-humidity='{{item.humidity}}'>
+					  <slider style="width:100%;margin:20rpx 20rpx 0rpx 0rpx" bindtouchend="handleTouchEndHumidifier" bindchanging="handleChangingHumidifier" bindchange="changeHumidity" step="1" min="{{item.min}}" max="{{item.max}}" data-id="{{item.entity_id}}" data-index='{{index}}' data-domain='{{item.domain}}' value="{{item.humidity}}" min="{{item.min}}" max="{{item.max}}"  data-humidity='{{item.humidity}}'>
 						<text style="color:white">{{sliderValueHumidifier}}</text>
 					  </slider>	
 					  </view>