diff --git a/app/build.gradle b/app/build.gradle index c6023a9..5fd4894 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,7 +1,14 @@ apply plugin: 'com.android.application' android { - + signingConfigs { + config { + keyAlias 'gdxzclient_key' + keyPassword 'password' + storeFile file('F:/GandanDoctorPatient-apk/gdxzclient_key.keystore') + storePassword 'password' + } + } configurations.all { resolutionStrategy { force 'com.android.support:support-annotations:26.1.0' @@ -12,10 +19,11 @@ android { applicationId "cn.shangyu.gdxzPatient" minSdkVersion 19 targetSdkVersion 26 - versionCode 61 - versionName "3.3.6" + versionCode 62 + versionName "3.4.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" multiDexEnabled true + signingConfig signingConfigs.config } lintOptions { disable "ResourceType" @@ -25,17 +33,24 @@ android { jniLibs.srcDirs = ['libs'] } } - buildTypes { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } + debug { + signingConfig signingConfigs.config + } + + + } + + dexOptions { + javaMaxHeapSize "6g" } buildToolsVersion '26.0.2' useLibrary 'org.apache.http.legacy' - defaultConfig { ndk { @@ -43,8 +58,10 @@ android { } } - + productFlavors { + } } + afterEvaluate { tasks.matching { it.name.startsWith('dex') @@ -91,8 +108,6 @@ dependencies { implementation files('libs/HwPush_SDK_NOMAP_V2705.jar') implementation files('libs/MiPush_SDK_Client_3_6_19.jar') implementation files('libs/Msc.jar') - - //64K 引用限制 // compile 'com.android.support:support-v4:26.1.0' compile 'com.android.support:design:26.1.0' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 904b2c0..0ad902d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="62" + android:versionName="3.4.0" > + android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen" > @@ -335,6 +335,12 @@ + + + @@ -1317,7 +1323,15 @@ - + + + + + diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/AddBankCardActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/AddBankCardActivity.java index 40f47e3..e6c1ee7 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/AddBankCardActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/AddBankCardActivity.java @@ -72,7 +72,7 @@ public class AddBankCardActivity extends BaseActivity implements private Button btn_next; private ImageView iv_bank_card_alert, iv_ver_code, iv_bank_card_sup;// 提示图标 private TimeCount time; - private SmsObserver mObserver; +// private SmsObserver mObserver; public static final int MSG_RECEIVED_CODE = 2; private Handler mHandler = new Handler() { @Override @@ -137,10 +137,10 @@ public class AddBankCardActivity extends BaseActivity implements // Launcher.startActivitySafely,进一步调用Launcher.startActivity，最后调用父类Activity的startActivity。 iv_bank_card_sup.setOnClickListener(this); - mObserver = new SmsObserver(AddBankCardActivity.this, mHandler); - Uri uri = Uri.parse("content://sms/"); - // 注册短信的监听 - this.getContentResolver().registerContentObserver(uri, true, mObserver); +// mObserver = new SmsObserver(AddBankCardActivity.this, mHandler); +// Uri uri = Uri.parse("content://sms/"); +// // 注册短信的监听 +// this.getContentResolver().registerContentObserver(uri, true, mObserver); // 设置两个edittext的监听事件 // TODO Auto-generated method stub MonitorEditTextUtil.textChangeListener textChangeListener = new MonitorEditTextUtil.textChangeListener( @@ -711,32 +711,32 @@ public class AddBankCardActivity extends BaseActivity implements // mIsRight(); // }; // }.start(); - - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - - if (PermissionsUtil.hasPermission(this, Manifest.permission.READ_SMS)) { - //有访问摄像头的权限,读写内存，网络定位，打电话，读取短信，录音,通讯录 - getSystemTime(); - } else { - PermissionsUtil.requestPermission(this, new PermissionListener() { - @Override - public void permissionGranted(@NonNull String[] permissions) { - //用户授予了访问读取短信的权限 - getSystemTime(); - } - @Override - public void permissionDenied(@NonNull String[] permissions) { - //用户拒绝了访问读取短信的申请 + getSystemTime(); +// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { // - - } - - }, new String[]{Manifest.permission.READ_SMS}); - } - - }else { - getSystemTime(); - } +// if (PermissionsUtil.hasPermission(this, Manifest.permission.READ_SMS)) { +// //有访问摄像头的权限,读写内存，网络定位，打电话，读取短信，录音,通讯录 +// getSystemTime(); +// } else { +// PermissionsUtil.requestPermission(this, new PermissionListener() { +// @Override +// public void permissionGranted(@NonNull String[] permissions) { +// //用户授予了访问读取短信的权限 +// getSystemTime(); +// } +// @Override +// public void permissionDenied(@NonNull String[] permissions) { +// //用户拒绝了访问读取短信的申请 +//// +// +// } +// +// }, new String[]{Manifest.permission.READ_SMS}); +// } +// +// }else { +// getSystemTime(); +// } } private String timeStr; @@ -942,6 +942,6 @@ public class AddBankCardActivity extends BaseActivity implements // TODO Auto-generated method stub super.onDestroy(); - getContentResolver().unregisterContentObserver(mObserver); +// getContentResolver().unregisterContentObserver(mObserver); } } diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/DoctorEvaluateActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/DoctorEvaluateActivity.java index c7f38c8..d45b847 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/DoctorEvaluateActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/DoctorEvaluateActivity.java @@ -23,6 +23,7 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -70,7 +71,8 @@ public class DoctorEvaluateActivity extends BaseActivity implements View.OnClic private int state;//判断请求第几个接口 private int item1; private ListAppraiseBean.NumListBean num_list; - + private List disease_num_List; + private List way_num_List; @Override public void setTitle() { top_title.setText("医生评价"); @@ -152,7 +154,7 @@ public class DoctorEvaluateActivity extends BaseActivity implements View.OnClic } private void getListAppraiseCommentWay(int position) { - int comment_way = num_list.getWay_num_list().get(position).getComment_way(); + int comment_way = way_num_List.get(position).getComment_way(); Map map = new HashMap<>(); map.put("expert_uuid",expert_uuid); map.put("comment_way",comment_way+""); @@ -162,7 +164,7 @@ public class DoctorEvaluateActivity extends BaseActivity implements View.OnClic } private void getListAppraiseDisease(int position ) { - String disease_uuid = num_list.getDisease_num_list().get(position).getDisease_uuid(); + String disease_uuid = disease_num_List.get(position).getDisease_uuid(); Map map = new HashMap<>(); map.put("expert_uuid",expert_uuid); map.put("disease_uuid",disease_uuid); @@ -184,12 +186,16 @@ public class DoctorEvaluateActivity extends BaseActivity implements View.OnClic case LISTAPPRAISE: LogUtil.i("LISTAPPRAISE = "+resultJson); if (TextUtils.isEmpty(resultJson)) { - ToastUtil.showMessage("服务器连接异常"); + ToastUtil.showMessage("数据异常"); return; } Gson gson = new Gson(); listAppraiseBean = gson.fromJson(resultJson, ListAppraiseBean.class); if (listAppraiseBean!=null){ + if (!"200".equals(listAppraiseBean.getCode())){ + ToastUtil.showMessage("数据异常"); + return; + } if (page==1) { if (beans.size() != 0) { beans.clear(); @@ -200,7 +206,9 @@ public class DoctorEvaluateActivity extends BaseActivity implements View.OnClic ToastUtil.showMessage("没有更多数据了"); } } - beans.addAll(listAppraiseBean.getComment_list().getList()); + if (listAppraiseBean.getComment_list()!=null){ + beans.addAll(listAppraiseBean.getComment_list().getList()); + } if (beans.size() == 0) { // 没有获取则显示暂无随访的图文信息 pd.dismiss(); @@ -217,21 +225,35 @@ public class DoctorEvaluateActivity extends BaseActivity implements View.OnClic /** * 头部 * */ - if (listAppraiseBean.getNum_list()!=null){ + num_list = listAppraiseBean.getNum_list(); + if (num_list!=null){ list = new ArrayList<>(); list.add("全部("+listAppraiseBean.getComment_list().getTotal()+")"); tv_title.setText("患者评价("+listAppraiseBean.getComment_list().getTotal()+")"); - num_list = listAppraiseBean.getNum_list(); - disease_num_list = listAppraiseBean.getNum_list().getDisease_num_list().size(); - for (int i = 0;i=0; i--){ + if (StringUtil.isEmpty(disease_num_List.get(i).getName())){ + disease_num_List.remove(i); + } } - way_num_list = listAppraiseBean.getNum_list().getWay_num_list().size(); - for (int j = 0; j< way_num_list; j++){ - list.add(listAppraiseBean.getNum_list().getWay_num_list().get(j).getComment_way_name()+" "+listAppraiseBean.getNum_list().getWay_num_list().get(j).getNum()); + for (int k= 0;k=0; j--){ + if (StringUtil.isEmpty(way_num_List.get(j).getComment_way_name())){ + way_num_List.remove(j); + } + } + for (int m = 0;m= Build.VERSION_CODES.M) { - - if (PermissionsUtil.hasPermission(this, Manifest.permission.READ_SMS)) { - //有访问摄像头的权限,读写内存，网络定位，打电话，读取短信，录音,通讯录 - getSystemTime(); - } else { - PermissionsUtil.requestPermission(this, new PermissionListener() { - @Override - public void permissionGranted(@NonNull String[] permissions) { - //用户授予了访问读取短信的权限 - getSystemTime(); - } - @Override - public void permissionDenied(@NonNull String[] permissions) { - //用户拒绝了访问读取短信的申请 -// finish(); - - } - - }, new String[]{Manifest.permission.READ_SMS}); - } - - }else { - getSystemTime(); - } - +// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { +// +// if (PermissionsUtil.hasPermission(this, Manifest.permission.READ_SMS)) { +// //有访问摄像头的权限,读写内存，网络定位，打电话，读取短信，录音,通讯录 +// getSystemTime(); +// } else { +// PermissionsUtil.requestPermission(this, new PermissionListener() { +// @Override +// public void permissionGranted(@NonNull String[] permissions) { +// //用户授予了访问读取短信的权限 +// getSystemTime(); +// } +// @Override +// public void permissionDenied(@NonNull String[] permissions) { +// //用户拒绝了访问读取短信的申请 +//// finish(); +// +// } +// +// }, new String[]{Manifest.permission.READ_SMS}); +// } +// +// }else { +// getSystemTime(); +// } + getSystemTime(); break; } @@ -779,7 +779,7 @@ public class ForgetRestPwdActivity extends BaseActivity implements protected void onStop() { tv_get_identifying_code.onDestroy(); super.onStop(); - getContentResolver().unregisterContentObserver(mObserver); +// getContentResolver().unregisterContentObserver(mObserver); } } diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/HcvVideoActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/HcvVideoActivity.java index 75bb60a..88397be 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/HcvVideoActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/HcvVideoActivity.java @@ -247,6 +247,8 @@ public class HcvVideoActivity extends Activity implements OnClickListener { title.setText("谈丙话肝"); } else if (type.equals("richtext")) { title.setText("科普详情"); + title_right_icon.setVisibility(View.GONE); + top_right_share.setVisibility(View.GONE); }else if ("ylqx".equals(type)) { title.setText("乙路前行"); }else if("dongtai".equals(type)){ diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/LoginActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/LoginActivity.java index c978d64..64c4068 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/LoginActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/LoginActivity.java @@ -125,7 +125,7 @@ public class LoginActivity extends BaseActivity implements OnClickListener { private RelativeLayout rl_identifying_ver_code; private ImageView img_ver_code; - private SmsObserver mObserver; +// private SmsObserver mObserver; // private ImageView iv_password; @@ -225,10 +225,10 @@ public class LoginActivity extends BaseActivity implements OnClickListener { tv_register.setOnClickListener(this);// 注册 tv_forget.setOnClickListener(this);// 忘记密码 - mObserver = new SmsObserver(LoginActivity.this, mHandler); - Uri uri = Uri.parse("content://sms/"); - // 注册短信的监听 - this.getContentResolver().registerContentObserver(uri, true, mObserver); +// mObserver = new SmsObserver(LoginActivity.this, mHandler); +// Uri uri = Uri.parse("content://sms/"); +// // 注册短信的监听 +// this.getContentResolver().registerContentObserver(uri, true, mObserver); getVerCodeImage(); iv_showpwd_new @@ -374,37 +374,37 @@ public class LoginActivity extends BaseActivity implements OnClickListener { return; } - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - - if (PermissionsUtil.hasPermission(this,Manifest.permission.READ_SMS)) { - //有访问摄像头的权限,读写内存，网络定位，打电话，读取短信，录音,通讯录 - getSystemTime(); - } else { - PermissionsUtil.requestPermission(this, new PermissionListener() { - @Override - public void permissionGranted(@NonNull String[] permissions) { - //用户授予了访问读取短信的权限 - getSystemTime(); - } - @Override - public void permissionDenied(@NonNull String[] permissions) { - //用户拒绝了访问读取短信的申请 - - } - - }, new String[]{Manifest.permission.READ_SMS}); - } - - }else { - getSystemTime(); - } -// getSystemTime(); +// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { +// +// if (PermissionsUtil.hasPermission(this,Manifest.permission.READ_SMS)) { +// //有访问摄像头的权限,读写内存，网络定位，打电话，读取短信，录音,通讯录 +// getSystemTime(); +// } else { +// PermissionsUtil.requestPermission(this, new PermissionListener() { +// @Override +// public void permissionGranted(@NonNull String[] permissions) { +// //用户授予了访问读取短信的权限 +// getSystemTime(); +// } +// @Override +// public void permissionDenied(@NonNull String[] permissions) { +// //用户拒绝了访问读取短信的申请 +// +// } +// +// }, new String[]{Manifest.permission.READ_SMS}); +// } +// +// }else { +// getSystemTime(); +// } + getSystemTime(); break; case R.id.tv_doctor: Uri uri = Uri - .parse("http://android.myapp.com/myapp/detail.htm?apkName=cn.shangyu.gdxzExpert"); -// .parse("http://appstore.huawei.com/app/C10526652"); +// .parse("http://android.myapp.com/myapp/detail.htm?apkName=cn.shangyu.gdxzExpert"); + .parse("http://appstore.huawei.com/app/C10526652"); Intent intent = new Intent(Intent.ACTION_VIEW, uri); startActivity(intent); break; @@ -526,10 +526,9 @@ public class LoginActivity extends BaseActivity implements OnClickListener { parameters.add(value02); HttpResult httpResult = HttpHelper.post(Url.quickLogin, parameters);// 请求网络 - - String result = httpResult.getString();// str为服务器返回的json串 - LogUtils.e("快捷登陆result===" + result); - if (result != null) { + if (httpResult!=null) { + String result = httpResult.getString();// str为服务器返回的json串 + LogUtils.e("快捷登陆result===" + result); pd.dismiss(); Gson gson = new Gson(); QuickLoginBean quickLoginBean = gson.fromJson(result, @@ -538,6 +537,9 @@ public class LoginActivity extends BaseActivity implements OnClickListener { msg.what = 66; msg.obj = quickLoginBean; handler.sendMessage(msg); + }else { + pd.dismiss(); + ToastUtil.showMessage("请求失败"); } } catch (Exception e) { @@ -545,7 +547,7 @@ public class LoginActivity extends BaseActivity implements OnClickListener { e.printStackTrace(); pd.dismiss(); time.cancel(); - CustomToast.show(ctx, "请求失败", 0); + ToastUtil.showMessage("请求失败"); } }; }.start(); @@ -661,7 +663,7 @@ public class LoginActivity extends BaseActivity implements OnClickListener { case 66: QuickLoginBean quickLoginBean = (QuickLoginBean) msg.obj; ToastUtil.showMessage(quickLoginBean.message); - if (quickLoginBean.code.equals("1")) { + if ("1".equals(quickLoginBean.code)) { // ok } else { // 失败 @@ -1176,7 +1178,7 @@ public class LoginActivity extends BaseActivity implements OnClickListener { // + new String(result)); String results = new String(result); is.close(); - // LogUtils.v("短信验证码result==" + results); + LogUtils.v("短信验证码result==" + results); pd.dismiss(); if (TextUtils.isEmpty(results)) { return; @@ -1209,7 +1211,7 @@ public class LoginActivity extends BaseActivity implements OnClickListener { protected void onDestroy() { super.onDestroy(); - getContentResolver().unregisterContentObserver(mObserver); +// getContentResolver().unregisterContentObserver(mObserver); } private Handler mHandler = new Handler() { diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/MainActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/MainActivity.java index 9b8e5de..8b702fd 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/MainActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/MainActivity.java @@ -97,6 +97,7 @@ import cn.shangyu.gdxzPatient.utils.EvenBusEvent; import cn.shangyu.gdxzPatient.utils.LogUtils; import cn.shangyu.gdxzPatient.utils.SharePrefUtil; import cn.shangyu.gdxzPatient.utils.UIUtils; +import cn.shangyu.gdxzPatient.utils.UpdateVersionUtils; import cn.shangyu.gdxzPatient.utils.Url; import cn.shangyu.gdxzPatient.utils.Utility; import cn.shangyu.gdxzPatient.widget.CustomProgressDialog; @@ -153,7 +154,7 @@ public class MainActivity extends BaseActivity implements newVewsion = (String) bean.getNewVersion();// 最新的版本号 LogUtils.e("versionCode = "+versionCode); LogUtils.e("newVewsion = "+newVewsion); - if (!versionCode.equals(newVewsion)) { + if (UpdateVersionUtils.isUpdataInfo(versionCode,newVewsion)) { // ，需要显示更新 SharePrefUtil.saveBoolean(MainActivity.this, "mIsNewVersion", true); @@ -886,22 +887,21 @@ public class MainActivity extends BaseActivity implements // LogUtils.e("SharePrefUtil.getBoolean(UIUtils.getContext()==" // + SharePrefUtil.getBoolean(UIUtils.getContext(), // Constant.SYSTEMPOINT, false)); - if (iv_red_point != null - && SharePrefUtil.getBoolean(UIUtils.getContext(), - Constant.SYSTEMPOINT, false)) { + if (iv_red_point != null&& SharePrefUtil.getBoolean(UIUtils.getContext(),Constant.SYSTEMPOINT, false)) { // if (homeFragment.isVisible()) { if (main_radiogroup.getCheckedRadioButtonId() == 2131493245) { iv_red_point.setVisibility(View.VISIBLE); - } - // LogUtils.e(main_radiogroup.getCheckedRadioButtonId()+"ss"); - - else { + }else if (tab_rbn_home.isChecked()){ + iv_red_point.setVisibility(View.VISIBLE); + } else { iv_red_point.setVisibility(View.GONE); } } else { iv_red_point.setVisibility(View.GONE); } + + } // public void initbagView2() { diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/NewsDetailActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/NewsDetailActivity.java index 88faf77..f89e8c8 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/NewsDetailActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/NewsDetailActivity.java @@ -27,6 +27,7 @@ import com.umeng.socialize.media.UMWeb; import android.annotation.SuppressLint; import android.content.Intent; import android.graphics.Bitmap; +import android.os.Build; import android.os.Handler; import android.os.Message; import android.text.TextUtils; @@ -321,7 +322,9 @@ public class NewsDetailActivity extends BaseActivity implements // settings.setLayoutAlgorithm(LayoutAlgorithm.NARROW_COLUMNS); - + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { + settings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW); + } settings.setDomStorageEnabled(true); settings.setUseWideViewPort(true);// 设置此属性，可任意比例缩放 diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/RegistActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/RegistActivity.java index 6275399..4eb31d4 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/RegistActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/RegistActivity.java @@ -93,7 +93,7 @@ public class RegistActivity extends BaseActivity implements OnClickListener { private String deviceType = "0";// 设备类型(0安卓，1IOS) private CheckBox cb_ok;// 注册协议选择框 private TextView tv_reg_service;// 注册协议 - private SmsObserver mObserver; +// private SmsObserver mObserver; public static final int MSG_RECEIVED_CODE = 2; private Handler mHandler = new Handler() { @@ -188,10 +188,10 @@ public class RegistActivity extends BaseActivity implements OnClickListener { .findViewById(R.id.et_identifying_code); et_identifying_code .setOnFocusChangeListener(onFocusAutoClearHintListener); - mObserver = new SmsObserver(RegistActivity.this, mHandler); - Uri uri = Uri.parse("content://sms/"); - // 注册短信的监听 - this.getContentResolver().registerContentObserver(uri, true, mObserver); +// mObserver = new SmsObserver(RegistActivity.this, mHandler); +// Uri uri = Uri.parse("content://sms/"); +// // 注册短信的监听 +// this.getContentResolver().registerContentObserver(uri, true, mObserver); iv_showpwd_new = (CheckBox) view.findViewById(R.id.iv_showpwd_new); getVerCodeImage(); iv_showpwd_new @@ -490,32 +490,32 @@ public class RegistActivity extends BaseActivity implements OnClickListener { // SimpleDateFormat fmt = new // SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); // String timestr = fmt.format(new Date()); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - - if (PermissionsUtil.hasPermission(this, Manifest.permission.READ_SMS)) { - //有访问摄像头的权限,读写内存，网络定位，打电话，读取短信，录音,通讯录 - getSystemTime(); - } else { - PermissionsUtil.requestPermission(this, new PermissionListener() { - @Override - public void permissionGranted(@NonNull String[] permissions) { - //用户授予了访问读取短信的权限 - getSystemTime(); - } - @Override - public void permissionDenied(@NonNull String[] permissions) { - //用户拒绝了访问读取短信的申请 -// finish(); - - } - - }, new String[]{Manifest.permission.READ_SMS}); - } - - }else { - getSystemTime(); - } - +// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { +// +// if (PermissionsUtil.hasPermission(this, Manifest.permission.READ_SMS)) { +// //有访问摄像头的权限,读写内存，网络定位，打电话，读取短信，录音,通讯录 +// getSystemTime(); +// } else { +// PermissionsUtil.requestPermission(this, new PermissionListener() { +// @Override +// public void permissionGranted(@NonNull String[] permissions) { +// //用户授予了访问读取短信的权限 +// getSystemTime(); +// } +// @Override +// public void permissionDenied(@NonNull String[] permissions) { +// //用户拒绝了访问读取短信的申请 +//// finish(); +// +// } +// +// }, new String[]{Manifest.permission.READ_SMS}); +// } +// +// }else { +// getSystemTime(); +// } + getSystemTime(); break; case R.id.tv_reg_service:// 注册协议 @@ -911,7 +911,7 @@ public class RegistActivity extends BaseActivity implements OnClickListener { tv_get_identifying_code.onDestroy(); super.onStop(); - getContentResolver().unregisterContentObserver(mObserver); +// getContentResolver().unregisterContentObserver(mObserver); } private Handler inputHandler = new Handler() { diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/ServiceEvaluationActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/ServiceEvaluationActivity.java index 8ee4662..a566e8d 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/ServiceEvaluationActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/ServiceEvaluationActivity.java @@ -134,7 +134,7 @@ public class ServiceEvaluationActivity extends BaseActivity implements View.OnCl if ("chattingfragment".equals(from)){ sendJsonPostParamtoNetSignMD5(Url.addConsultAppraise,map,ADDINTERROGATIONAPPRAISE,ServiceEvaluationActivity.this); }else - sendJsonPostParamtoNetSignMD5(Url.addInterrogationAppraise,map,ADDINTERROGATIONAPPRAISE,ServiceEvaluationActivity.this); + sendJsonPostParamtoNetSignMD5(Url.addInterrogationAppraise,map,ADDINTERROGATIONAPPRAISE,ServiceEvaluationActivity.this); break; } } @@ -150,7 +150,7 @@ public class ServiceEvaluationActivity extends BaseActivity implements View.OnCl pd.dismiss(); if (resultJson.contains("200")){ ToastUtil.showMessage("感谢您的评价"); - SharePrefUtil.saveBoolean(ServiceEvaluationActivity.this,expert_uuid+disease_uuid,true); + SharePrefUtil.saveBoolean(ServiceEvaluationActivity.this,SharePrefUtil.getString(ServiceEvaluationActivity.this, "uuid", "")+expert_uuid+disease_uuid,true); finish(); }else { ToastUtil.showMessage("评价失败"); diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/SettingAndHelpActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/SettingAndHelpActivity.java index 79e40e3..abdb137 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/SettingAndHelpActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/SettingAndHelpActivity.java @@ -271,8 +271,7 @@ public class SettingAndHelpActivity extends BaseActivity implements pd_loading.dismiss(); // ECDevice.unInitial(); intent.putExtra("flag", true); - intent.putExtra("phone", - SharePrefUtil.getString(ctx, Constant.MOBILE, "")); + intent.putExtra("phone",SharePrefUtil.getString(ctx, Constant.MOBILE, "")); startActivity(intent); // 1登入系统 2退出系统 3患者客户端在手机前台运行 4.客户端在手机后台运行 BaseActivity.foreBack(mMainActivity, 2); diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/SettingVersionActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/SettingVersionActivity.java index 19ddbd7..7681830 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/SettingVersionActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/SettingVersionActivity.java @@ -80,8 +80,10 @@ public class SettingVersionActivity extends BaseActivity implements if (mVersionCode.equals(newVewsion)) { mIsUpdate = false; - } else { + } else if (UpdateVersionUtils.isUpdataInfo(mVersionCode,newVewsion)){ mIsUpdate = true; + }else { + mIsUpdate = false; } } break; @@ -150,7 +152,7 @@ public class SettingVersionActivity extends BaseActivity implements if (mIsUpdate) { showUpDateDialog(); } else { - ToastUtil.showMessage("当前版本已是最新版"); + ToastUtil.showMessage("当前版本"+mVersionCode); } } diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/TheIllnessDetailActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/TheIllnessDetailActivity.java index f519c17..4809ab6 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/TheIllnessDetailActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/TheIllnessDetailActivity.java @@ -558,7 +558,7 @@ public class TheIllnessDetailActivity extends BaseActivity implements View.OnCl holder.cb_pingjia.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - boolean aBoolean = SharePrefUtil.getBoolean(TheIllnessDetailActivity.this, answerList.get(position).getExpert_uuid() + getInterrogationBean.getData().getDisease_uuid(), false); + boolean aBoolean = SharePrefUtil.getBoolean(TheIllnessDetailActivity.this, SharePrefUtil.getString(TheIllnessDetailActivity.this, "uuid", "")+answerList.get(position).getExpert_uuid() + getInterrogationBean.getData().getDisease_uuid(), false); if (!aBoolean){ Intent intent = new Intent(TheIllnessDetailActivity.this,ServiceEvaluationActivity.class); intent.putExtra("disease_uuid",getInterrogationBean.getData().getDisease_uuid()); diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/ZhiBoActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/ZhiBoActivity.java index 1e7edf9..46cf397 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/ZhiBoActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/ZhiBoActivity.java @@ -14,7 +14,9 @@ import com.umeng.socialize.media.UMImage; import com.umeng.socialize.media.UMWeb; import android.app.Activity; +import android.app.ActivityManager; import android.app.ProgressDialog; +import android.content.Context; import android.content.Intent; import android.content.pm.ActivityInfo; import android.graphics.Bitmap; @@ -90,8 +92,7 @@ public class ZhiBoActivity extends Activity implements OnClickListener { */ @Override public void onResult(SHARE_MEDIA platform) { - Toast.makeText(ZhiBoActivity.this, "分享成功", Toast.LENGTH_LONG) - .show(); + Toast.makeText(ZhiBoActivity.this, "分享成功", Toast.LENGTH_LONG).show(); } /** @@ -126,12 +127,14 @@ public class ZhiBoActivity extends Activity implements OnClickListener { super.onCreate(savedInstanceState); this.setContentView(R.layout.activity_zhi_bo); webView = (WebView) this.findViewById(R.id.aaaaaa); + webView.setKeepScreenOn(true);//确保屏幕长亮 layout_top = this.findViewById(R.id.layout_top); loadingView = this.findViewById(R.id.loading_view); top_back = (ImageView) this.findViewById(R.id.top_back); mTitle = (TextView) this.findViewById(R.id.top_title); mIb_share = (ImageView) this.findViewById(R.id.top_right); video_fullView = (FrameLayout) this.findViewById(R.id.f_move); + video_fullView.setKeepScreenOn(true);//确保屏幕长亮 mIb_share.setVisibility(View.VISIBLE); // mIb_share.setImageResource(R.drawable.share_icon); mIb_share.setBackgroundDrawable(UIUtils diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/ecdemo/ui/ConversationListFragment.java b/app/src/main/java/cn/shangyu/gdxzPatient/ecdemo/ui/ConversationListFragment.java index c7df48a..ea7b3de 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/ecdemo/ui/ConversationListFragment.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/ecdemo/ui/ConversationListFragment.java @@ -20,6 +20,7 @@ import org.json.JSONException; import org.json.JSONObject; import android.app.Activity; +import android.app.Dialog; import android.content.Context; import android.content.Intent; import android.os.Bundle; @@ -38,6 +39,7 @@ import cn.shangyu.gdxzPatient.bean.MyExpertListBean; import cn.shangyu.gdxzPatient.bean.PatientUsers; import cn.shangyu.gdxzPatient.bean.MyExpertListBean.ExpertBean; import cn.shangyu.gdxzPatient.ecdemo.common.CCPAppManager; +import cn.shangyu.gdxzPatient.ecdemo.common.dialog.ECListDialog; import cn.shangyu.gdxzPatient.ecdemo.common.dialog.ECProgressDialog; import cn.shangyu.gdxzPatient.ecdemo.common.utils.LogUtil; import cn.shangyu.gdxzPatient.ecdemo.common.utils.ToastUtil; @@ -194,7 +196,19 @@ public class ConversationListFragment extends TabFragment implements if (mAdapter == null || mAdapter.getItem(_position) == null) { return false; } - + Conversation conversation = mAdapter.getItem(_position); + final int itemPosition = position; + String[] menu = buildMenu(conversation); + ECListDialog dialog = new ECListDialog(getActivity() , /*new String[]{getString(R.string.main_delete)}*/menu); + dialog.setOnDialogItemClickListener(new ECListDialog.OnDialogItemClickListener() { + @Override + public void onDialogItemClick(Dialog d, int position) { + handleContentMenuClick(itemPosition ,position); + } + }); + String Username = conversation.getUsername(); + dialog.setTitle(Username); + dialog.show(); return true; } return false; @@ -488,6 +502,8 @@ public class ConversationListFragment extends TabFragment implements handlerHelper.postRunnOnThead(new Runnable() { @Override public void run() { +// IMessageSqlManager.deleteAllBySession(conversation +// .getSessionId()); IMessageSqlManager.deleteChattingMessage(conversation .getSessionId()); ToastUtil.showMessage(R.string.clear_msg_success); @@ -496,9 +512,10 @@ public class ConversationListFragment extends TabFragment implements @Override public void run() { dismissPostingDialog(); - mAdapter.notifyChange(); +// mAdapter.notifyChange(); } }); + requestData(); } }); break; diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/ecdemo/ui/chatting/ChattingFragment.java b/app/src/main/java/cn/shangyu/gdxzPatient/ecdemo/ui/chatting/ChattingFragment.java index 07a66d1..9297d40 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/ecdemo/ui/chatting/ChattingFragment.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/ecdemo/ui/chatting/ChattingFragment.java @@ -98,6 +98,7 @@ import cn.shangyu.gdxzPatient.greenrobot.event.EventBus; import cn.shangyu.gdxzPatient.utils.BadgeCountUtils; import cn.shangyu.gdxzPatient.utils.EvenBusEvent; import cn.shangyu.gdxzPatient.utils.LogUtils; +import cn.shangyu.gdxzPatient.utils.SharePrefUtil; import cn.shangyu.gdxzPatient.utils.UIUtils; import com.github.dfqin.grantor.PermissionListener; @@ -227,6 +228,7 @@ public class ChattingFragment extends CCPFragment implements expertName = bundle.getString(CONTACT_USER); exture = bundle.getString(CONTACT_EXTURE); LogUtil.i("exture = "+exture); + LogUtil.i("expertName = "+expertName); uuid = bundle.getString(UUID); isHistory2 = bundle.getBoolean(ISHISTORY); if (uuid.contains("#")) { @@ -2118,18 +2120,24 @@ public class ChattingFragment extends CCPFragment implements // addExpertIntent.putExtra("uuid", uuidStr); // startActivity(addExpertIntent); // getActivity().finish(); - Intent intent1 = new Intent(getActivity(),ServiceEvaluationActivity.class); - intent1.putExtra("disease_uuid",uuid.split("#")[0]); - intent1.putExtra("expert_uuid",uuidStr); - intent1.putExtra("from","chattingfragment"); - startActivity(intent1); - getActivity().finish(); + boolean aBoolean = SharePrefUtil.getBoolean(getActivity(),SharePrefUtil.getString(getActivity(), "uuid", "")+mRecipients.split("#")[1] + uuid, false); + if (!aBoolean){ + Intent intent1 = new Intent(getActivity(),ServiceEvaluationActivity.class); + intent1.putExtra("disease_uuid",uuid); + intent1.putExtra("expert_uuid",mRecipients.split("#")[1]); + intent1.putExtra("from","chattingfragment"); + startActivity(intent1); + getActivity().finish(); + }else { + ToastUtil.showMessage("您已评价过该医生"); + } + break; case R.id.tv_order_server: LogUtils.v("订购服务"); Intent expertDetailIntent = new Intent(getActivity(), ExpertDetailActivity.class); - expertDetailIntent.putExtra("uuid", uuidStr); + expertDetailIntent.putExtra("uuid", mRecipients.split("#")[1]); startActivity(expertDetailIntent); getActivity().finish(); break; @@ -2139,7 +2147,7 @@ public class ChattingFragment extends CCPFragment implements SendFlowerNewActivity.class); sendFlowerIntent.putExtra("name", expertName); - sendFlowerIntent.putExtra("uuid", uuidStr); + sendFlowerIntent.putExtra("uuid", mRecipients.split("#")[1]); startActivity(sendFlowerIntent); getActivity().finish(); diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/ecdemo/ui/chatting/IMChattingHelper.java b/app/src/main/java/cn/shangyu/gdxzPatient/ecdemo/ui/chatting/IMChattingHelper.java index d4af13f..8357e57 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/ecdemo/ui/chatting/IMChattingHelper.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/ecdemo/ui/chatting/IMChattingHelper.java @@ -22,7 +22,9 @@ import java.util.List; import org.json.JSONException; import org.json.JSONObject; +import android.content.ComponentName; import android.content.Intent; +import android.database.Cursor; import android.graphics.BitmapFactory; import android.os.Handler; import android.os.Message; @@ -43,6 +45,7 @@ import cn.shangyu.gdxzPatient.ecdemo.common.utils.ECPreferences; import cn.shangyu.gdxzPatient.ecdemo.common.utils.FileAccessor; import cn.shangyu.gdxzPatient.ecdemo.common.utils.LogUtil; import cn.shangyu.gdxzPatient.ecdemo.core.ClientUser; +import cn.shangyu.gdxzPatient.ecdemo.storage.AbstractSQLManager; import cn.shangyu.gdxzPatient.ecdemo.storage.ConversationSqlManager; import cn.shangyu.gdxzPatient.ecdemo.storage.GroupNoticeSqlManager; import cn.shangyu.gdxzPatient.ecdemo.storage.GroupSqlManager; @@ -692,11 +695,35 @@ public class IMChattingHelper implements OnChatReceiveListener, } else if ("2".equals(from)) { // 公益资讯的通知红点通知 - SharePrefUtil.saveBoolean(UIUtils.getContext(),Constant.CONSULTPOINT, true); - EventBus.getDefault().post(new EvenBusEvent("第二构造函数", "2")); - notifyTittle = Constant.GONGYIXIAOXI; - messageInto = Constant.MESSAGE; - showNotify(msg, exture); + + if ("2,1,2,0".equals(exture)){ + boolean flag = false; + Cursor cursor = ConversationSqlManager.getConversationCursor(); + for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) { + String id = cursor.getString(cursor.getColumnIndex(AbstractSQLManager.IThreadColumn.THREAD_ID)); + if (msg.getSessionId().equals(id)){ + flag = true; + } + } + if (!flag){ + return; + }else { + SharePrefUtil.saveBoolean(UIUtils.getContext(),Constant.CONSULTPOINT, true); + EventBus.getDefault().post(new EvenBusEvent("第二构造函数", "2")); + notifyTittle = Constant.GONGYIXIAOXI; + messageInto = Constant.MESSAGE; + showNotify(msg, exture); + } + + }else { + SharePrefUtil.saveBoolean(UIUtils.getContext(),Constant.CONSULTPOINT, true); + EventBus.getDefault().post(new EvenBusEvent("第二构造函数", "2")); + notifyTittle = Constant.GONGYIXIAOXI; + messageInto = Constant.MESSAGE; + showNotify(msg, exture); + } + + } } else { @@ -768,6 +795,7 @@ public class IMChattingHelper implements OnChatReceiveListener, try { JSONObject json = new JSONObject(userDataResult); String tuisongType = json.getString("type");// 推送类型 + String msgDomin1 = json.optString("msgDomin");// 3:肝胆家园5：一问多答 LogUtils.e("推送类型>>>" + tuisongType); SharePrefUtil.saveString(UIUtils.getContext(), "re_article_type", @@ -819,6 +847,10 @@ public class IMChattingHelper implements OnChatReceiveListener, messageInto = Constant.SENDER2; LogUtils.e("专家拒绝患者的随访申请。不用任何操作>>>>>>>>"); Systemtoggle(msg, systemtoggle); + //测试退出 +// Intent intent = new Intent(); +// intent.setAction("EXITPATIENT"); +// CCPAppManager.getContext().sendBroadcast(intent); } else if ("3".equals(tuisongType)) { // 专家抢答成功公益咨询。 LogUtils.v("专专家抢答成功公益咨询"); @@ -848,8 +880,7 @@ public class IMChattingHelper implements OnChatReceiveListener, JSONObject dataResult = json.getJSONObject("userData"); String uuid = dataResult.getString("uuid");// uuid // 删除数据库操作 - ConversationSqlManager - .updateExpertToConsult(Constant.EXPERT_APPID + uuid); + ConversationSqlManager.updateExpertToConsult(Constant.EXPERT_APPID + uuid); EventBus.getDefault().post(new EvenBusEvent("第三构造函数", uuid)); // IMessageSqlManager.deleteChattingMessage(Constant.EXPERT_APPID+uuid); notifyTittle = Constant.YANZHENGXIAOXI; @@ -871,7 +902,7 @@ public class IMChattingHelper implements OnChatReceiveListener, messageInto = Constant.SENDER1; Systemtoggle(msg, systemtoggle); //7免费咨询 -》一问多答通知 - if ("7".equals(tuisongType)){ + if ("7".equals(tuisongType)&&StringUtil.isEmpty(msgDomin1)&&"5".equals(msgDomin1.substring(0,1))){ LogUtil.i("step_uuidAll userDataResult = "+userDataResult); String msg1 = json.getString("msgDomin"); String[] split = msg1.split(","); @@ -883,6 +914,8 @@ public class IMChattingHelper implements OnChatReceiveListener, } SharePrefUtil.saveBoolean(UIUtils.getContext(),Constant.CONSULNEWTPOINT, true); EventBus.getDefault().post(new EvenBusEvent("一问多答", "7")); + }else { + MainActivity.getInstance().setNewMessage("3");//右上角肝胆家园红点 } } else if ("9".equals(tuisongType)) { @@ -892,9 +925,17 @@ public class IMChattingHelper implements OnChatReceiveListener, notifyTittle = "医生提醒"; messageInto = Constant.SENDER1; Systemtoggle(msg, systemtoggle); + }else if ("33".equals(tuisongType)){// + LogUtil.i("发送广播"); + Intent intent = new Intent(); + intent.setAction("EXITPATIENT"); + intent.setComponent( new ComponentName("cn.shangyu.gdxzPatient" , + "cn.shangyu.gdxzPatient.utils.ExitReceiver") ); + intent.addFlags(Intent.FLAG_EXCLUDE_STOPPED_PACKAGES); + CCPAppManager.getContext().sendBroadcast(intent); } - } catch (JSONException e) { + } catch (JSONException e) { // TODO Auto-generated catch block e.printStackTrace(); } diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/ecdemo/ui/chatting/model/RichTextRxRow.java b/app/src/main/java/cn/shangyu/gdxzPatient/ecdemo/ui/chatting/model/RichTextRxRow.java index 13713c3..5ad8cc0 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/ecdemo/ui/chatting/model/RichTextRxRow.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/ecdemo/ui/chatting/model/RichTextRxRow.java @@ -75,12 +75,13 @@ public class RichTextRxRow extends BaseChattingRow { final ECPreviewMessageBody textBody = (ECPreviewMessageBody) message .getBody(); - String localFilePath = "file://" + textBody.getLocalUrl(); + //收到链接直接显示默认图片 +// String localFilePath = "file://" + textBody.getLocalUrl(); - if (!TextUtils.isEmpty(textBody.getLocalUrl())) { - ImageLoader.getInstance().displayImage( - "file://" + textBody.getLocalUrl(), holder.imageView); - } +// if (!TextUtils.isEmpty(textBody.getLocalUrl())) { +// ImageLoader.getInstance().displayImage( +// "file://" + textBody.getLocalUrl(), holder.imageView); +// } if (TextUtils.isEmpty(textBody.getTitle())) { holder.descTextView.setText("标题"); } else { diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/ecdemo/ui/chatting/view/CCPMaskLayout.java b/app/src/main/java/cn/shangyu/gdxzPatient/ecdemo/ui/chatting/view/CCPMaskLayout.java index a9402f8..4ff4456 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/ecdemo/ui/chatting/view/CCPMaskLayout.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/ecdemo/ui/chatting/view/CCPMaskLayout.java @@ -95,7 +95,7 @@ public class CCPMaskLayout extends RelativeLayout { mView = findViewById(R.id.content); if(mView == null) { - LogUtil.e(LogUtil.getLogUtilsTag(CCPMaskLayout.class), "not found view by id, new one"); +// LogUtil.e(LogUtil.getLogUtilsTag(CCPMaskLayout.class), "not found view by id, new one"); mView = new View(getContext()); LayoutParams layoutParams = new LayoutParams( ViewGroup.LayoutParams.MATCH_PARENT, diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/fragment/ConsultFragment.java b/app/src/main/java/cn/shangyu/gdxzPatient/fragment/ConsultFragment.java index 058d122..b9d6943 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/fragment/ConsultFragment.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/fragment/ConsultFragment.java @@ -599,7 +599,7 @@ public class ConsultFragment extends BaseFragment implements OnClickListener, CCPAppManager.startChattingAction(getActivity(),footDatas.get(position - headDatas.size()).getExpertUuid(), footDatas.get(position - headDatas.size()).getRealName(), "1,2,1,"+ footDatas.get(position- headDatas.size()).getUuid(), - footDatas.get(position - headDatas.size()).getExpertUuid(), true, true); + footDatas.get(position - headDatas.size()).getDiseaseUuid(), true, true); } }); vh.tv_questiondetail.setOnClickListener(new OnClickListener() { @@ -619,7 +619,7 @@ public class ConsultFragment extends BaseFragment implements OnClickListener, CCPAppManager.startChattingAction(getActivity(),footDatas.get(position - headDatas.size()).getExpertUuid(), footDatas.get(position - headDatas.size()).getRealName(), "1,2,1,"+ footDatas.get(position- headDatas.size()).getUuid(), - footDatas.get(position - headDatas.size()).getExpertUuid(), true, true); + footDatas.get(position - headDatas.size()).getDiseaseUuid(), true, true); } }); } diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/pointsmall/OnlineExchangeActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/pointsmall/OnlineExchangeActivity.java index 769b015..9552a2c 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/pointsmall/OnlineExchangeActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/pointsmall/OnlineExchangeActivity.java @@ -9,13 +9,24 @@ import android.widget.RadioGroup; import android.widget.TextView; +import org.json.JSONException; +import org.json.JSONObject; + +import java.util.HashMap; +import java.util.Map; + import cn.shangyu.gdxzPatient.R; import cn.shangyu.gdxzPatient.activity.BaseActivity; import cn.shangyu.gdxzPatient.application.AppManager; +import cn.shangyu.gdxzPatient.ecdemo.common.utils.LogUtil; +import cn.shangyu.gdxzPatient.ecdemo.common.utils.ToastUtil; +import cn.shangyu.gdxzPatient.http.OnCallBackFromNet; +import cn.shangyu.gdxzPatient.utils.StringUtil; import cn.shangyu.gdxzPatient.utils.UIUtils; +import cn.shangyu.gdxzPatient.utils.Url; import cn.shangyu.gdxzPatient.widget.LoadingPage.ResultState; -public class OnlineExchangeActivity extends BaseActivity implements OnClickListener{ +public class OnlineExchangeActivity extends BaseActivity implements OnClickListener,OnCallBackFromNet{ private TextView tv_num; private RadioButton tv_num1,tv_num2,tv_num3; @@ -30,7 +41,8 @@ public class OnlineExchangeActivity extends BaseActivity implements OnClickListe private TextView tv_jifen; private TextView tv_duihuan; private TextView tv_needpoint; - + private int allpoints; + public static final int GETTOTALPOINTS = 200; @Override public void setTitle() { @@ -50,6 +62,7 @@ public class OnlineExchangeActivity extends BaseActivity implements OnClickListe times = intent.getExtras().getString("times"); uuid = intent.getExtras().getString("uuid"); AppManager.getAppManager().addActivity1(this); + allpoints = points; initView(view); setData(); setOnClick(); @@ -113,7 +126,7 @@ public class OnlineExchangeActivity extends BaseActivity implements OnClickListe // TODO Auto-generated method stub switch (v.getId()) { case R.id.tv_num: - if (ll_num.getVisibility()==0) { + if (ll_num.getVisibility()==View.VISIBLE) { ll_num.setVisibility(View.GONE); changeChooseDown(); }else{ @@ -126,38 +139,94 @@ public class OnlineExchangeActivity extends BaseActivity implements OnClickListe break; case R.id.tv_num1: tv_num.setText("1件"); - tv_needpoint.setText(points*1+"积分"); + allpoints = points*1; + tv_needpoint.setText(allpoints+"积分"); changeChooseDown(); ll_num.setVisibility(View.GONE); break; case R.id.tv_num2: tv_num.setText("2件"); - tv_needpoint.setText(points*2+"积分"); + allpoints = points*2; + tv_needpoint.setText(allpoints+"积分"); changeChooseDown(); ll_num.setVisibility(View.GONE); break; case R.id.tv_num3: tv_num.setText("3件"); - tv_needpoint.setText(points*3+"积分"); + allpoints = points*3; + tv_needpoint.setText(allpoints+"积分"); changeChooseDown(); ll_num.setVisibility(View.GONE); break; case R.id.tv_exchange: - Intent intent = new Intent(OnlineExchangeActivity.this,ContactEmailActivity.class); - intent.putExtra("type", type); - intent.putExtra("uuid", uuid); - if ("1件".equals(tv_num.getText())) { - intent.putExtra("goodsNum", "1"); - }else if ("2件".equals(tv_num.getText())){ - intent.putExtra("goodsNum", "2"); - }else { - intent.putExtra("goodsNum", "3"); - } - startActivity(intent); + Map map = new HashMap<>(); + sendJsonPostParamtoNetSignMD5(Url.getTotalPoints,map,GETTOTALPOINTS,OnlineExchangeActivity.this); + +// Intent intent = new Intent(OnlineExchangeActivity.this,ContactEmailActivity.class); +// intent.putExtra("type", type); +// intent.putExtra("uuid", uuid); +// if ("1件".equals(tv_num.getText())) { +// intent.putExtra("goodsNum", "1"); +// }else if ("2件".equals(tv_num.getText())){ +// intent.putExtra("goodsNum", "2"); +// }else { +// intent.putExtra("goodsNum", "3"); +// } +// startActivity(intent); break; } } + @Override + public void onCallbackFromThread(String resultJson) { + + } + + @Override + public void onCallBackFromThread(String resultJson, int resultCode) { + switch (resultCode){ + case GETTOTALPOINTS: + LogUtil.i("resultJson = "+resultJson);//{"code":"1","message":"查询成功","totalpoints":7011} + LogUtil.i("resultJson allpoints = "+allpoints);//{"code":"1","message":"查询成功","totalpoints":7011} + if (!StringUtil.isEmpty(resultJson)){ + try { + + JSONObject jsonObject = new JSONObject(resultJson); + int totalpoints = jsonObject.optInt("totalpoints"); + String code = jsonObject.optString("code"); + String message = jsonObject.optString("message"); + if ("1".equals(code)){ + + if (totalpoints>=allpoints){ + Intent intent = new Intent(OnlineExchangeActivity.this,ContactEmailActivity.class); + intent.putExtra("type", type); + intent.putExtra("uuid", uuid); + if ("1件".equals(tv_num.getText())) { + intent.putExtra("goodsNum", "1"); + }else if ("2件".equals(tv_num.getText())){ + intent.putExtra("goodsNum", "2"); + }else { + intent.putExtra("goodsNum", "3"); + } + startActivity(intent); + }else { + ToastUtil.showMessage("积分不足"); + } + }else { + ToastUtil.showMessage(message); + } + + } catch (JSONException e) { + e.printStackTrace(); + } + }else { + ToastUtil.showMessage("请求失败"); + } + + + break; + } + } } diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/polyvplayer/VideoDetailPolyvPlayerActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/polyvplayer/VideoDetailPolyvPlayerActivity.java index 4a7fc17..182f482 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/polyvplayer/VideoDetailPolyvPlayerActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/polyvplayer/VideoDetailPolyvPlayerActivity.java @@ -93,6 +93,7 @@ import com.lidroid.xutils.http.callback.RequestCallBack; import com.lidroid.xutils.http.client.HttpRequest; import com.nostra13.universalimageloader.core.ImageLoader; import com.umeng.socialize.ShareAction; +import com.umeng.socialize.UMShareListener; import com.umeng.socialize.bean.SHARE_MEDIA; import com.umeng.socialize.media.UMImage; import com.umeng.socialize.media.UMMin; @@ -447,9 +448,9 @@ public class VideoDetailPolyvPlayerActivity extends FragmentActivity implements LinkedList polyvDownloadInfos = downloadSQLiteHelper.getloadInfo(vid); if (polyvDownloadInfos!=null&&polyvDownloadInfos.size()>0){ - PolyvDownloadInfo info = polyvDownloadInfos.get(0); - long percent = info.getPercent(); - long total = info.getTotal(); + downloadInfo = polyvDownloadInfos.get(0); + long percent = downloadInfo.getPercent(); + long total = downloadInfo.getTotal(); if (percent==total){ tv_exchange.setText("查看缓存"); }else { @@ -1107,7 +1108,8 @@ public class VideoDetailPolyvPlayerActivity extends FragmentActivity implements break; case R.id.top_right_search://分享 - share(); + showSharePopupWindow(v); +// share(); break; case R.id.bt_add_pinglun: String comment = mEt_add.getText().toString(); @@ -1491,6 +1493,192 @@ public class VideoDetailPolyvPlayerActivity extends FragmentActivity implements }.start(); } + private void showSharePopupWindow(View view) { + + // 一个自定义的布局，作为显示的内容 + View contentView = LayoutInflater.from(mActivity) + .inflate(R.layout.popu_share_video, null); + + LinearLayout ll_weixin = contentView.findViewById(R.id.ll_weixin); + LinearLayout ll_weixincircle = contentView.findViewById(R.id.ll_weixincircle); + LinearLayout ll_sina = contentView.findViewById(R.id.ll_sina); + Button btn_quxiao = contentView.findViewById(R.id.btn_quxiao); + + // 设置按钮的点击事件 +// mTV_Sure = (TextView) contentView.findViewById(R.id.bt_pop_sure); +// mTV_Cancel = (TextView) contentView.findViewById(R.id.bt_pop_cancel); +// mEt_adds = (EditText) contentView.findViewById(R.id.et_pop_add); +// if (mEt_add != null && !TextUtils.isEmpty(mEt_add.getText())) { +// mEt_adds.setText(mEt_add.getText().toString().trim()); +// mEt_adds.setSelection(mEt_add.getText().length()); +// } + final PopupWindow popupWindow = new PopupWindow(contentView, + ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT, true); + btn_quxiao.setOnClickListener(new View.OnClickListener() { + + @Override + public void onClick(View v) { + // TODO Auto-generated method stub + popupWindow.dismiss(); + } + }); + ll_weixin.setOnClickListener(new View.OnClickListener() { + + @Override + public void onClick(View v) { + // TODO Auto-generated method stub + share(1); + popupWindow.dismiss(); + } + }); + ll_weixincircle.setOnClickListener(new View.OnClickListener() { + + @Override + public void onClick(View v) { + // TODO Auto-generated method stub + share(2); + popupWindow.dismiss(); + } + }); + ll_sina.setOnClickListener(new View.OnClickListener() { + + @Override + public void onClick(View v) { + // TODO Auto-generated method stub + share(3); + popupWindow.dismiss(); + } + }); + popupWindow.setTouchable(true); + popupWindow.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE); + popupWindow.setTouchInterceptor(new View.OnTouchListener() { + + @Override + public boolean onTouch(View v, MotionEvent event) { + + Log.i("mengdd", "onTouch : "); + + return false; + } + + }); + + popupWindow.showAtLocation(view, 0, 0, 0); + + } + /** + * 调用分享功能 + * @param i + */ + private void share(int i) { + Constant.isShareGetPoint = true; + String shareTitle = title; + String shareUrl = null; + if (url.startsWith("http://") || url.startsWith("https://")) { + shareUrl = url; + } else { + shareUrl = Url.imgUrl + url; + } + + String msgSinaContent = shareTitle + shareUrl; + String imageurl = Url.imgUrl + imgpath; + // ShareUtils.shareMsg(ct, shareTitle, "分享给你一个好看的文章，" + shareTitle + + // " 详情：" + shareUrl, null); + Bitmap bitmap = ImageLoader.getInstance().loadImageSync(imageurl); + if (TextUtils.isEmpty(shareUrl)) { + shareUrl = ""; + } + if (TextUtils.isEmpty(note)) { + note = ""; + } + if (TextUtils.isEmpty(imageurl)) { + imageurl = ""; + } + UMImage shareImg; + if (i == 3){ + if (StringUtil.isEmpty(imageurl.replace(Url.imgUrl, ""))) { + shareImg = new UMImage(mActivity, + "http://doc.igandan.com/app/html/img/2016/20160714132557.png"); + } else { + if (bitmap != null) { + shareImg = new UMImage(mActivity, bitmap); + } else { + shareImg = new UMImage(mActivity, imageurl); + } + + } + shareImg.compressStyle = UMImage.CompressStyle.SCALE; + //网页 + UMWeb web = new UMWeb(shareUrl); + web.setTitle(shareTitle);//标题 + web.setThumb(shareImg); //缩略图 + web.setDescription(note);//描述 + new ShareAction(mActivity) + .setPlatform(SHARE_MEDIA.SINA)//传入平台 + .withMedia(web) + .setCallback(shareListener)//回调监听器 + .share(); +// ShareUtils.shareUmeng(mActivity, shareTitle, note, msgSinaContent, +// imageurl, shareUrl, bitmap); + }else if (i == 2){ + if (StringUtil.isEmpty(imageurl.replace(Url.imgUrl, ""))) { + shareImg = new UMImage(mActivity, + "http://doc.igandan.com/app/html/img/2016/20160714132557.png"); + } else { + if (bitmap != null) { + shareImg = new UMImage(mActivity, bitmap); + } else { + shareImg = new UMImage(mActivity, imageurl); + } + + } + shareImg.compressStyle = UMImage.CompressStyle.SCALE; + //网页 + UMWeb web = new UMWeb(shareUrl); + web.setTitle(shareTitle);//标题 + web.setThumb(shareImg); //缩略图 + web.setDescription(note);//描述 + new ShareAction(mActivity) + .setPlatform(SHARE_MEDIA.WEIXIN_CIRCLE)//传入平台 + .withMedia(web) + .setCallback(shareListener)//回调监听器 + .share(); +// ShareUtils.shareUmeng(mActivity, shareTitle, note, msgSinaContent, +// imageurl, shareUrl, bitmap); + }else { + +// new ShareAction(VideoDetailPolyvPlayerActivity.this) +// .setPlatform(SHARE_MEDIA.WEIXIN_CIRCLE)//传入平台 +// .withText("hello")//分享内容 +// .setCallback(shareListener)//回调监听器 +// .share(); + + //小程序 + bitmap = ImageLoader.getInstance().loadImageSync("assets://share_video.jpg"); + shareImg = new UMImage(VideoDetailPolyvPlayerActivity.this, bitmap); + UMMin umMin = new UMMin(shareUrl); + //兼容低版本的网页链接 + umMin.setThumb(shareImg); + // 小程序消息封面图片 + umMin.setTitle(shareTitle); + // 小程序消息title + umMin.setDescription(note); + + // 小程序消息描述 +// umMin.setPath("pages/gandanVideoDetailApp/gandanVideoDetailApp?contentID="+content); + umMin.setPath("pages/gandanVideoDetailApp/gandanVideoDetailApp?contentID="+content+"¬eIN="+note+"&titleName="+shareTitle); + //小程序页面路径 + umMin.setUserName("gh_11f9423d9de3"); + // 小程序原始id,在微信平台查询 + new ShareAction(VideoDetailPolyvPlayerActivity.this) + .withMedia(umMin) + .setPlatform(SHARE_MEDIA.WEIXIN) + .setCallback(shareListener)//回调监听器 +// .setCallback(new UMengShareHelper(VideoDetailPolyvPlayerActivity.this).shareListener) + .share(); + } + + } /** * 调用分享功能 */ @@ -1566,7 +1754,54 @@ public class VideoDetailPolyvPlayerActivity extends FragmentActivity implements } + private UMShareListener shareListener = new UMShareListener() { + /** + * @descrption 分享开始的回调 + * @param platform 平台类型 + */ + @Override + public void onStart(SHARE_MEDIA platform) { + switch (platform){ +// case WEIXIN: +// ToastUtil.showMessage("微信"); +// break; +// case WEIXIN_CIRCLE: +// +// ToastUtil.showMessage("微信朋友圈"); +// break; + + } + } + + /** + * @descrption 分享成功的回调 + * @param platform 平台类型 + */ + @Override + public void onResult(SHARE_MEDIA platform) { +// ToastUtil.showMessage("成功了"); + } + /** + * @descrption 分享失败的回调 + * @param platform 平台类型 + * @param t 错误原因 + */ + @Override + public void onError(SHARE_MEDIA platform, Throwable t) { +// ToastUtil.showMessage("失败"+t.getMessage()); + } + + /** + * @descrption 分享取消的回调 + * @param platform 平台类型 + */ + @Override + public void onCancel(SHARE_MEDIA platform) { + ToastUtil.showMessage("取消了"); + + } + }; EditText mEt_adds; TextView mTV_Sure, mTV_Cancel; @@ -1807,7 +2042,7 @@ public class VideoDetailPolyvPlayerActivity extends FragmentActivity implements videoView.setSeekType(PolyvSeekType.SEEKTYPE_NORMAL); videoView.setLoadTimeoutSecond(25);//加载超时时间，单位：秒 videoView.setBufferTimeoutSecond(15);//缓冲超时时间，单位：秒 - videoView.disableScreenCAP(this, true);//防录屏开关，true为开启，如果开启防录屏，投屏功能将不可用 + videoView.disableScreenCAP(this, false);//防录屏开关，true为开启，如果开启防录屏，投屏功能将不可用 videoView.setOnPreparedListener(new IPolyvOnPreparedListener2() { @Override diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/utils/ExitReceiver.java b/app/src/main/java/cn/shangyu/gdxzPatient/utils/ExitReceiver.java new file mode 100644 index 0000000..9a8ea06 --- /dev/null +++ b/app/src/main/java/cn/shangyu/gdxzPatient/utils/ExitReceiver.java @@ -0,0 +1,59 @@ +package cn.shangyu.gdxzPatient.utils; + +import android.content.BroadcastReceiver; +import android.content.Context; +import android.content.DialogInterface; +import android.content.Intent; +import android.view.WindowManager; + +import cn.shangyu.gdxzPatient.activity.ExitDialog; +import cn.shangyu.gdxzPatient.activity.LoginActivity; +import cn.shangyu.gdxzPatient.ecdemo.common.CCPAppManager; +import cn.shangyu.gdxzPatient.ecdemo.common.dialog.ECAlertDialog; +import cn.shangyu.gdxzPatient.ecdemo.common.utils.LogUtil; +import cn.shangyu.gdxzPatient.ecdemo.ui.SDKCoreHelper; + + +/** + * Created by WANGChengXin on 2019/12/17. + */ + +public class ExitReceiver extends BroadcastReceiver { + private ECAlertDialog dilaog2; + + @Override + public void onReceive(Context context, Intent intent) { + LogUtil.i("接收广播"); + Intent it = new Intent(); + it.setClass(context, cn.shangyu.gdxzPatient.activity.ExitDialog.class); + it.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + context.startActivity(it); +// if(dilaog2==null){ +// dilaog2 = ECAlertDialog.buildAlert(CCPAppManager.getContext(), +// "您的账号出现异常，已经被系统删除，如有疑问请联系肝胆相照工作人员~", "点击退出账号", new DialogInterface.OnClickListener() {// 确定 +// @Override +// public void onClick(DialogInterface dialog, int which) { +// // TODO Auto-generated method stub +// SharePrefUtil.clear(CCPAppManager.getContext(), "isLogin"); +// dilaog2.dismiss(); +// SDKCoreHelper.logout(false); +// SharePrefUtil.clear(CCPAppManager.getContext(), "isLogin"); +// Intent intent = new Intent(CCPAppManager.getContext(), LoginActivity.class); +// intent.putExtra("phone",SharePrefUtil.getString(CCPAppManager.getContext(), Constant.MOBILE, "")); +// intent.putExtra("flag", true); +// intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS); +// CCPAppManager.getContext().startActivity(intent); +// +// // 1登入系统 2退出系统 3患者客户端在手机前台运行 4.客户端在手机后台运行 +// +//// System.exit(0); +// } +// }); +// dilaog2.setTitle("温馨提示"); +// dilaog2.setCanceledOnTouchOutside(false); +// dilaog2.setCancelable(false); +// dilaog2.getWindow().setType(WindowManager.LayoutParams.TYPE_TOAST); +// dilaog2.show(); +// } + } +} diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/utils/GragWhiteViewGroup.java b/app/src/main/java/cn/shangyu/gdxzPatient/utils/GragWhiteViewGroup.java index 343ac7d..a348954 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/utils/GragWhiteViewGroup.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/utils/GragWhiteViewGroup.java @@ -13,6 +13,7 @@ import android.widget.TextView; import java.util.ArrayList; import cn.shangyu.gdxzPatient.R; +import cn.shangyu.gdxzPatient.ecdemo.common.utils.LogUtil; /** @@ -29,8 +30,8 @@ public class GragWhiteViewGroup extends ViewGroup { public static final String TEV_MODE = "TEVMODE"; //文本模式 private static final String TAG = "IViewGroup"; - private final int HorInterval = 35; //水平间隔 - private final int VerInterval = 40; //垂直间隔 + private final int HorInterval = 30; //水平间隔 + private final int VerInterval = 35; //垂直间隔 private int viewWidth; //控件的宽度 private int viewHeight; //控件的高度 @@ -161,13 +162,15 @@ public class GragWhiteViewGroup extends ViewGroup { // 获取在onMeasure中计算的视图尺寸 int measureHeight = childView.getMeasuredHeight(); int measuredWidth = childView.getMeasuredWidth(); + if (viewwidth + getNextHorLastPos(i) > viewWidth) { - viewwidth = HorInterval; + viewwidth = HorInterval+measuredWidth;//新的一行第一个View宽度 viewheight += (measureHeight + VerInterval); } else { viewwidth += (measuredWidth + HorInterval); } } + return viewheight; } diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/utils/UpdateVersionUtils.java b/app/src/main/java/cn/shangyu/gdxzPatient/utils/UpdateVersionUtils.java index 093fd7b..ceb95d5 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/utils/UpdateVersionUtils.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/utils/UpdateVersionUtils.java @@ -44,7 +44,7 @@ public class UpdateVersionUtils { /** * 检查更新 * - * @param dialog + * @param */ public static void checkUpdate(Context context, final String url, final boolean isShowProgressDialog) { ct = context; @@ -297,7 +297,7 @@ public class UpdateVersionUtils { /** * 设置进度 setProgress * - * @param progress2 + * @param progress * void */ private void setDialogProgress(int progress) { @@ -366,4 +366,28 @@ public class UpdateVersionUtils { } return verCode; } + + /** + * 判断新的版本是否大于当前版本 + * */ + public static boolean isUpdataInfo(String versionName,String newVersion){ + String[] split = versionName.split("\\.");//本地版本 + String[] split1 = newVersion.split("\\.");//最新版本 + + int i = Integer.parseInt(split[0]); + int i1 = Integer.parseInt(split1[0]); + int j = Integer.parseInt(split[1]); + int j1 = Integer.parseInt(split1[1]); + int k = Integer.parseInt(split[2]); + int k1 = Integer.parseInt(split1[2]); + if (i1>i){ + return true; + }else if (j1>j&&i1>=i){ + return true; + }else if (k1>k&&i1>=i&&j1>=j){ + return true; + }else + return false; + } + } diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/utils/Url.java b/app/src/main/java/cn/shangyu/gdxzPatient/utils/Url.java index c85a130..9abeda1 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/utils/Url.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/utils/Url.java @@ -368,4 +368,5 @@ public class Url { public static String deleteRecord = urlmyLan+"deleteRecord";// 删除视频浏览记录 public static String videoDetail = urlmyLan+"videoDetail";// 视频详情 + public static String getTotalPoints = urlmyLan+"getTotalPoints";// 获得总积分 } diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/view/GoodsViewGroup.java b/app/src/main/java/cn/shangyu/gdxzPatient/view/GoodsViewGroup.java index 5d94034..c4355c2 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/view/GoodsViewGroup.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/view/GoodsViewGroup.java @@ -159,7 +159,7 @@ public class GoodsViewGroup extends ViewGroup { int measureHeight = childView.getMeasuredHeight(); int measuredWidth = childView.getMeasuredWidth(); if (viewwidth + getNextHorLastPos(i) > viewWidth) { - viewwidth = HorInterval; + viewwidth = HorInterval+measuredWidth; viewheight += (measureHeight + VerInterval); } else { viewwidth += (measuredWidth + HorInterval); diff --git a/app/src/main/res/drawable-xhdpi/share_sina.png b/app/src/main/res/drawable-xhdpi/share_sina.png new file mode 100644 index 0000000..1603783 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/share_sina.png differ diff --git a/app/src/main/res/drawable-xhdpi/share_weixin.png b/app/src/main/res/drawable-xhdpi/share_weixin.png new file mode 100644 index 0000000..ab5c66b Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/share_weixin.png differ diff --git a/app/src/main/res/drawable-xhdpi/share_wxc.png b/app/src/main/res/drawable-xhdpi/share_wxc.png new file mode 100644 index 0000000..615c5c8 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/share_wxc.png differ diff --git a/app/src/main/res/layout/dialog_activity.xml b/app/src/main/res/layout/dialog_activity.xml new file mode 100644 index 0000000..398187d --- /dev/null +++ b/app/src/main/res/layout/dialog_activity.xml @@ -0,0 +1,9 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/popu_share_video.xml b/app/src/main/res/layout/popu_share_video.xml new file mode 100644 index 0000000..c300f5f --- /dev/null +++ b/app/src/main/res/layout/popu_share_video.xml @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +