1。V3.3.1版本

app/build.gradle

@@ -12,8 +12,8 @@ android {
         applicationId "cn.shangyu.gdxzPatient"
         minSdkVersion 19
         targetSdkVersion 26
-        versionCode 56
+        versionCode 57
-        versionName "3.3.0"
+        versionName "3.3.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
     }

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="56"
+    android:versionCode="57"
-    android:versionName="3.3.0" >
+    android:versionName="3.3.1" >
 
     <uses-sdk
         android:minSdkVersion="14"

app/src/main/java/cn/shangyu/gdxzPatient/activity/AskAMoreIllnessActivity.java

@@ -440,6 +440,7 @@ public class AskAMoreIllnessActivity extends BaseActivity implements View.OnClic
 
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         // this.data = data;
+        LogUtil.i("requestCode = "+requestCode+",resultCode = "+resultCode);
         pd.show();
         if (resultCode == 102) {
             if (data == null) {
@@ -483,6 +484,8 @@ public class AskAMoreIllnessActivity extends BaseActivity implements View.OnClic
 
             return;
 
+        }else {
+            pd.dismiss();
         }
 
         if (resultCode == Activity.RESULT_OK) {
@@ -541,7 +544,7 @@ public class AskAMoreIllnessActivity extends BaseActivity implements View.OnClic
 
                         mBitmaps.add(mBitmaps.size() - 1, new AddBitmaps(false,
                                 loadedImage, name));
-                        if (mBitmaps.size() > 3) {
+                        if (mBitmaps.size() > 8) {
                             mBitmaps.remove(addBipmap);
                         }
                         gv_adapter.notifyDataSetChanged();

app/src/main/java/cn/shangyu/gdxzPatient/activity/ConslutNewActivity.java

@@ -8,6 +8,7 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RadioGroup;
 import android.widget.RelativeLayout;
+import android.widget.TextView;
 
 import cn.shangyu.gdxzPatient.R;
 import cn.shangyu.gdxzPatient.fragment.ConsultFragment;
@@ -30,6 +31,7 @@ public class ConslutNewActivity extends BaseActivity implements View.OnClickList
     private RelativeLayout rl_more;
     private boolean flag;
     private ImageView iv_zixun_view;
+    private TextView zixun,zixun2,wenda,wenda2;
 
     @Override
     public void setTitle() {
@@ -53,6 +55,10 @@ public class ConslutNewActivity extends BaseActivity implements View.OnClickList
         rl_one = (LinearLayout) view.findViewById(R.id.rl_one);
         rl_more =  view.findViewById(R.id.rl_more);
         iv_zixun_view =  view.findViewById(R.id.iv_zixun_view);
+        zixun =  view.findViewById(R.id.zixun);
+        zixun2 =  view.findViewById(R.id.zixun2);
+        wenda =  view.findViewById(R.id.wenda);
+        wenda2 =  view.findViewById(R.id.wenda2);
         boolean aBoolean = SharePrefUtil.getBoolean(UIUtils.getContext(), Constant.CONSULNEWTPOINT, false);
         if (aBoolean){
             iv_zixun_view.setVisibility(View.VISIBLE);
@@ -105,12 +111,24 @@ public class ConslutNewActivity extends BaseActivity implements View.OnClickList
                 if (flag){
                     changeOneToOne();
                     flag = false;
+                    zixun.setTextColor(getResources().getColor(R.color.white));
+                    zixun2.setTextColor(getResources().getColor(R.color.white));
+                    wenda.setTextColor(getResources().getColor(R.color.tab_text_nor));
+                    wenda2.setTextColor(getResources().getColor(R.color.tab_text_nor));
+                    rl_one.setBackgroundColor(getResources().getColor(R.color.patient_theme));
+                    rl_more.setBackgroundColor(getResources().getColor(R.color.white));
                 }
                 break;
             case R.id.rl_more:
                 if (!flag){
                     flag = true;
                     changeOneToM();
+                    zixun.setTextColor(getResources().getColor(R.color.tab_text_nor));
+                    zixun2.setTextColor(getResources().getColor(R.color.tab_text_nor));
+                    wenda.setTextColor(getResources().getColor(R.color.white));
+                    wenda2.setTextColor(getResources().getColor(R.color.white));
+                    rl_one.setBackgroundColor(getResources().getColor(R.color.white));
+                    rl_more.setBackgroundColor(getResources().getColor(R.color.patient_theme));
                 }
 
                 break;

app/src/main/java/cn/shangyu/gdxzPatient/activity/ProblemComplementActivity.java

@@ -82,6 +82,7 @@ public class ProblemComplementActivity extends BaseActivity implements View.OnCl
                 if (mBitmaps.size() < 6) {
                     mBitmaps.add(addBipmap);
                 }
+                pd.dismiss();
                 gv_adapter.notifyDataSetChanged();
 
             }
@@ -107,6 +108,9 @@ public class ProblemComplementActivity extends BaseActivity implements View.OnCl
         AppManager.getAppManager().addActivity2(this);
         step1_uuid = getIntent().getStringExtra("step1_uuid");
         from = getIntent().getStringExtra("from");
+        if (pd==null){
+            pd = new CustomProgressDialog(ProblemComplementActivity.this, "请稍候");
+        }
         initView();
         return view;
     }
@@ -432,14 +436,13 @@ public class ProblemComplementActivity extends BaseActivity implements View.OnCl
 
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         // this.data = data;
-
+        pd.show();
         if (resultCode == 102) {
             if (data == null) {
+                pd.dismiss();
                 return;
             }
-
             paths = (ArrayList<PhotoItem>) 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();

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
 		// 获取资源图片加号

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"
+         />
 
         <!-- android:stretchMode="columnWidth"   android:clipChildren="true" -->
 

app/src/main/res/layout/activity_askamoreillness.xml

@@ -184,13 +184,14 @@
                 android:layout_height="wrap_content" />
 
             <TextView
-                android:textSize="16sp"
+                android:textSize="14sp"
                 android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
                 android:layout_marginBottom="10dp"
                 android:lineSpacingExtra="5dp"
                 android:layout_marginTop="10dp"
                 android:textColor="@color/c999999"
-                android:text="请上传检查检验报告等照片，确保照片内容清晰，信息完整，以便医生确认病情（最多8张）"
+                android:text="请上传检查检验报告等照片，确保照片内容清晰，信息完整，以便医生确认病情，最多8张。(注意：为避免个人隐私暴露，请确保照片上无个人信息后再上传）"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content" />
 

app/src/main/res/layout/activity_consnew.xml

@@ -27,7 +27,12 @@
             android:layout_weight="1"
             android:layout_height="match_parent">
 
+            <View
+                android:layout_width="match_parent"
+                android:background="@color/tab_text_nor"
+                android:layout_height="0.5dp"/>
             <TextView
+                android:id="@+id/zixun"
                 android:text="一对一咨询"
                 android:layout_marginTop="5dp"
                 android:textColor="@color/white"
@@ -35,6 +40,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content" />
             <TextView
+                android:id="@+id/zixun2"
                 android:text="家庭医生式的解疑答惑"
                 android:textColor="@color/white"
                 android:textSize="12sp"
@@ -52,11 +58,15 @@
             android:id="@+id/rl_more"
             android:gravity="center_horizontal"
             android:orientation="vertical"
-            android:background="#ff9600"
+            android:background="@color/white"
             android:layout_width="0dp"
             android:layout_weight="1"
             android:layout_height="match_parent"
             >
+            <View
+                android:layout_width="match_parent"
+                android:background="@color/tab_text_nor"
+                android:layout_height="0.5dp"/>
             <ImageView
                 android:id="@+id/iv_zixun_view"
                 android:layout_alignTop="@+id/wenda"
@@ -71,15 +81,16 @@
                 android:id="@+id/wenda"
                 android:layout_marginTop="5dp"
                 android:layout_centerHorizontal="true"
-                android:textColor="@color/white"
+                android:textColor="@color/tab_text_nor"
                 android:textSize="17sp"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content" />
             <TextView
+                android:id="@+id/wenda2"
                 android:text="多位医生解答您的疑问"
                 android:layout_below="@+id/wenda"
                 android:textSize="12sp"
-                android:textColor="@color/white"
+                android:textColor="@color/tab_text_nor"
                 android:layout_centerHorizontal="true"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content" />

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" />
 

app/src/main/res/layout/topic_activity.xml

@@ -383,6 +383,16 @@
         android:layout_height="8dp"
         android:background="#efefef" />
 
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_marginLeft="15dp"
+        android:layout_marginRight="15dp"
+        android:layout_marginTop="10dp"
+        android:textColor="@color/c999999"
+        android:textSize="14sp"
+        android:lineSpacingExtra="5dp"
+        android:text="注意：为避免个人隐私暴露，请确保照片上无个人信息后再上传"
+        android:layout_height="wrap_content" />
     <GridView
         android:id="@+id/gv_add_topic"
         android:layout_width="match_parent"