Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1

Conflicts:
	fangija-zsyf/config.js
	fangija-zsyf/manifest.json
	fangija-zsyf/views/news/newsDetail.html
This commit is contained in:
2018-03-27 13:56:28 +08:00
5 changed files with 137 additions and 45 deletions
+1
View File
@@ -2,5 +2,6 @@
//var BASE_PATH = "http://192.168.10.128:8084";
//var BASE_PATH = "http://192.168.10.47:8086";
var BASE_PATH = "http://192.168.10.53:8084";
var BASE_PATH = "http://192.168.10.171:8084";
/**是否显示过启动页面**/
var lauchFlag = false;
+89
View File
@@ -0,0 +1,89 @@
/**
*
* 更新分享服务
*/
function updateSerivces(){
plus.share.getServices( function(s){
shares={};
for(var i in s){
var t=s[i];
shares[t.id]=t;
}
}, function(e){
alert("获取分享服务列表失败:"+e.message );
} );
}
/**
* 分享操作
* @param {JSON} sb 分享操作对象s.s为分享通道对象(plus.share.ShareService)
* @param {Boolean} bh 是否分享链接
*/
function shareAction(sb,bh) {
if(!sb||!sb.s){
alert("无效的分享服务!");
return;
}
var msg={content:sharehrefDes,extra:{scene:sb.x}};
if(bh){
msg.href=shareUrl;
if(sharehrefTitle&&sharehrefTitle!=""){
msg.title=sharehrefTitle;
}
if(sharehrefDes&&sharehrefDes!=""){
if(sb.title=="新浪微博"){
msg.content=shareUrl+sharehrefDes;
}else{
msg.content=sharehrefDes;
}
}
msg.thumbs=["_www/logo.png"];
msg.pictures=["_www/logo.png"];
}else{
if(pic&&pic.realUrl){
msg.pictures=[pic.realUrl];
}
}
// 发送分享
if ( sb.s.authenticated ) {
shareMessage(msg,sb.s);
} else {
alert("---未授权---");
sb.s.authorize( function(){
shareMessage(msg,sb.s);
},function(e){
alert("认证授权失败:"+e.code+" - "+e.message );
});
}
}
/**
* 发送分享消息
* @param {JSON} msg
* @param {plus.share.ShareService} s
*/
function shareMessage(msg,s){
s.send( msg, function(){
alert("分享到\""+s.description+"\"成功! " );
}, function(e){
alert( "分享到\""+s.description+"\"失败 !");
} );
}
// 分析链接
function shareHref(){
var shareBts=[];
// 更新分享列表
var ss=shares['weixin'];
ss&&ss.nativeClient&&(shareBts.push({title:'微信朋友圈',s:ss,x:'WXSceneTimeline'}),
shareBts.push({title:'微信好友',s:ss,x:'WXSceneSession'}));
ss=shares['qq'];
ss&&ss.nativeClient&&shareBts.push({title:'QQ',s:ss});
ss=shares['sinaweibo'];
ss&&shareBts.push({title:'新浪微博',s:ss});
// 弹出分享列表
shareBts.length>0?plus.nativeUI.actionSheet({title:'分享链接',cancel:'取消',buttons:shareBts},function(e){
(e.index>0)&&shareAction(shareBts[e.index-1],true);
}):plus.nativeUI.alert('当前环境无法支持分享链接操作!');
}
+6 -42
View File
@@ -39,9 +39,7 @@
"Console": {
"description": "调试输出日志"
},
"Contacts": {
"description": "系统通讯录"
},
"Device": {
"description": "设备信息"
},
@@ -63,9 +61,7 @@
"Invocation": {
"description": "Native.js能力"
},
"Messaging": {
"description": "消息通讯"
},
"Orientation": {
"description": "方向传感器"
},
@@ -111,7 +107,7 @@
"Push": {
"description": "消息推送"
}
},"Statistic":{},"Share":{}
},
"plus": {
"error": {
@@ -168,39 +164,7 @@
"password": "",/*Android应用打包使用密钥库中证书的密码*/
"aliasname": "",/*Android应用打包使用密钥库中证书的别名*/
"ImmersedStatusbar": true,/*Android平台开启沉浸式状态栏样式*/
"permissions": [
"<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
"<uses-permission android:name=\"android.permission.GET_TASKS\"/>",
"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
"<uses-permission android:name=\"android.permission.SYSTEM_ALERT_WINDOW\"/>",
"<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.RECEIVE_BOOT_COMPLETED\"/>",
"<uses-permission android:name=\"com.android.launcher.permission.UNINSTALL_SHORTCUT\"/>",
"<uses-permission android:name=\"android.permission.CAMERA\"/>",
"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
"<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
"<uses-permission android:name=\"com.android.launcher.permission.INSTALL_SHORTCUT\"/>",
"<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
"<uses-permission android:name=\"android.permission.SEND_SMS\"/>",
"<uses-permission android:name=\"android.permission.INTERNET\"/>",
"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
"<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
"<uses-feature android:name=\"android.hardware.camera\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
"<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
"<uses-permission android:name=\"android.permission.WRITE_SMS\"/>",
"<uses-permission android:name=\"android.permission.READ_SMS\"/>"
]
"permissions": ["<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>","<uses-permission android:name=\"android.permission.GET_TASKS\"/>","<uses-permission android:name=\"android.permission.VIBRATE\"/>","<uses-permission android:name=\"android.permission.READ_LOGS\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.SYSTEM_ALERT_WINDOW\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.RECEIVE_BOOT_COMPLETED\"/>","<uses-permission android:name=\"com.android.launcher.permission.UNINSTALL_SHORTCUT\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>","<uses-permission android:name=\"com.android.launcher.permission.INSTALL_SHORTCUT\"/>","<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>","<uses-permission android:name=\"android.permission.INTERNET\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-permission android:name=\"android.permission.CALL_PHONE\"/>","<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>","<uses-feature android:name=\"android.hardware.camera\"/>","<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>","<uses-permission android:name=\"android.permission.RECEIVE_USER_PRESENT\"/>","<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"]
},
"orientation": [
"portrait-primary"
@@ -291,7 +255,7 @@
}
},
"plugins": {
"statics": {},
"statics": {"umeng":{"appkey_ios":"5ab09d69a40fa374da0002e4","channelid_ios":"有房IOS","appkey_android":"5ab09e16f29d9854f200026e","channelid_android":"有房Android"}},
"maps": {
"baidu": {/*配置应用使用百度地图,参考http://ask.dcloud.net.cn/article/29*/
"appkey_ios": "cmXf4GGYGYiu1fuVRN4847cGvgR25WTV",/*iOS平台百度地图appkey*/
@@ -307,7 +271,7 @@
"description": "个推推送"
}
},
"share": {},
"share": {"weixin":{"description":"可选,微信分享"}},
"payment": {},
"oauth": {
"weixin": {
+15 -1
View File
@@ -23,6 +23,9 @@
<button class="button button-link button-nav pull-left" onclick="back(),plus.nativeUI.closeWaiting();">
<span class="mui-icon mui-icon mui-icon-arrowleft"></span>
</button>
<button class="button button-link button-nav pull-right open-popover" onclick="shareHref()">
<span class="icon icon-path"></span>
</button>
<h1 class="title"></h1>
</header>
<div class="content contentText infinite-scroll infinite-scroll-bottom" data-distance="40">
@@ -94,18 +97,26 @@ $.config = {router: false}
<script type="text/javascript" src="../../js/common.js" ></script>
<script type="text/javascript" src="../../js/axios.min.js"></script>
<script type="text/javascript" src="../../js/shara/sharaMine.js" ></script>
<script>
document.addEventListener('plusready', onPlusReady, false);
var id = "183627425584775168";
var shareUrl = BASE_PATH+"/news/newDetail?newsId=";
var sharehrefTitle = "停车坐爱枫林晚,霜叶红于二月花";
var sharehrefDes = "客观里面请!";
var shareId='';
function onPlusReady() {
var self = plus.webview.currentWebview();
id = self.newsId;
shareId = id
shareUrl = shareUrl+id
$.ajax({
type : 'get',
url : BASE_PATH + "/rest/news/detail",
data:{newsId:id},
dataType:'json',
async:true,
async:false,
success:function(result){
if(result.code==200){
data = result.data
@@ -120,11 +131,14 @@ function onPlusReady() {
$("#newsPraise").text(data.thumbsUpCount);
//预先加载20条
sharehrefTitle = data.title
sharehrefDes = data.introduction
}
},
error:function(){
}
})
updateSerivces();
}
+26 -2
View File
@@ -1332,14 +1332,18 @@ function initBaseInfo(city,region,address,lat,lng){
}
if(response.data.data.momRateType>0){
$("#momRateTypeClass").removeClass("icon-arrow-green");
$("#momRateTypeClass").addClass("icon-arrow-red");
}else{
$("#momRateTypeClass").removeClass("icon-arrow-red");
$("#momRateTypeClass").addClass("icon-arrow-green");
}
if(response.data.data.priceRateType>0){
$("#priceRateTypeClass").removeClass("icon-arrow-green");
$("#priceRateTypeClass").addClass("icon-arrow-red");
$("#priceInfo").text("上涨概率");
}else{
$("#priceRateTypeClass").removeClass("icon-arrow-red");
$("#priceRateTypeClass").addClass("icon-arrow-green");
$("#priceInfo").text("下跌概率");
}
@@ -1359,6 +1363,7 @@ function initBaseInfo(city,region,address,lat,lng){
}
var regionList=[];
function loadRegion(){
$("#region").picker({
toolbarTemplate: '<header class="bar bar-nav bar-nav01 bar-nav01c">\
@@ -1373,6 +1378,20 @@ function loadRegion(){
],onOpen:function(p){
p.cols[0].replaceValues(regionList)
//p.updateValue();
},onClose:function(p){
var region_copy = $("#region_copy").val();
var flag = false;
$("body").delegate("#regionStatusButton", "click", function () {
flag = true;
if(region_copy != p.value[0]){
$("#region_copy").val(p.value[0]);
$("#region").val(p.value[0]);
changeRegion();
}
});
if(!flag){
$("#region").val(region_copy);
}
}
});
}
@@ -1463,7 +1482,7 @@ function initNews(){
console.log(error);
});
}
$("body").delegate("#regionStatusButton", "click", function () {
/*$("body").delegate("#regionStatusButton", "click", function () {
var region_copy = $("#region_copy").val();
var value = $(".picker-selected").text();
if(region_copy != value && value!="" && value!=null){
@@ -1478,7 +1497,7 @@ $("#region").click(function(e){
changeRegion();
}
})
})
})*/
$("body").delegate(".icon-light-red", "click", function () {
var id = $(this).attr("data-val");
@@ -1540,17 +1559,22 @@ function changeRegion(){
regionChange(response.data.data.region);
if(response.data.data.momRateType>0){
$("#momRateTypeClass").removeClass("icon-arrow-green");
$("#momRateTypeClass").addClass("icon-arrow-red");
}else{
$("#momRateTypeClass").removeClass("icon-arrow-red");
$("#momRateTypeClass").addClass("icon-arrow-green");
}
if(response.data.data.priceRateType>0){
$("#priceRateTypeClass").removeClass("icon-arrow-green");
$("#priceRateTypeClass").addClass("icon-arrow-red");
$("#priceInfo").text("上涨概率");
}else{
$("#priceRateTypeClass").removeClass("icon-arrow-red");
$("#priceRateTypeClass").addClass("icon-arrow-green");
$("#priceInfo").text("下跌概率");
}
$("#region_copy").val(response.data.data.region);
})