Browse Source

备份3.6.0

master
wangchengxin 4 years ago
parent
commit
7a163fc4ee
  1. 4
      app/build.gradle
  2. 11
      app/src/main/AndroidManifest.xml
  3. 876
      app/src/main/java/cn/shangyu/gdxzPatient/activity/ClinicalDetailsActivity.java
  4. 913
      app/src/main/java/cn/shangyu/gdxzPatient/activity/GanDanDetailsActivity.java
  5. 831
      app/src/main/java/cn/shangyu/gdxzPatient/activity/GanDanHouseDetialActivity.java
  6. 15
      app/src/main/java/cn/shangyu/gdxzPatient/activity/HospitalDetialActivity.java
  7. 8
      app/src/main/java/cn/shangyu/gdxzPatient/activity/LeaveMsgActivity.java
  8. 7
      app/src/main/java/cn/shangyu/gdxzPatient/activity/MoreLeaseMsgActivity.java
  9. 18
      app/src/main/java/cn/shangyu/gdxzPatient/activity/SettingFeedbackActivity.java
  10. 24
      app/src/main/java/cn/shangyu/gdxzPatient/activity/WriteTopicActivity.java
  11. 78
      app/src/main/java/cn/shangyu/gdxzPatient/bean/Child.java
  12. 192
      app/src/main/java/cn/shangyu/gdxzPatient/bean/NewCommentBean.java
  13. 111
      app/src/main/java/cn/shangyu/gdxzPatient/pointsmall/PointsMallActivity.java
  14. 29
      app/src/main/java/cn/shangyu/gdxzPatient/pointsmall/ProductDetailActivity.java
  15. 50
      app/src/main/java/cn/shangyu/gdxzPatient/utils/Url.java
  16. 84
      app/src/main/java/cn/shangyu/gdxzPatient/widget/CommentExpandableListView.java
  17. BIN
      app/src/main/res/drawable-xhdpi/cb_nocheck.png
  18. BIN
      app/src/main/res/drawable-xxhdpi/coll.png
  19. BIN
      app/src/main/res/drawable-xxhdpi/exp.png
  20. 36
      app/src/main/res/layout/activity_gd_detail.xml
  21. 57
      app/src/main/res/layout/activity_house_detial.xml
  22. 4
      app/src/main/res/layout/activity_house_top.xml
  23. 75
      app/src/main/res/layout/activity_pointsmall.xml
  24. 91
      app/src/main/res/layout/item_comment_new.xml
  25. 82
      app/src/main/res/layout/item_comment_new_p.xml
  26. 9
      app/src/main/res/xml/network_security_config.xml

4
app/build.gradle

@ -20,8 +20,8 @@ android {
applicationId "cn.shangyu.gdxzPatient"
minSdkVersion 19
targetSdkVersion 26
versionCode 72
versionName "3.5.9"
versionCode 73
versionName "3.6.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
multiDexEnabled true
// signingConfig signingConfigs.config

11
app/src/main/AndroidManifest.xml

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="cn.shangyu.gdxzPatient"
android:versionCode="72"
android:versionName="3.5.9" >
android:versionCode="73"
android:versionName="3.6.0" >
<uses-sdk
android:minSdkVersion="14"
@ -112,7 +112,6 @@
android:hardwareAccelerated="true"
android:icon="@drawable/logo"
android:label="@string/app_name"
android:theme="@android:style/Theme.Light.NoTitleBar" >
@ -501,7 +500,8 @@
android:screenOrientation="portrait" >
</activity>
<!-- 临床招募详情的界面 -->
<activity android:name="cn.shangyu.gdxzPatient.activity.ClinicalDetailsActivity" >
<activity android:name="cn.shangyu.gdxzPatient.activity.ClinicalDetailsActivity"
android:windowSoftInputMode="adjustUnspecified|stateHidden">
</activity>
<service android:name="cn.shangyu.gdxzPatient.UpdateService" >
</service>
@ -840,7 +840,8 @@
<!-- 门诊详情 -->
<activity
android:name=".activity.OrdersDetailClinicActivity"
android:screenOrientation="portrait" >
android:screenOrientation="portrait"
>
</activity>
<!-- 包月详情 -->
<activity

876
app/src/main/java/cn/shangyu/gdxzPatient/activity/ClinicalDetailsActivity.java

File diff suppressed because it is too large

913
app/src/main/java/cn/shangyu/gdxzPatient/activity/GanDanDetailsActivity.java

File diff suppressed because it is too large

831
app/src/main/java/cn/shangyu/gdxzPatient/activity/GanDanHouseDetialActivity.java

File diff suppressed because it is too large

15
app/src/main/java/cn/shangyu/gdxzPatient/activity/HospitalDetialActivity.java

@ -525,6 +525,11 @@ public class HospitalDetialActivity extends BaseActivity implements
.getGandanHospitalMsssage().get(1)
.getPublish_realname().substring(0, 1)
+ "**");
}else
{
tv_patient_name2.setText("(**");
}
tv_doc_comprehensive2.setText(bean.getData()
.getGandanHospitalMsssage().get(1).getScoretotal()
+ "");
@ -587,7 +592,7 @@ public class HospitalDetialActivity extends BaseActivity implements
ImageOptions
.getImageOptions(R.drawable.img_gandan_house));
}
}
}
@ -599,6 +604,12 @@ public class HospitalDetialActivity extends BaseActivity implements
tv_patient_name.setText(bean.getData().getGandanHospitalMsssage()
.get(0).getPublish_realname().substring(0, 1)
+ "**");
}
else
{
tv_patient_name.setText("(**");
}
tv_doc_comprehensive.setText(bean.getData()
.getGandanHospitalMsssage().get(0).getScoretotal()
+ "");
@ -653,7 +664,7 @@ public class HospitalDetialActivity extends BaseActivity implements
.getImageOptions(R.drawable.img_gandan_house));
}
}
}
private class GandanVideoListAdapter extends BaseAdapter {

8
app/src/main/java/cn/shangyu/gdxzPatient/activity/LeaveMsgActivity.java

@ -183,9 +183,17 @@ public class LeaveMsgActivity extends BaseActivity implements
LeaseMsgDataBean bean = GsonTools.fromGsonToBean(result,
LeaseMsgDataBean.class);
if(!StringUtil.isEmpty(bean.getData().getPublish_realname()))
{
tv_case_name1.setText(bean.getData().getPublish_realname()
.substring(0, 1)
+ "**");
}
else
{
tv_case_name1.setText("(**");
}
tv_scoretotal1.setText(bean.getData().getScoretotal() + "");
tv_1score1.setText(bean.getData().getScore1() + "");
tv_1score2.setText(bean.getData().getScore2() + "");

7
app/src/main/java/cn/shangyu/gdxzPatient/activity/MoreLeaseMsgActivity.java

@ -364,7 +364,14 @@ public class MoreLeaseMsgActivity extends BaseActivity implements
} else {
vh = (ViewHolder) arg1.getTag();
}
if(!StringUtil.isEmpty(DocList.get(arg0).getPublish_realname()))
{
vh.tv_case_name1.setText(DocList.get(arg0).getPublish_realname().substring(0, 1)+"**");
}
else
{
vh.tv_case_name1.setText("(**");
}
vh.tv_scoretotal1.setText(DocList.get(arg0).getScoretotal() + "");
vh.tv_1score1.setText(DocList.get(arg0).getScore1() + "");
vh.tv_1score2.setText(DocList.get(arg0).getScore2() + "");

