修改反馈的细节问题

app/build.gradle

@@ -11,10 +11,9 @@ android {
         javaCompileOptions { annotationProcessorOptions { includeCompileClasspath = true } }
 
         ndk {
-            abiFilters 'armeabi-v7a'//, 'armeabi-v7a', 'x86_64', 'arm64-v8a', mips, mips64...加入需要生成的文件夹
+            abiFilters 'armeabi-v7a','x86'//, 'armeabi-v7a', 'x86_64', 'arm64-v8a', mips, mips64...加入需要生成的文件夹
         }
     }
-
     signingConfigs {
         myconfig {
             keyAlias 'shitunet'

app/src/main/java/com/ynstkz/shitu/android/activity/OrgDetailActivity.java

@@ -130,7 +130,7 @@ public class OrgDetailActivity extends TitleBarActivity {
                 Intent intent = new Intent(OrgDetailActivity.this, OrgWriteCommentActivity.class);
                 intent.putExtra("memberId", memberId + "");
                 intent.putExtra("memberTitle", dataBean.getMemberName());
-                startActivity(intent);
+                startActivityForResult(intent, 10);
             }
         });
 
@@ -260,8 +260,13 @@ public class OrgDetailActivity extends TitleBarActivity {
                 GridView gvCommentPic = view.findViewById(R.id.gv_comment_pic);
 
                 if(!TextUtils.isEmpty(evaluateListBean.getHeadPic())){
-                    Glide.with(this).load(UrlCat.HOST + evaluateListBean.getHeadPic()).asBitmap()
-                            .transform(new GlideRoundTransform(this)).into(ivHeadPic);
+                    if(evaluateListBean.getHeadPic().startsWith("http")){
+                        Glide.with(this).load(evaluateListBean.getHeadPic()).asBitmap()
+                                .transform(new GlideRoundTransform(this)).into(ivHeadPic);
+                    } else {
+                        Glide.with(this).load(UrlCat.HOST + evaluateListBean.getHeadPic()).asBitmap()
+                                .transform(new GlideRoundTransform(this)).into(ivHeadPic);
+                    }
                 } else {
                     ivHeadPic.setImageResource(R.drawable.default_head_icon);
                 }
@@ -358,4 +363,15 @@ public class OrgDetailActivity extends TitleBarActivity {
             ivCollect.setImageResource(R.drawable.collect_press_icon);
         }
     }
+
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        switch (requestCode) {
+            case 10:
+                if(resultCode == RESULT_OK) {
+                    getOrgDetail(memberId);
+                }
+        }
+    }
 }

app/src/main/java/com/ynstkz/shitu/android/activity/OrgWriteCommentActivity.java

