|
@@ -5,36 +5,35 @@
|
|
|
<view class="state-info" bindtap="tapState">
|
|
|
<led color="{{connectStateMap[ble.state].color}}" width="15"/> {{connectStateMap[ble.state].text}}
|
|
|
</view>
|
|
|
- <view class="state-msg" wx:if="{{ble.state == 3}}">
|
|
|
+ <view class="state-msg" wx:if="{{ble.state == bleStateEnum.connected}}">
|
|
|
{{remoteDev.devName}}
|
|
|
</view>
|
|
|
- <view class="state-msg" wx:if="{{ble.state == 0}}">
|
|
|
+ <view class="state-msg" wx:if="{{ble.state == bleStateEnum.notConnect}}">
|
|
|
<view class="custom-info-btn" bindtap="searchDevice" >扫描</view>
|
|
|
</view>
|
|
|
- <view class="state-msg" wx:if="{{ble.state == 2}}">
|
|
|
+ <view class="state-msg" wx:if="{{ble.state == bleStateEnum.connecting}}">
|
|
|
<view class="custom-info-btn" bindtap="searchDevice" >重新扫描</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
- <view class="control">
|
|
|
-
|
|
|
- </view>
|
|
|
- <view class="userinfo">
|
|
|
- <block wx:if="{{canIUseOpenData}}">
|
|
|
- <view class="userinfo-avatar" bindtap="bindViewTap">
|
|
|
- <open-data type="userAvatarUrl"></open-data>
|
|
|
+
|
|
|
+ <view class="bleDevices" wx:if="{{ble.state == bleStateEnum.searching || ble.state == bleStateEnum.connecting }}">
|
|
|
+ <view class="title">
|
|
|
+ 设备列表
|
|
|
+ <view class="mx-10 text-red">{{bleDevs.length}}</view>
|
|
|
+ </view>
|
|
|
+ <view class="devList">
|
|
|
+ <view class="devItem" wx:for="{{bleDevs}}" wx:key="deviceId" >
|
|
|
+ <view class="devInfo">
|
|
|
+ <view class="name">{{item.Name}}</view>
|
|
|
+ <view class="devId">{{item.deviceId}}</view>
|
|
|
+ </view>
|
|
|
+ <view class="option">
|
|
|
+ <view class="btn">连接</view>
|
|
|
+ </view>
|
|
|
</view>
|
|
|
- <open-data type="userNickName"></open-data>
|
|
|
- </block>
|
|
|
- <block wx:elif="{{!hasUserInfo}}">
|
|
|
- <button wx:if="{{canIUseGetUserProfile}}" bindtap="getUserProfile"> 获取头像昵称 </button>
|
|
|
- <button wx:elif="{{canIUse}}" open-type="getUserInfo" bindgetuserinfo="getUserInfo"> 获取头像昵称 </button>
|
|
|
- <view wx:else> 请使用1.4.4及以上版本基础库 </view>
|
|
|
- </block>
|
|
|
- <block wx:else>
|
|
|
- <image bindtap="bindViewTap" class="userinfo-avatar" src="{{userInfo.avatarUrl}}" mode="cover"></image>
|
|
|
- <text class="userinfo-nickname">{{userInfo.nickName}}</text>
|
|
|
- </block>
|
|
|
+ </view>
|
|
|
</view>
|
|
|
+
|
|
|
<view class="usermotto">
|
|
|
<text class="user-motto">{{motto}}</text>
|
|
|
</view>
|