diff --git a/app/src/main/java/com/sl/house_property/Main4Fragment.java b/app/src/main/java/com/sl/house_property/Main4Fragment.java index 01ad614..db7ec0d 100644 --- a/app/src/main/java/com/sl/house_property/Main4Fragment.java +++ b/app/src/main/java/com/sl/house_property/Main4Fragment.java @@ -8,8 +8,10 @@ import android.os.Bundle; import android.os.Environment; import android.os.Handler; import android.os.Message; +import android.provider.MediaStore; import android.support.v4.app.Fragment; import android.util.DisplayMetrics; +import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.widget.ImageView; @@ -84,6 +86,7 @@ public class Main4Fragment extends BaseFragment implements private BaseRecycleViewAdapter baseRecycleViewAdapter; private ImageView userImageView; BaseActivity baseActivity; + private String fileolod = ""; public Main4Fragment() { // Required empty public constructor @@ -213,6 +216,28 @@ public class Main4Fragment extends BaseFragment implements @Override public void confirm() { takeMyPhoto(1000); +// try { +// +// +// Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); +// intent.setAction(MediaStore.ACTION_IMAGE_CAPTURE); +// intent.putExtra(MediaStore.EXTRA_OUTPUT, Uri +// .fromFile(new File(fileolod))); +// startActivityForResult(intent, 1); +// +// +// //拍照我们用Action为MediaStore.ACTION_IMAGE_CAPTURE， +// //有些人使用其他的Action但我发现在有些机子中会出问题，所以优先选择这个 +// +// +// /* Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); +// intent.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(new File( +// Environment.getExternalStorageDirectory(), "temp.jpg"))); +// System.out.println("=============" + Environment.getExternalStorageDirectory());*/ +// +// } catch (Exception e) { +// e.printStackTrace(); +// } } @Override @@ -571,7 +596,7 @@ public class Main4Fragment extends BaseFragment implements @Override public void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); - + Log.e("测试","测试"); try { if (!(data == null)) { setIconDataFromIntent(data, requestCode,resultCode); diff --git a/app/src/main/java/com/sl/house_property/MainTabActivity.java b/app/src/main/java/com/sl/house_property/MainTabActivity.java index 26bd0f4..01a9341 100644 --- a/app/src/main/java/com/sl/house_property/MainTabActivity.java +++ b/app/src/main/java/com/sl/house_property/MainTabActivity.java @@ -6,6 +6,7 @@ import android.net.Uri; import android.os.Bundle; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentTransaction; +import android.util.Log; import android.view.Gravity; import android.view.MotionEvent; import android.view.View; @@ -328,6 +329,7 @@ public class MainTabActivity extends BaseActivity protected void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction(); + Log.e("测试","测试"); if (resultCode == RESUlT_CODE_4) { if (currentFragment == fragment4) { // if(fragment0!=null){ diff --git a/app/src/main/java/com/sl/house_property/user/MyPropertyActivity.java b/app/src/main/java/com/sl/house_property/user/MyPropertyActivity.java index 9db6cea..1b5c706 100644 --- a/app/src/main/java/com/sl/house_property/user/MyPropertyActivity.java +++ b/app/src/main/java/com/sl/house_property/user/MyPropertyActivity.java @@ -121,7 +121,8 @@ public class MyPropertyActivity extends BaseActivity homeGridAdapterItemBinding.tvFamily.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - if (homegridentityvArrayList.get(position).getString13().equals("1")) { + //此处接口返回的is_host是1，但是解析后是double类型的1.0，所以做了特别处理，如果日后有问题，看看后台返回的is_host值 + if (homegridentityvArrayList.get(position).getString13().equals("1.0")) { AddFamilyDialog addFamilyDialog = new AddFamilyDialog(MyPropertyActivity.this, new AddFamilyDialog.OnAddFamilyListener() { @Override public void click(String phone,String username) { diff --git a/app/src/main/java/utils/SelectPicDanimicActivity.java b/app/src/main/java/utils/SelectPicDanimicActivity.java index 80d4636..479719a 100644 --- a/app/src/main/java/utils/SelectPicDanimicActivity.java +++ b/app/src/main/java/utils/SelectPicDanimicActivity.java @@ -105,6 +105,28 @@ public class SelectPicDanimicActivity extends Activity implements OnClickListene break; } + try { + + + Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); + intent.setAction(MediaStore.ACTION_IMAGE_CAPTURE); + intent.putExtra(MediaStore.EXTRA_OUTPUT, Uri + .fromFile(new File(fileolod))); + startActivityForResult(intent, 1); + + + //拍照我们用Action为MediaStore.ACTION_IMAGE_CAPTURE， + //有些人使用其他的Action但我发现在有些机子中会出问题，所以优先选择这个 + + + /* Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); + intent.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(new File( + Environment.getExternalStorageDirectory(), "temp.jpg"))); + System.out.println("=============" + Environment.getExternalStorageDirectory());*/ + + } catch (Exception e) { + e.printStackTrace(); + } } diff --git a/app/src/main/res/layout/item_leibiandialog.xml b/app/src/main/res/layout/item_leibiandialog.xml index 6e5ed65..7a1548f 100644 --- a/app/src/main/res/layout/item_leibiandialog.xml +++ b/app/src/main/res/layout/item_leibiandialog.xml @@ -5,15 +5,15 @@ android:orientation="vertical"> @@ -30,9 +30,9 @@ android:textStyle="bold" /> diff --git a/app/src/main/res/mipmap-xxhdpi/icon_renlian.jpg b/app/src/main/res/mipmap-xxhdpi/icon_renlian.jpg new file mode 100644 index 0000000..22a72ef Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/icon_renlian.jpg differ