18
app/src/main/java/cn/shangyu/gdxzPatient/activity/SettingFeedbackActivity.java

@ -3,9 +3,11 @@ package cn.shangyu.gdxzPatient.activity;
import cn.shangyu.gdxzPatient.R;
import cn.shangyu.gdxzPatient.ecdemo.common.utils.ToastUtil;
import cn.shangyu.gdxzPatient.utils.KeDaXunFeiUtil;
import cn.shangyu.gdxzPatient.utils.StringUtil;
import android.Manifest;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.os.Build;
import android.os.Bundle;
@ -14,6 +16,7 @@ import android.text.TextUtils;
import android.view.KeyEvent;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.inputmethod.InputMethodManager;
import android.widget.EditText;
import android.widget.ImageButton;
import android.widget.RelativeLayout;
@ -74,9 +77,24 @@ public class SettingFeedbackActivity extends Activity implements
Intent intent1 = new Intent();
if (!TextUtils.isEmpty(mName.getText().toString().trim())) {
if(StringUtil.isEmpty(name))
{
// InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
// imm.hideSoftInputFromWindow(mName.getWindowToken(), 0);
// intent1.putExtra("content", "");
// SettingFeedbackActivity.this.setResult(500, intent1); //当评论用户名为空时,无法回复
ToastUtil.showMessage("该评论无法回复");
return;
}
else
{
intent1.putExtra("content", mName.getText().toString().trim()
+ " || " + name + ":" + content);
SettingFeedbackActivity.this.setResult(FEED_BACK, intent1);
}
finish();
finish();
}

24
app/src/main/java/cn/shangyu/gdxzPatient/activity/WriteTopicActivity.java

@ -703,10 +703,30 @@ public class WriteTopicActivity extends BaseActivity implements OnClickListener
parameters);
// 请求网络,添加病例
String result = httpResult.getString();// str为服务器返回的json串
if (!StringUtil.isEmpty(result)) {
try {
if (!StringUtil.isEmpty(result))
{
JSONObject jsonObject=new JSONObject(result);
String code=jsonObject.getString("code");
String message=jsonObject.getString("message");
if(StringUtil.isOneToCode(code))
{
if (pd.isShowing()) {
pd.dismiss();
}
ToastUtil.showMessage(message);
}
else
{
handler1.sendEmptyMessage(11);
}
}
} catch (JSONException e) {
e.printStackTrace();
}
};
}.start();

78
app/src/main/java/cn/shangyu/gdxzPatient/bean/Child.java

