chen
/
gdxz_patient
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

1。V3.3.3版本

master
zhaodewei 5 years ago
parent
e004ec0030
commit
d9eb46dd4b
9 changed files with 160 additions and 35 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 31
      app/src/main/java/cn/shangyu/gdxzPatient/activity/AddHospitalScoreActivity.java
  2. 4
      app/src/main/java/cn/shangyu/gdxzPatient/activity/LoginActivity.java
  3. 31
      app/src/main/java/cn/shangyu/gdxzPatient/activity/ModifyMyDataActivity.java
  4. 38
      app/src/main/java/cn/shangyu/gdxzPatient/activity/ModifyMyMedicalRecordActivity.java
  5. 17
      app/src/main/java/cn/shangyu/gdxzPatient/activity/OnlinePayActivity.java
  6. 3
      app/src/main/java/cn/shangyu/gdxzPatient/activity/SendFlowerNewActivity.java
  7. 32
      app/src/main/java/cn/shangyu/gdxzPatient/activity/SetInformationActivity.java
  8. 5
      app/src/main/java/cn/shangyu/gdxzPatient/activity/VideoSearch1Activity.java
  9. 6
      app/src/main/java/cn/shangyu/gdxzPatient/pointsmall/BuyIntegerActivty.java

31
app/src/main/java/cn/shangyu/gdxzPatient/activity/AddHospitalScoreActivity.java
View File