@@ -178,6 +178,7 @@ public class OrgWriteCommentActivity extends TitleBarActivity implements View.On
                 OrgCommentSubmintBean orgCommentSubmintBean = (OrgCommentSubmintBean)response;
                 if(orgCommentSubmintBean != null){
                     if("200".equals(orgCommentSubmintBean.getCode())){
+                        setResult(RESULT_OK);
                         finish();
                     }
                     showToast(orgCommentSubmintBean.getMsg());

app/src/main/java/com/ynstkz/shitu/android/activity/StudentInfoActivity.java

@@ -1,6 +1,7 @@
 package com.ynstkz.shitu.android.activity;
 
 import android.app.AlertDialog;
+import android.app.DatePickerDialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
@@ -8,6 +9,7 @@ import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.Button;
+import android.widget.DatePicker;
 import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
@@ -21,6 +23,8 @@ import com.ynstkz.shitu.android.bean.LocalCityBean;
 import com.ynstkz.shitu.android.data.RequestGroup;
 import com.ynstkz.shitu.android.view.ScrollViewWithGridView;
 
+import java.text.DateFormat;
+import java.util.Calendar;
 import java.util.List;
 
 import butterknife.Bind;
@@ -40,10 +44,10 @@ public class StudentInfoActivity extends TitleBarActivity {
     RelativeLayout viewTitle;
     @Bind(R.id.edit_username)
     EditText editUsername;
-    @Bind(R.id.edit_birthday)
-    EditText editBirthday;
-    @Bind(R.id.edit_sex)
-    EditText editSex;
+    @Bind(R.id.tv_birthday)
+    TextView tvBirthday;
+    @Bind(R.id.tv_sex)
+    TextView tvSex;
     @Bind(R.id.edit_nation)
     EditText editNation;
     @Bind(R.id.edit_native_place)
@@ -89,7 +93,8 @@ public class StudentInfoActivity extends TitleBarActivity {
     @Bind(R.id.btn_save)
     Button btnSave;
 
-
+    private String birthday;
+    private int sex;
     private String residenceProvinceId = "30";
     private String residenceCityId;
     private String residenceRegionId;
@@ -125,6 +130,45 @@ public class StudentInfoActivity extends TitleBarActivity {
     private void setListener() {
 
         /**
+         * 选择生日
+         */
+        tvBirthday.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                final Calendar calendar = Calendar.getInstance();
+                DatePickerDialog dialog = new DatePickerDialog(StudentInfoActivity.this, new DatePickerDialog.OnDateSetListener() {
+                    @Override
+                    public void onDateSet(DatePicker datePicker, int year, int monthOfYear, int dayOfMonth) {
+                        calendar.set(year, monthOfYear, dayOfMonth);
+                        birthday = android.text.format.DateFormat.format("yyyy-MM-dd", calendar).toString();
+                        tvBirthday.setText(birthday);
+                    }
+                },calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DAY_OF_MONTH));
+                dialog.show();
+            }
+        });
+
+        /**
+         * 性别
+         */
+        tvSex.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                final String[] chooseSex = getResources().getStringArray(R.array.choose_sex);
+                AlertDialog.Builder alertDialog = new AlertDialog.Builder(StudentInfoActivity.this);
+                alertDialog.setTitle("选择性别");
+                alertDialog.setItems(chooseSex, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialogInterface, int i) {
+                        sex = i;
+                        tvSex.setText(chooseSex[i]);
+                    }
+                });
+                alertDialog.show();
+            }
+        });
+
+        /**
          * 选择市
          */
         tvResidenceCityId.setOnClickListener(new View.OnClickListener() {
@@ -189,7 +233,6 @@ public class StudentInfoActivity extends TitleBarActivity {
                     showToast("用户名不能为空");
                     return;
                 }
-                String birthday = editBirthday.getText().toString().trim();
                 if(TextUtils.isEmpty(birthday)){
                     showToast("出生日期不能为空");
                     return;

app/src/main/java/com/ynstkz/shitu/android/adapter/OrgCommentListAdapter.java

@@ -1,6 +1,7 @@
 package com.ynstkz.shitu.android.adapter;
 
 import android.content.Context;
+import android.text.TextUtils;
 import android.view.Gravity;
 import android.view.View;
 import android.widget.GridView;
@@ -64,7 +65,11 @@ public class OrgCommentListAdapter extends CCListAdapter<EvaluateListBean>{
 
             @Override
             public void updateView(EvaluateListBean content, int position) {
-                Glide.with(context).load(content.getHeadPic()).into(ivIcon);
+                if(!TextUtils.isEmpty(content.getHeadPic())){
+                    Glide.with(context).load(content.getHeadPic()).into(ivIcon);
+                } else {
+                    ivIcon.setImageResource(R.drawable.default_head_icon);
+                }
                 tvUsername.setText(content.getUserName());
                 rbScore.setProgress(content.getScore());
                 tvContent.setText(content.getContent());

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

@@ -60,14 +60,14 @@
                     android:textColor="@color/color_666"
                     android:textSize="@dimen/company_16sp" />
 
-                <EditText
-                    android:id="@+id/edit_birthday"
+                <TextView
+                    android:id="@+id/tv_birthday"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
                     android:layout_marginLeft="@dimen/student_info_leftpadding"
                     android:background="@null"
-                    android:hint="请输入"
+                    android:text="请选择"
                     android:textColor="@color/color_999"
                     android:textSize="@dimen/company_16sp" />
 
@@ -90,14 +90,14 @@
                     android:textColor="@color/color_666"
                     android:textSize="@dimen/company_16sp" />
 
-                <EditText
-                    android:id="@+id/edit_sex"
+                <TextView
+                    android:id="@+id/tv_sex"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
                     android:layout_marginLeft="@dimen/student_info_leftpadding"
                     android:background="@null"
-                    android:hint="请输入"
+                    android:text="请选择"
                     android:textColor="@color/color_999"
                     android:textSize="@dimen/company_16sp" />
 

app/src/main/res/values/arrays.xml

@@ -60,4 +60,10 @@
         <item>人气</item>
     </string-array>
 
+    <string-array name="choose_sex">
+        <item>保密</item>
+        <item>男</item>
+        <item>女</item>
+    </string-array>
+
 </resources>