@ -0,0 +1,78 @@
package cn.shangyu.gdxzPatient.bean;
public class Child {
private String comment_uuid;
private String photo;
private String user_uuid;
private String create_date;
private String parent_id;
private String name;
private String id;
private String content;
public String getComment_uuid() {
return comment_uuid;
}
public void setComment_uuid(String comment_uuid) {
this.comment_uuid = comment_uuid;
}
public String getPhoto() {
return photo;
}
public void setPhoto(String photo) {
this.photo = photo;
}
public String getUser_uuid() {
return user_uuid;
}
public void setUser_uuid(String user_uuid) {
this.user_uuid = user_uuid;
}
public String getCreate_date() {
return create_date;
}
public void setCreate_date(String create_date) {
this.create_date = create_date;
}
public String getParent_id() {
return parent_id;
}
public void setParent_id(String parent_id) {
this.parent_id = parent_id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getContent() {
return content;
}
public void setContent(String content) {
this.content = content;
}
}

192
app/src/main/java/cn/shangyu/gdxzPatient/bean/NewCommentBean.java

@ -0,0 +1,192 @@
package cn.shangyu.gdxzPatient.bean;
import java.util.List;
public class NewCommentBean {
/**
*
* {
* "code": "200",
* "data": [{
* "comment_uuid": "tXZ8MkquLFWThrN29F6",
* "photo": "book/pdf/2016/20160714092534.jpg",
* "user_uuid": "3La2JEVcQKV0numtgpy",
* "create_date": "2019-12-20 11:50",
* "parent_id": null,
* "childs": [{
* "comment_uuid": "OmR65DNd4QGsL7HWabB",
* "photo": "expert/2019-11-07/bdea2d7841f14b01a5a93c388a9040a7.jpg",
* "user_uuid": "ql4gO6C90QjOhbo4azY",
* "create_date": "2020-09-24 10:54",
* "parent_id": 0,
* "childs": [{
* "comment_uuid": "xah8kM0SyBD6FsIk2sF",
* "photo": "expert/2020-09-17/c94da2f754884080a5502192bb94947b.jpg",
* "user_uuid": "OSUO0OxAz5n0OlnD7hH",
* "create_date": "2020-09-24 11:51",
* "parent_id": 0,
* "childs": [],
* "name": "杰瑞97",
* "id": 3,
* "content": "hh "
* }],
* "name": "高振宇",
* "id": 2,
* "content": "我们都要 "* }, {
* "comment_uuid": "xah8kM0SyBD6FsIk2sF",
* "photo": "expert/2020-09-17/c94da2f754884080a5502192bb94947b.jpg",
* "user_uuid": "OSUO0OxAz5n0OlnD7hH",
* "create_date": "2020-09-24 11:51",
* "parent_id": 0,
* "childs": [],
* "name": "杰瑞97",
* "id": 3,
* "content": "hh "* }, {
* "comment_uuid": "EqoeYpHaqgRh0YDwqsE",
* "photo": "expert/2019-11-07/bdea2d7841f14b01a5a93c388a9040a7.jpg",
* "user_uuid": "ql4gO6C90QjOhbo4azY",
* "create_date": "2020-09-24 14:25",
* "parent_id": 0,
* "childs": [],
* "name": "高振宇",
* "id": 4,
* "content": "我们都要学会感恩回馈大家分享一个样纸,这些都不知道是哪个部门的 "* }, {
* "comment_uuid": "vgQrSB8QbixOq7qsYuo",
* "photo": "expert/2019-11-07/bdea2d7841f14b01a5a93c388a9040a7.jpg",
* "user_uuid": "ql4gO6C90QjOhbo4azY",
* "create_date": "2020-09-24 15:30",
* "parent_id": 0,
* "childs": [],
* "name": "高振宇",
* "id": 7,
* "content": "你们是谁呀、在一起就是这么简单吗……这种事情一定不会改变。 "* }],
* "name": "杰瑞9",
* "id": 0,
* "content": "时候"
* }, {
* "comment_uuid": "XZRem95LLanRn2aS9fl",
* "photo": "book/pdf/2016/20160714092534.jpg",
* "user_uuid": "uGHPjruuHHz6IUqpROv",
* "create_date": "2019-12-20 14:30",
* "parent_id": null,
* "childs": [{
* "comment_uuid": "euK0PIKiNIJPoW4q6XK",
* "photo": "expert/2019-11-07/bdea2d7841f14b01a5a93c388a9040a7.jpg",
* "user_uuid": "ql4gO6C90QjOhbo4azY",
* "create_date": "2020-09-24 14:41",
* "parent_id": 1,
* "childs": [],
* "name": "高振宇",
* "id": 5,
* "content": "我想要去皮的冲动……我们的生活方式越来越远。一直都在你身上你永远不知道是你不知道自己是什么样子才发现 "* }],
* "name": "杰瑞1",
* "id": 1,
* "content": "图图"
* }, {
* "comment_uuid": "i7pVx5Oho5bDZSbIRnL",
* "photo": "expert/2019-11-07/bdea2d7841f14b01a5a93c388a9040a7.jpg",
* "user_uuid": "ql4gO6C90QjOhbo4azY",
* "create_date": "2020-09-24 14:42",
* "parent_id": null,
* "childs": [],
* "name": "高振宇",
* "id": 6,
* "content": "我们的爱情就是说了一场恋爱的恋爱了……在于我们"
* }],
* "message": "查询成功"
* }*/
private String comment_uuid;
private String photo;
private String user_uuid;
private String create_date;
private String parent_id;
private String name;
private String id;
private String content;
private List<Child> childList;
private Boolean isExpanded;//评论列表是否展开
public Boolean getExpanded() {
return isExpanded;
}
public void setExpanded(Boolean expanded) {
isExpanded = expanded;
}
public List<Child> getChildList() {
return childList;
}
public void setChildList(List<Child> childList) {
this.childList = childList;
}
public String getComment_uuid() {
return comment_uuid;
}
public void setComment_uuid(String comment_uuid) {
this.comment_uuid = comment_uuid;
}
public String getPhoto() {
return photo;
}
public void setPhoto(String photo) {
this.photo = photo;
}
public String getUser_uuid() {
return user_uuid;
}
public void setUser_uuid(String user_uuid) {
this.user_uuid = user_uuid;
}
public String getCreate_date() {
return create_date;
}
public void setCreate_date(String create_date) {
this.create_date = create_date;
}
public String getParent_id() {
return parent_id;
}
public void setParent_id(String parent_id) {
this.parent_id = parent_id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getContent() {
return content;
}
public void setContent(String content) {
this.content = content;
}
}

111
app/src/main/java/cn/shangyu/gdxzPatient/pointsmall/PointsMallActivity.java

@ -24,11 +24,13 @@ import cn.shangyu.gdxzPatient.utils.ImageOptions;
import cn.shangyu.gdxzPatient.utils.LogUtils;
import cn.shangyu.gdxzPatient.utils.UIUtils;
import cn.shangyu.gdxzPatient.utils.Url;
import cn.shangyu.gdxzPatient.view.DrawableCenterButton;
import cn.shangyu.gdxzPatient.view.RollViewPager;
import cn.shangyu.gdxzPatient.view.RollViewPager.OnPagerClickCallback;
import cn.shangyu.gdxzPatient.widget.CustomProgressDialog;
import cn.shangyu.gdxzPatient.widget.LoadingPage.ResultState;
import android.content.Intent;
import android.graphics.drawable.Drawable;
import android.os.Handler;
import android.os.Message;
import android.support.v4.view.ViewPager.LayoutParams;
@ -62,6 +64,11 @@ public class PointsMallActivity extends BaseActivity implements OnClickListener,
private ArrayList<String> titleList;
protected static final int GET_DATA_SUCCESS = 0; // 请求数据成功的结果码
private LinearLayout ll_integraltickit,ll_buy_point;
private DrawableCenterButton cb_exchange,cb_score,cb_shelf;
private Boolean cb_exchangeb=false;
private Boolean cb_scoreb=false;
private Boolean cb_shelfb=true;
private String sort ="1";
private Handler handler = new Handler() {
public void handleMessage(Message msg) {
pd.dismiss();
@ -122,13 +129,16 @@ public class PointsMallActivity extends BaseActivity implements OnClickListener,
ll_buy_point = view.findViewById(R.id.ll_buy_point);
HeaderGridView refreshableView = gv_product.getRefreshableView();
ll_empty = (LinearLayout) View.inflate(UIUtils.getContext(),R.layout.layout_empty, null);
headerView = (RelativeLayout) getLayoutInflater().inflate(R.layout.activity_points_banner, null);
headerView = view.findViewById(R.id.header);
topNewsTitle = (TextView) headerView.findViewById(R.id.top_news_title1);
top_news_viewpager = (LinearLayout) headerView.findViewById(R.id.top_news_viewpager);//头部轮播
dots_ll = (LinearLayout) headerView.findViewById(R.id.dots_ll);//头部轮播
top_news_viewpager.setFocusable(true);
top_news_viewpager.setFocusableInTouchMode(true);
top_news_viewpager.requestFocus();
cb_exchange=view.findViewById(R.id.cb_exchange);
cb_score=view.findViewById(R.id.cb_score);
cb_shelf=view.findViewById(R.id.cb_shelf);
int width =getResources().getDisplayMetrics().widthPixels;
// int height = CommonUtil.dip2px(mActivity, 180);
int height = width * 320 / 640;
@ -144,10 +154,99 @@ public class PointsMallActivity extends BaseActivity implements OnClickListener,
pd.show();
gv_product.setMode(Mode.BOTH);
refreshableView.setNumColumns(2);
refreshableView.addHeaderView(headerView);
// refreshableView.addHeaderView(headerView);
gv_product.setEmptyView(ll_empty);
initListViewTipText();
getData();
final Drawable drawable_n = getResources().getDrawable(R.drawable.cb_nocheck);
drawable_n.setBounds(0, 0, drawable_n.getMinimumWidth(),drawable_n.getMinimumHeight()); //此为必须写的
final Drawable drawable_s = getResources().getDrawable(R.drawable.icon_new);
drawable_s.setBounds(0, 0, drawable_n.getMinimumWidth(),drawable_n.getMinimumHeight()); //此为必须写的
final Drawable drawable_d = getResources().getDrawable(R.drawable.icon_hot);
drawable_d.setBounds(0, 0, drawable_n.getMinimumWidth(),drawable_n.getMinimumHeight()); //此为必须写的
cb_exchange.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
cb_exchange.setTextColor(getResources().getColor(R.color.tab_text_sel));
cb_shelfb=false;
cb_shelf.setTextColor(getResources().getColor(R.color.tab_text_nor));
cb_shelf.setCompoundDrawables(null, null, drawable_n, null);
cb_scoreb=false;
cb_score.setTextColor(getResources().getColor(R.color.tab_text_nor));
cb_score.setCompoundDrawables(null, null, drawable_n, null);
startPage = 1;
if(!cb_exchangeb)
{
cb_exchange.setCompoundDrawables(null, null, drawable_s, null);
cb_exchangeb=true;
sort="5";
getData();
}
else
{
cb_exchangeb=false;
cb_exchange.setCompoundDrawables(null, null, drawable_d, null);
sort="6";
getData();
}
}
});
cb_score.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
cb_score.setTextColor(getResources().getColor(R.color.tab_text_sel));
cb_shelfb=false;
cb_shelf.setTextColor(getResources().getColor(R.color.tab_text_nor));
cb_shelf.setCompoundDrawables(null, null, drawable_n, null);
cb_exchangeb=false;
cb_exchange.setTextColor(getResources().getColor(R.color.tab_text_nor));
cb_exchange.setCompoundDrawables(null, null, drawable_n, null);
startPage = 1;
if(!cb_scoreb)
{
cb_scoreb=true;
cb_score.setCompoundDrawables(null, null, drawable_s, null);
sort="3";
getData();
}
else
{
cb_score.setCompoundDrawables(null, null, drawable_d, null);
cb_scoreb=false;
sort="4";
getData();
}
}
});
cb_shelf.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
cb_shelf.setTextColor(getResources().getColor(R.color.tab_text_sel));
cb_exchangeb=false;
cb_exchange.setTextColor(getResources().getColor(R.color.tab_text_nor));
cb_exchange.setCompoundDrawables(null, null, drawable_n, null);
cb_scoreb=false;
cb_score.setTextColor(getResources().getColor(R.color.tab_text_nor));
cb_score.setCompoundDrawables(null, null, drawable_n, null);
startPage = 1;
if(cb_shelfb)
{
cb_shelf.setCompoundDrawables(null, null, drawable_d, null);
cb_shelfb=false;
sort="2";
getData();
}
else
{
cb_shelf.setCompoundDrawables(null, null, drawable_s, null);
cb_shelfb=true;
sort="1";
getData();
}
}
});
beans = new ArrayList<>();
getHeadScrollImg();
gv_product.setOnItemClickListener(this);
@ -168,6 +267,7 @@ public class PointsMallActivity extends BaseActivity implements OnClickListener,
if (UIUtils.isNetWorkConnected(UIUtils.getContext())) {
Map<String, String> param = new HashMap<>();
param.put("page",startPage +"");
param.put("sort",sort);
sendJsonPostParamtoNetSignMD5(Url.goodsList, param, 1, this);
} else {
pd.dismiss();
@ -394,9 +494,9 @@ public class PointsMallActivity extends BaseActivity implements OnClickListener,
long id) {
// TODO Auto-generated method stub
Intent intent = new Intent(PointsMallActivity.this,ProductDetailActivity.class);
intent.putExtra("uuid", beans.get(position-2).getUuid());
intent.putExtra("type", beans.get(position-2).getType());
intent.putExtra("name", beans.get(position-2).getName());
intent.putExtra("uuid", beans.get(position).getUuid());
intent.putExtra("type", beans.get(position).getType());
intent.putExtra("name", beans.get(position).getName());
startActivity(intent);
}
@ -405,6 +505,7 @@ public class PointsMallActivity extends BaseActivity implements OnClickListener,
public void onClick(View v) {
// TODO Auto-generated method stub
switch (v.getId()) {
case R.id.top_right_text:
Intent intent = new Intent(PointsMallActivity.this,MyExchangeActivity.class);
startActivity(intent);

29
app/src/main/java/cn/shangyu/gdxzPatient/pointsmall/ProductDetailActivity.java

@ -22,6 +22,7 @@ import cn.shangyu.gdxzPatient.view.RollViewPager.OnPagerClickCallback;
import cn.shangyu.gdxzPatient.widget.CustomProgressDialog;
import cn.shangyu.gdxzPatient.widget.LoadingPage.ResultState;
import android.content.Intent;
import android.graphics.Bitmap;
import android.os.Build;
import android.support.v4.view.ViewPager.LayoutParams;
import android.text.TextPaint;
@ -99,7 +100,7 @@ public class ProductDetailActivity extends BaseActivity implements OnClickListen
wv = view.findViewById(R.id.wv);
dots_ll = (LinearLayout) view.findViewById(R.id.dots_ll);
productshow = (TextView) view.findViewById(R.id.productshow);
loadurl(wv, "file:///android_asset/error/error.html");
// loadurl(wv, "file:///android_asset/error/error.html");
// WebSettings setting = wv.getSettings();
// setting.setCacheMode(WebSettings.LOAD_DEFAULT);
// // settings.setCacheMode(WebSettings.LOAD_CACHE_ELSE_NETWORK);
@ -262,6 +263,32 @@ public class ProductDetailActivity extends BaseActivity implements OnClickListen
LogUtils.e("url = "+url);
view.loadUrl(url);
view.setWebViewClient(new WebViewClient(){
@Override
public void onPageStarted(WebView view, String url, Bitmap favicon) {
super.onPageStarted(view, url, favicon);
}
@Override
public void onPageFinished(WebView view, String url) {
super.onPageFinished(view, url);
}
@Override
public void onReceivedError(WebView view, int errorCode, String description, String failingUrl) {
loadurl(wv, "file:///android_asset/error/error.html");
//super.onReceivedError(view, errorCode, description, failingUrl);
}
public void onReceivedSslError(WebView view, SslErrorHandler handler, SslError error){
handler.proceed();
}
});
}
/**

50
app/src/main/java/cn/shangyu/gdxzPatient/utils/Url.java

@ -17,31 +17,33 @@ public class Url {
// public static String imgUrl="http://192.168.1.11:8081/gdxz/";//图片地址的拼接 b
// ---------------------------------------------------------------------------------------------------------
// 肝胆相照正式服务器
// public static String url = "http://app.igandan.com/app/patient/";
// public static String urlNew = "http://app.igandan.com/app/patientApp/";
// public static String imgUrl = "http://doc.igandan.com/app/";// 图片地址的拼接
// public static String upLoadUrl = "http://app.igandan.com/app/upload/";
// public static String zcxy = "http://app.igandan.com/patient_zcxy.jsp";
// public static String urlVer = "http://app.igandan.com/app/";
// public static String urlH5 = "http://wx.igandan.com/";
// public static String urlmyLan = "https://app.igandan.com/app/patientAPI/";//迈兰、
// public static String urlping = "https://app.igandan.com/app/pingPatient/";//ping
// public static String polvId = "22";//保利威视学员id
public static String url = "http://app.igandan.com/app/patient/";
public static String urlNew = "http://app.igandan.com/app/patientApp/";
public static String imgUrl = "http://doc.igandan.com/app/";// 图片地址的拼接
public static String upLoadUrl = "http://app.igandan.com/app/upload/";
public static String zcxy = "http://app.igandan.com/patient_zcxy.jsp";
public static String urlVer = "http://app.igandan.com/app/";
public static String urlH5 = "http://wx.igandan.com/";
public static String urlmyLan = "https://app.igandan.com/app/patientAPI/";//迈兰、
public static String urlping = "https://app.igandan.com/app/pingPatient/";//ping
public static String getExpertQrcode = "http://app.igandan.com/app/expert/" + "getExpertQrcode"; // 获取二维码
public static String qrCode = "http://wx.igandan.com/expert/expertcodeimg?expert_uuid=";//专家二维码页面分享链接
public static String polvId = "22";//保利威视学员id
// ---------------------------------------------------------------------------------------------------------
//肝胆相照测试
public static String urlVer = "https://tapp.igandan.org/app/";//
public static String url = "https://tapp.igandan.org/app/patient/";//
public static String urlNew = "https://tapp.igandan.org/app/patientApp/";//
public static String imgUrl = "http://tdoc.igandan.org/app/";//
public static String upLoadUrl = "https://tapp.igandan.org/app/upload";//
public static String zcxy = "https://tapp.igandan.org/patient_zcxy.jsp";//
public static String urlH5 = "https://tapp.igandan.org/";//
public static String urlmyLan = "https://tapp.igandan.org/app/patientAPI/";//迈兰
public static String urlping = "https://tapp.igandan.org/app/pingPatient/";//ping
public static String getExpertQrcode = "https://tapp.igandan.org//app/expert/" + "getExpertQrcode"; // 获取二维码
public static String qrCode = "http://twx.igandan.org/expert/expertcodeimg?expert_uuid=";//专家二维码页面分享链接:
public static String polvId = "12";//保利威视学员id
// public static String urlVer = "https://tapp.igandan.org/app/";//
// public static String url = "https://tapp.igandan.org/app/patient/";//
// public static String urlNew = "https://tapp.igandan.org/app/patientApp/";//
// public static String imgUrl = "http://tdoc.igandan.org/app/";//
// public static String upLoadUrl = "https://tapp.igandan.org/app/upload";//
// public static String zcxy = "https://tapp.igandan.org/patient_zcxy.jsp";//
// public static String urlH5 = "https://tapp.igandan.org/";//
// public static String urlmyLan = "https://tapp.igandan.org/app/patientAPI/";//迈兰
// public static String urlping = "https://tapp.igandan.org/app/pingPatient/";//ping
// public static String getExpertQrcode = "https://tapp.igandan.org//app/expert/" + "getExpertQrcode"; // 获取二维码
// public static String qrCode = "http://twx.igandan.org/expert/expertcodeimg?expert_uuid=";//专家二维码页面分享链接:
// public static String polvId = "12";//保利威视学员id
/*****************************************************/
// public static String imgUrl = "http://192.168.100.99:8080/Mgdxz/";
@ -181,7 +183,7 @@ public class Url {
public static String getVisitData = url + "followUpList";// 获取随访记录
public static String getTeachDataNew = url + "noviceListNew";// 获取新手教程
public static String getNewCommentList = urlmyLan + "listTransformComment";// 新获取评论列表
public static String getCommentList = urlNew + "commentList";// 获取肝胆活动的评论
public static String addCommentList = urlNew + "addComment";// 添加肝胆活动的评论
@ -325,7 +327,7 @@ public class Url {
public static String bonusPointsPayList = urlNew+"bonusPointsPayList";//积分支出列表
public static String myBonusPoints = urlNew+"myBonusPoints";//我的积分详情
public static String goodsNewsList = urlNew+"goodsNewsList";//轮播图
public static String goodsList = urlNew+"goodsList";//商品分页查询
public static String goodsList = urlmyLan+"goodsList";//商品分页查询
public static String getGoods = urlNew+"getGoods";//查询商品详情
public static String createGoodsOrder = urlNew+"createGoodsOrder";//创建积分商城订单
public static String payGoodsOrder = urlNew+"payGoodsOrder";//支付订单

84
app/src/main/java/cn/shangyu/gdxzPatient/widget/CommentExpandableListView.java

@ -0,0 +1,84 @@
package cn.shangyu.gdxzPatient.widget;
import android.content.Context;
import android.os.Build;
import android.support.v4.view.NestedScrollingChild;
import android.support.v4.view.NestedScrollingChildHelper;
import android.util.AttributeSet;
import android.widget.ExpandableListView;
/**
* Author: Moos
* E-mail: moosphon@gmail.com
* Date: 18/4/20.
* Desc: 自定义ExpandableListView,解决与CoordinatorLayout滑动冲突问题
*/
public class CommentExpandableListView extends ExpandableListView implements NestedScrollingChild {
private NestedScrollingChildHelper mScrollingChildHelper;
public CommentExpandableListView(Context context, AttributeSet attrs) {
super(context, attrs);
mScrollingChildHelper = new NestedScrollingChildHelper(this);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
setNestedScrollingEnabled(true);
}
}
@Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
int expandSpec = MeasureSpec.makeMeasureSpec(Integer.MAX_VALUE >> 2, MeasureSpec.AT_MOST);
super.onMeasure(widthMeasureSpec, expandSpec);
}
@Override
public void setNestedScrollingEnabled(boolean enabled) {
mScrollingChildHelper.setNestedScrollingEnabled(enabled);
}
@Override
public boolean isNestedScrollingEnabled() {
return mScrollingChildHelper.isNestedScrollingEnabled();
}
@Override
public boolean startNestedScroll(int axes) {
return mScrollingChildHelper.startNestedScroll(axes);
}
@Override
public void stopNestedScroll() {
mScrollingChildHelper.stopNestedScroll();
}
@Override
public boolean hasNestedScrollingParent() {
return mScrollingChildHelper.hasNestedScrollingParent();
}
@Override
public boolean dispatchNestedScroll(int dxConsumed, int dyConsumed, int dxUnconsumed,
int dyUnconsumed, int[] offsetInWindow) {
return mScrollingChildHelper.dispatchNestedScroll(dxConsumed, dyConsumed,
dxUnconsumed, dyUnconsumed, offsetInWindow);
}
@Override
public boolean dispatchNestedPreScroll(int dx, int dy, int[] consumed, int[] offsetInWindow) {
return mScrollingChildHelper.dispatchNestedPreScroll(dx, dy, consumed, offsetInWindow);
}
@Override
public boolean dispatchNestedFling(float velocityX, float velocityY, boolean consumed) {
return mScrollingChildHelper.dispatchNestedFling(velocityX, velocityY, consumed);
}
@Override
public boolean dispatchNestedPreFling(float velocityX, float velocityY) {
return mScrollingChildHelper.dispatchNestedPreFling(velocityX, velocityY);
}
}

BIN
app/src/main/res/drawable-xhdpi/cb_nocheck.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
app/src/main/res/drawable-xxhdpi/coll.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
app/src/main/res/drawable-xxhdpi/exp.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

36
app/src/main/res/layout/activity_gd_detail.xml

@ -7,35 +7,49 @@
<include layout="@layout/top" />
<FrameLayout
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:background="@color/white" >
<com.handmark.pulltorefresh.library.PullToRefreshListView
xmlns:ptr="http://schemas.android.com/apk/res-auto"
android:id="@+id/lv_gd_pinglun"
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="-1dp"
android:divider="#d8d8d8"
android:dividerHeight="0.4dp"
android:scrollbars="none" >
</com.handmark.pulltorefresh.library.PullToRefreshListView>
>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<include
android:visibility="visible"
layout="@layout/gd_detail_top" />
<cn.shangyu.gdxzPatient.widget.CommentExpandableListView
android:id="@+id/detail_page_lv_comment"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:divider="@null"
android:layout_marginBottom="64dp"
android:listSelector="@android:color/transparent"
android:scrollbars="none"/>
</LinearLayout>
</ScrollView>
<ImageView
android:id="@+id/iv_clinical_phone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right|bottom"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:layout_marginBottom="65dp"
android:paddingBottom="5dp"
android:paddingLeft="5dp"
android:paddingTop="5dp"
android:src="@drawable/clinical_phone"
android:visibility="gone" />
</FrameLayout>
</RelativeLayout>
<LinearLayout
android:id="@+id/ll_pinglun"

57
app/src/main/res/layout/activity_house_detial.xml

@ -9,54 +9,33 @@
android:layout_height="wrap_content"
layout="@layout/top" />
<FrameLayout
<ScrollView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:background="@color/white" >
<com.handmark.pulltorefresh.library.PullToRefreshListView
xmlns:ptr="http://schemas.android.com/apk/res-auto"
android:id="@+id/lv_house_com"
android:background="@color/white"
android:layout_weight="1">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:divider="#d8d8d8"
android:dividerHeight="0.4dp"
android:scrollbars="none" >
</com.handmark.pulltorefresh.library.PullToRefreshListView>
android:layout_height="wrap_content"
android:orientation="vertical">
<include
android:layout_width="wrap_content"
android:layout_height="wrap_content"
layout="@layout/activity_house_top" />
<RelativeLayout
android:id="@+id/ll_empty"
<cn.shangyu.gdxzPatient.widget.CommentExpandableListView
android:id="@+id/detail_page_lv_comment"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:gravity="center"
android:visibility="gone" >
android:divider="@null"
android:layout_marginBottom="64dp"
android:listSelector="@android:color/transparent"
android:scrollbars="none"/>
</LinearLayout>
<ImageView
android:id="@+id/img_empty"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignLeft="@+id/textView1"
android:layout_alignParentTop="true"
android:layout_marginTop="20dp"
android:src="@drawable/list_empty" />
</ScrollView>
<TextView
android:id="@+id/textView1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/img_empty"
android:layout_marginTop="5dp"
android:text="暂无评论"
android:textColor="#666666"
android:textSize="16sp" />
</RelativeLayout>
</FrameLayout>
<!-- </LinearLayout> -->
<Button
android:id="@+id/btn_add_com"

4
app/src/main/res/layout/activity_house_top.xml

@ -193,7 +193,7 @@
android:id="@+id/div_view_ll"
android:layout_width="fill_parent"
android:layout_height="8dp"
android:background="#EfEfEf" />
android:background="#ffdadada" />
<LinearLayout
android:layout_width="match_parent"
@ -217,6 +217,6 @@
android:id="@+id/div_view_l2"
android:layout_width="fill_parent"
android:layout_height="0.5dp"
android:background="#EfEfEf" />
android:background="#ffdadada" />
</LinearLayout>

75
app/src/main/res/layout/activity_pointsmall.xml

@ -16,9 +16,78 @@
android:layout_below="@+id/iv_mallhead"
android:layout_width="match_parent"
android:layout_height="match_parent" -->
<include
android:id="@+id/header"
layout="@layout/activity_points_banner"
/>
<LinearLayout
android:id="@+id/rl_sort"
android:layout_width="match_parent"
android:background="@color/white"
android:layout_height="45dp"
android:focusable="true"
android:layout_below="@id/header"
android:focusableInTouchMode="true"
android:gravity="center_vertical"
android:orientation="horizontal" >
<cn.shangyu.gdxzPatient.view.DrawableCenterButton
android:id="@+id/cb_shelf"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@null"
android:button="@null"
android:drawablePadding="2dp"
android:drawableRight="@drawable/icon_new"
android:gravity="center"
android:text="上架排序"
android:textColor="@color/tab_text_sel"
android:textSize="14sp" />
<View
android:layout_width="0.5dp"
android:layout_height="15dp"
android:background="@color/gray" />
<cn.shangyu.gdxzPatient.view.DrawableCenterButton
android:id="@+id/cb_score"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@null"
android:button="@null"
android:drawablePadding="2dp"
android:drawableRight="@drawable/cb_nocheck"
android:gravity="center"
android:text="积分排序"
android:textColor="@color/tab_text_nor"
android:textSize="14sp" />
<View
android:layout_width="0.5dp"
android:layout_height="15dp"
android:background="@color/gray" />
<cn.shangyu.gdxzPatient.view.DrawableCenterButton
android:id="@+id/cb_exchange"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@null"
android:button="@null"
android:drawablePadding="2dp"
android:drawableRight="@drawable/cb_nocheck"
android:gravity="center"
android:text="兑换排序"
android:textColor="@color/tab_text_nor"
android:textSize="14sp" />
</LinearLayout>
<cn.shangyu.gdxzPatient.pointsmall.PullToRefreshHeadGridView
xmlns:ptr="http://schemas.android.com/apk/res-auto"
android:id="@+id/gv_product"
android:layout_below="@id/rl_sort"
android:layout_marginTop="10dp"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:cacheColorHint="@android:color/white"
@ -72,7 +141,11 @@
android:layout_height="wrap_content" />
</LinearLayout>
<View
android:layout_gravity="center"
android:background="@color/white"
android:layout_width="1dp"
android:layout_height="20dp"/>
<LinearLayout
android:id="@+id/ll_buy_point"

91
app/src/main/res/layout/item_comment_new.xml

@ -0,0 +1,91 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:id="@+id/all_child"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:paddingLeft="50dp"
android:paddingRight="10dp">
<ImageView
android:id="@+id/iv_item_comment_delete"
android:layout_width="20dp"
android:layout_height="20dp"
android:visibility="gone"
android:layout_alignParentRight="true"
android:src="@drawable/comment_del"
/>
<TextView
android:id="@+id/item_comment_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_toRightOf="@+id/iv_patient_touxiang"
android:layout_marginTop="25dp"
android:paddingBottom="5dp"
android:paddingTop="5dp"
android:text="内容"
android:textColor="@color/darkGrey"
android:textSize="14sp" />
<cn.shangyu.gdxzPatient.widget.CircleImageView
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/iv_patient_touxiang"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:layout_marginTop="2dp"
android:padding="1dip"
android:src="@drawable/icon_touxiang_persion_gray" />
<TextView
android:id="@+id/item_comment_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/item_comment_content"
android:layout_marginLeft="5dp"
android:layout_toRightOf="@+id/iv_patient_touxiang"
android:text="8-10 15:47"
android:textColor="@color/hint_text_color"
android:textSize="14sp" />
<TextView
android:id="@+id/item_comment_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:layout_alignLeft="@+id/item_comment_time"
android:text="振振"
android:textColor="@color/c333333"
android:textSize="16sp" />
<RelativeLayout
android:id="@+id/morer"
android:layout_below="@id/item_comment_time"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/more"
android:padding="5dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/green_theme"
android:text="--展开更多回复"/>
<ImageView
android:id="@+id/more_i"
android:layout_width="18dp"
android:layout_height="18dp"
android:scaleType="fitCenter"
android:layout_centerVertical="true"
android:layout_toRightOf="@id/more"
android:src="@drawable/exp"/>
</RelativeLayout>
</RelativeLayout>

82
app/src/main/res/layout/item_comment_new_p.xml

@ -0,0 +1,82 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:paddingLeft="10dp"
android:paddingRight="10dp">
<ImageView
android:id="@+id/iv_item_comment_delete"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_alignParentRight="true"
android:visibility="gone"
android:src="@drawable/comment_del"
/>
<TextView
android:id="@+id/item_comment_hf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginTop="3dp"
android:background="@drawable/chose_label_bg_red"
android:gravity="center_vertical"
android:paddingBottom="2dp"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:paddingTop="1dp"
android:text="回复"
android:textColor="@color/green_theme"
android:textSize="16sp" />
<TextView
android:id="@+id/item_comment_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_toRightOf="@+id/iv_patient_touxiang"
android:layout_marginTop="25dp"
android:paddingBottom="5dp"
android:paddingTop="5dp"
android:text="内容"
android:textColor="@color/darkGrey"
android:textSize="14sp" />
<cn.shangyu.gdxzPatient.widget.CircleImageView
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/iv_patient_touxiang"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:layout_marginTop="2dp"
android:padding="1dip"
android:src="@drawable/icon_touxiang_persion_gray" />
<TextView
android:id="@+id/item_comment_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/item_comment_content"
android:layout_marginLeft="5dp"
android:layout_toRightOf="@+id/iv_patient_touxiang"
android:text="8-10 15:47"
android:textColor="@color/hint_text_color"
android:textSize="14sp" />
<TextView
android:id="@+id/item_comment_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:layout_alignLeft="@+id/item_comment_time"
android:text="振振"
android:textColor="@color/c333333"
android:textSize="16sp" />
</RelativeLayout>

9
app/src/main/res/xml/network_security_config.xml

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<network-security-config>
<base-config cleartextTrafficPermitted="true">
<trust-anchors>
<certificates src="system" overridePins="true" />
<certificates src="user" overridePins="true" />
</trust-anchors>
</base-config>
</network-security-config>
Loading…
Cancel
Save