@ -13,9 +13,12 @@ import java.util.Map;
import org.json.JSONException;
import org.json.JSONObject;
import com.github.dfqin.grantor.PermissionListener;
import com.github.dfqin.grantor.PermissionsUtil;
import com.nostra13.universalimageloader.core.ImageLoader;
import com.nostra13.universalimageloader.core.listener.SimpleImageLoadingListener;
import android.Manifest;
import android.annotation.SuppressLint;
import android.app.Activity;
import android.content.Intent;
@ -23,10 +26,12 @@ import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.drawable.BitmapDrawable;
import android.net.Uri;
import android.os.Build;
import android.os.Environment;
import android.os.Handler;
import android.os.Message;
import android.provider.MediaStore;
import android.support.annotation.NonNull;
import android.view.Gravity;
import android.view.View;
import android.view.ViewGroup;
@ -216,9 +221,35 @@ public class AddHospitalScoreActivity extends BaseActivity implements
@Override
public void onClick(View v) {
// 拍照获取照片
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
// 拍照获取照片
if (PermissionsUtil.hasPermission(AddHospitalScoreActivity.this, Manifest.permission.CAMERA)) {
//有访问摄像头的权限,读写内存，网络定位，打电话，读取短信，录音,通讯录
takePhoto();
mPopupWindowDialog.dismiss();
} else {
PermissionsUtil.requestPermission(AddHospitalScoreActivity.this, new PermissionListener() {
@Override
public void permissionGranted(@NonNull String[] permissions) {
//用户授予了访问读取短信的权限
takePhoto();
mPopupWindowDialog.dismiss();
}
@Override
public void permissionDenied(@NonNull String[] permissions) {
//用户拒绝了访问读取短信的申请
}
}, new String[]{Manifest.permission.CAMERA});
}
}else {
takePhoto();
mPopupWindowDialog.dismiss();
}
}
});
ll_selected_photo.setOnClickListener(new OnClickListener() {

4
app/src/main/java/cn/shangyu/gdxzPatient/activity/LoginActivity.java
View File

@ -397,8 +397,8 @@ public class LoginActivity extends BaseActivity implements OnClickListener {
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;

31
app/src/main/java/cn/shangyu/gdxzPatient/activity/ModifyMyDataActivity.java
View File

@ -17,6 +17,8 @@ import pickerview.OptionsPopupWindow;
import pickerview.TimePopupWindow;
import pickerview.TimePopupWindow.OnTimeSelectListener;
import pickerview.TimePopupWindow.Type;
import android.Manifest;
import android.annotation.SuppressLint;
import android.app.Activity;
import android.app.AlertDialog;
@ -30,12 +32,14 @@ import android.graphics.BitmapFactory;
import android.graphics.drawable.BitmapDrawable;
import android.net.Uri;
import android.os.AsyncTask;
import android.os.Build;
import android.os.Bundle;
import android.os.Environment;
import android.os.Handler;
import android.os.Message;
import android.provider.DocumentsContract;
import android.provider.MediaStore;
import android.support.annotation.NonNull;
import android.text.TextUtils;
import android.view.Gravity;
import android.view.LayoutInflater;
@ -80,6 +84,9 @@ import cn.shangyu.gdxzPatient.widget.CircleImageView;
import cn.shangyu.gdxzPatient.widget.CustomProgressDialog;
import cn.shangyu.gdxzPatient.widget.LoadingPage.ResultState;
import cn.shangyu.gdxzPatient.widget.time.WheelMain;
import com.github.dfqin.grantor.PermissionListener;
import com.github.dfqin.grantor.PermissionsUtil;
import com.google.gson.Gson;
import com.nostra13.universalimageloader.core.ImageLoader;
import com.nostra13.universalimageloader.core.listener.SimpleImageLoadingListener;
@ -1112,8 +1119,32 @@ public class ModifyMyDataActivity extends BaseActivity implements
public void onClick(View v) {
// TODO Auto-generated method stub
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
// 拍照获取照片
if (PermissionsUtil.hasPermission(ModifyMyDataActivity.this, Manifest.permission.CAMERA)) {
//有访问摄像头的权限,读写内存，网络定位，打电话，读取短信，录音,通讯录
takePhoto();
} else {
PermissionsUtil.requestPermission(ModifyMyDataActivity.this, new PermissionListener() {
@Override
public void permissionGranted(@NonNull String[] permissions) {
//用户授予了访问读取短信的权限
takePhoto();
}
@Override
public void permissionDenied(@NonNull String[] permissions) {
//用户拒绝了访问读取短信的申请
}
}, new String[]{Manifest.permission.CAMERA});
}
}else {
takePhoto();
}
}
});
ll_selected_photo.setOnClickListener(new OnClickListener() {

38
app/src/main/java/cn/shangyu/gdxzPatient/activity/ModifyMyMedicalRecordActivity.java
View File

@ -15,10 +15,13 @@ import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import com.github.dfqin.grantor.PermissionListener;
import com.github.dfqin.grantor.PermissionsUtil;
import com.nostra13.universalimageloader.core.DisplayImageOptions;
import com.nostra13.universalimageloader.core.ImageLoader;
import com.nostra13.universalimageloader.core.listener.SimpleImageLoadingListener;
import android.Manifest;
import android.annotation.SuppressLint;
import android.app.Activity;
import android.content.Intent;
@ -27,10 +30,12 @@ import android.graphics.Bitmap.CompressFormat;
import android.graphics.BitmapFactory;
import android.graphics.drawable.BitmapDrawable;
import android.net.Uri;
import android.os.Build;
import android.os.Environment;
import android.os.Handler;
import android.os.Message;
import android.provider.MediaStore;
import android.support.annotation.NonNull;
import android.text.Editable;
import android.text.TextWatcher;
import android.util.Log;
@ -844,12 +849,45 @@ public class ModifyMyMedicalRecordActivity extends BaseActivity implements
@Override
public void onClick(View v) {
// 拍照获取照片
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
// 拍照获取照片
if (PermissionsUtil.hasPermission(ModifyMyMedicalRecordActivity.this, Manifest.permission.CAMERA)) {
//有访问摄像头的权限,读写内存，网络定位，打电话，读取短信，录音,通讯录
takePhoto();
if (mPopupWindowDialog != null
&& mPopupWindowDialog.isShowing()) {
mPopupWindowDialog.dismiss();// 消失
}
} else {
PermissionsUtil.requestPermission(ModifyMyMedicalRecordActivity.this, new PermissionListener() {
@Override
public void permissionGranted(@NonNull String[] permissions) {
//用户授予了访问读取短信的权限
takePhoto();
if (mPopupWindowDialog != null
&& mPopupWindowDialog.isShowing()) {
mPopupWindowDialog.dismiss();// 消失
}
}
@Override
public void permissionDenied(@NonNull String[] permissions) {
//用户拒绝了访问读取短信的申请
}
}, new String[]{Manifest.permission.CAMERA});
}
}else {
takePhoto();
if (mPopupWindowDialog != null
&& mPopupWindowDialog.isShowing()) {
mPopupWindowDialog.dismiss();// 消失
}
}
}
});
ll_selected_photo.setOnClickListener(new OnClickListener() {

17
app/src/main/java/cn/shangyu/gdxzPatient/activity/OnlinePayActivity.java
View File

@ -124,8 +124,7 @@ public class OnlinePayActivity extends BaseActivity implements OnClickListener{
OnlinePayActivity.this, "余额支付 ¥ " + balance + " 余额不足",
"余额不足", Color.RED);
stringFormatUtil.fillColor();
rb_balance_pay
.setText(stringFormatUtil.fillColor().getResult());
rb_balance_pay.setText(stringFormatUtil.fillColor().getResult());
} else {
balance_pay = true;
rb_balance_pay.setText("余额支付 ¥ " + balance);
@ -135,13 +134,7 @@ public class OnlinePayActivity extends BaseActivity implements OnClickListener{
public void onClick(View v) {
// TODO Auto-generated method stub
if (!balance_pay) {
// StringFormatUtil stringFormatUtil = new
// StringFormatUtil(
// OnlinePayActivity.this, "余额支付 ¥ " + balance
// + " 余额不足", "余额不足", Color.RED);
// stringFormatUtil.fillColor();
// rb_balance_pay.setText(stringFormatUtil.fillColor()
// .getResult());
rb_balance_pay.setChecked(false);
ToastUtil.showMessage("余额不足");
@ -177,13 +170,12 @@ public class OnlinePayActivity extends BaseActivity implements OnClickListener{
// TODO Auto-generated method stub
switch (checkedRadioButtonId) {
case R.id.rb_balance_pay:
if (balance_pay) {
// 餘額支付
showAlertDialog();
//
} else {
ToastUtil.showMessage("余额不足，请选择其他方式支付");
ToastUtil.showMessage("请选择付款方式");
return;
}
break;
@ -194,11 +186,10 @@ public class OnlinePayActivity extends BaseActivity implements OnClickListener{
payTheOrder(CHANNEL_ALIPAY);
break;
case R.id.rb_union_pay:
payTheOrder(CHANNEL_UPACP);
break;
default:
ToastUtil.showMessage("请选择付款方式");
break;
}
}

3
app/src/main/java/cn/shangyu/gdxzPatient/activity/SendFlowerNewActivity.java
View File

@ -492,8 +492,7 @@ public class SendFlowerNewActivity extends BaseActivity implements
amount = createOrderBean.getAmount() + "";
// ToastUtil.showMessage(amount);
balance = StringUtil.saveTwo(createOrderBean
.getAvailableBalance());
balance = StringUtil.saveTwo(createOrderBean.getAvailableBalance());
handler.sendEmptyMessage(0);
} else {

32
app/src/main/java/cn/shangyu/gdxzPatient/activity/SetInformationActivity.java
View File

@ -18,8 +18,12 @@ import pickerview.TimePopupWindow;
import pickerview.TimePopupWindow.OnTimeSelectListener;
import pickerview.TimePopupWindow.Type;
import com.github.dfqin.grantor.PermissionListener;
import com.github.dfqin.grantor.PermissionsUtil;
import com.google.gson.Gson;
import com.yuntongxun.ecsdk.ECInitParams;
import android.Manifest;
import android.annotation.SuppressLint;
import android.app.Activity;
import android.content.Intent;
@ -31,11 +35,13 @@ import android.graphics.BitmapFactory;
import android.graphics.drawable.BitmapDrawable;
import android.net.Uri;
import android.os.AsyncTask;
import android.os.Build;
import android.os.Bundle;
import android.os.Environment;
import android.os.Handler;
import android.os.Message;
import android.provider.MediaStore;
import android.support.annotation.NonNull;
import android.text.TextUtils;
import android.view.Gravity;
import android.view.View;
@ -1202,7 +1208,31 @@ public class SetInformationActivity extends BaseActivity implements
@Override
public void onClick(View v) {
// TODO Auto-generated method stub
takePhoto();// 拍照获取
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
// 拍照获取照片
if (PermissionsUtil.hasPermission(SetInformationActivity.this, Manifest.permission.CAMERA)) {
//有访问摄像头的权限,读写内存，网络定位，打电话，读取短信，录音,通讯录
takePhoto();
} else {
PermissionsUtil.requestPermission(SetInformationActivity.this, new PermissionListener() {
@Override
public void permissionGranted(@NonNull String[] permissions) {
//用户授予了访问读取短信的权限
takePhoto();
}
@Override
public void permissionDenied(@NonNull String[] permissions) {
//用户拒绝了访问读取短信的申请
}
}, new String[]{Manifest.permission.CAMERA});
}
}else {
takePhoto();
}
}
});

5
app/src/main/java/cn/shangyu/gdxzPatient/activity/VideoSearch1Activity.java
View File

@ -432,6 +432,10 @@ public class VideoSearch1Activity extends BaseActivity implements OnClickListene
GDSearchVideoBean bean = gson.fromJson(resultJson,
GDSearchVideoBean.class);
pd.dismiss();
if(bean.code==0){
ToastUtil.showMessage(bean.message);
}else{
if (startPage==1) {
list1 = bean.data.list;
}else{
@ -443,6 +447,7 @@ public class VideoSearch1Activity extends BaseActivity implements OnClickListene
}
handler.sendEmptyMessage(GET_DATA_SUCCESS);
}
}
@Override
public void onCheckedChanged(RadioGroup group, int checkedId) {

6
app/src/main/java/cn/shangyu/gdxzPatient/pointsmall/BuyIntegerActivty.java
View File

@ -391,9 +391,9 @@ public class BuyIntegerActivty extends BaseActivity implements View.OnClickListe
LogUtil.i("orderId = "+order_id);
intent.putExtra("name", "");
intent.putExtra("amount", amount+"");
intent.putExtra("balance", "");
intent.putExtra("getAvailableBalance",0);
intent.putExtra("payFee",0);
intent.putExtra("balance", createOrderBean.getOrder().getAvailableBalance()+"");
intent.putExtra("getAvailableBalance",createOrderBean.getOrder().getAvailableBalance());
intent.putExtra("payFee",amount);
intent.setType("buyInteger");
intent.putExtra("paid", "");
startActivityForResult(intent, 10);

Write Preview
Loading…
Cancel
Save