diff --git a/app/build.gradle b/app/build.gradle index bae5141..85b1c51 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,8 +12,8 @@ android { applicationId "cn.shangyu.gdxzPatient" minSdkVersion 19 targetSdkVersion 26 - versionCode 56 - versionName "3.3.0" + versionCode 57 + versionName "3.3.1" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" multiDexEnabled true } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f805184..0219467 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="57" + android:versionName="3.3.1" > ) data.getSerializableExtra("photos"); - mBitmaps.remove(addBipmap); new Thread() { @@ -474,6 +477,8 @@ public class ProblemComplementActivity extends BaseActivity implements View.OnCl return; + }else { + pd.dismiss(); } if (resultCode == Activity.RESULT_OK) { @@ -532,7 +537,7 @@ public class ProblemComplementActivity extends BaseActivity implements View.OnCl mBitmaps.add(mBitmaps.size() - 1, new AddBitmaps(false, loadedImage, name)); - if (mBitmaps.size() > 3) { + if (mBitmaps.size() > 6) { mBitmaps.remove(addBipmap); } gv_adapter.notifyDataSetChanged(); diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/StratConActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/StratConActivity.java index 01547f6..72fa8d9 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/StratConActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/StratConActivity.java @@ -312,7 +312,6 @@ public class StratConActivity extends BaseActivity implements OnClickListener, tv_suggest.setText("上传图片"); tv_sug = (TextView) mView.findViewById(R.id.tv_sug); tv_sug.setVisibility(View.VISIBLE); - tv_sug.setText("上传病例、检查化验报告等图片"); tv_casename = (TextView) mView.findViewById(R.id.tv_casename); gv_add_case = (GridView) mView.findViewById(R.id.gv_add_case);// gridView // 获取资源图片加号 diff --git a/app/src/main/res/layout/activity_add_case.xml b/app/src/main/res/layout/activity_add_case.xml index e1f4168..5b05e6a 100644 --- a/app/src/main/res/layout/activity_add_case.xml +++ b/app/src/main/res/layout/activity_add_case.xml @@ -112,9 +112,13 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="15dp" + android:text="上传病历、检查化验报告等图片(注意:为避免个人隐私暴露,请确保照片上无个人信息后再上传)" android:layout_marginTop="5dp" + android:layout_marginRight="15dp" + android:lineSpacingExtra="5dp" android:textColor="@color/gray" - android:visibility="gone" /> + android:visibility="gone" + /> diff --git a/app/src/main/res/layout/activity_askamoreillness.xml b/app/src/main/res/layout/activity_askamoreillness.xml index 6882857..703aab8 100644 --- a/app/src/main/res/layout/activity_askamoreillness.xml +++ b/app/src/main/res/layout/activity_askamoreillness.xml @@ -184,13 +184,14 @@ android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/activity_consnew.xml b/app/src/main/res/layout/activity_consnew.xml index 38c9628..d60e775 100644 --- a/app/src/main/res/layout/activity_consnew.xml +++ b/app/src/main/res/layout/activity_consnew.xml @@ -27,7 +27,12 @@ android:layout_weight="1" android:layout_height="match_parent"> + + diff --git a/app/src/main/res/layout/activity_problemcomplement.xml b/app/src/main/res/layout/activity_problemcomplement.xml index 7b9c86d..fea3ef6 100644 --- a/app/src/main/res/layout/activity_problemcomplement.xml +++ b/app/src/main/res/layout/activity_problemcomplement.xml @@ -86,7 +86,7 @@ android:layout_marginLeft="10dp" android:layout_marginRight="10dp" android:textSize="14sp" - android:text="请上传检查检验报告等照片,确保照片内容清晰,信息完整,以便医生确认病情,最多6张" + android:text="请上传检查检验报告等照片,确保照片内容清晰,信息完整,以便医生确认病情,最多6张。(注意:为避免个人隐私暴露,请确保照片上无个人信息后再上传)" android:layout_width="wrap_content" android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/topic_activity.xml b/app/src/main/res/layout/topic_activity.xml index 18606c3..997ff31 100644 --- a/app/src/main/res/layout/topic_activity.xml +++ b/app/src/main/res/layout/topic_activity.xml @@ -383,6 +383,16 @@ android:layout_height="8dp" android:background="#efefef" /> +