diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CardHolder.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CardHolder.java index 0e726c5..6a0610b 100644 --- a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CardHolder.java +++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CardHolder.java @@ -56,7 +56,6 @@ public class CardHolder extends RecyclerView.ViewHolder { context.startActivity(i); } }); - } diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/camera/FoodMaterialCamera.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/camera/FoodMaterialCamera.java index 2477de1..0c15f16 100644 --- a/app/src/main/java/com/example/ninefourone/nutritionmaster/camera/FoodMaterialCamera.java +++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/camera/FoodMaterialCamera.java @@ -7,6 +7,7 @@ import android.hardware.Camera; import android.os.Bundle; import android.support.annotation.Nullable; import android.support.v7.app.AppCompatActivity; +import android.view.Display; import android.view.Surface; import android.view.View; import android.view.Window; @@ -17,6 +18,7 @@ import android.widget.TextView; import com.example.ninefourone.nutritionmaster.R; import com.example.ninefourone.nutritionmaster.utils.MessageUtils; +import com.orhanobut.logger.Logger; import butterknife.BindView; import butterknife.ButterKnife; @@ -42,6 +44,8 @@ public class FoodMaterialCamera extends AppCompatActivity { private CameraPreview mPreview; private int mCameraId = Camera.CameraInfo.CAMERA_FACING_BACK; + private int widthPixel; + private float heightPixel; @Override protected void onCreate(@Nullable Bundle savedInstanceState) { @@ -55,6 +59,9 @@ public class FoodMaterialCamera extends AppCompatActivity { //注意:上面两个设置必须写在setContentView前面 setContentView(R.layout.cameras_layout); ButterKnife.bind(this); + Display display = getWindowManager().getDefaultDisplay(); + widthPixel = display.getWidth(); + heightPixel = display.getHeight() * (14.0f / 16); if (!checkCameraHardware(this)) { MessageUtils.MakeToast("不支持相机"); @@ -65,6 +72,12 @@ public class FoodMaterialCamera extends AppCompatActivity { setCameraDisplayOrientation(this, mCameraId, mCamera); } + @Override + public void onWindowFocusChanged(boolean hasFocus) { + super.onWindowFocusChanged(hasFocus); + + } + /** * 检查当前设备是否有相机 * @@ -109,8 +122,10 @@ public class FoodMaterialCamera extends AppCompatActivity { Camera c = null; try { c = Camera.open(); + Camera.Parameters mParameters = c.getParameters(); - mParameters.setPictureSize(720, 1280); + Logger.d(widthPixel+", "+heightPixel); + mParameters.setPictureSize(widthPixel, (int) heightPixel); c.setParameters(mParameters); } catch (Exception e) { e.printStackTrace(); diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/addinformation/AddPhysiqueActivity.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/addinformation/AddPhysiqueActivity.java index 7071c4c..cb99a0b 100644 --- a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/addinformation/AddPhysiqueActivity.java +++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/addinformation/AddPhysiqueActivity.java @@ -94,7 +94,6 @@ public class AddPhysiqueActivity extends BaseActivity { private void initAddView() { BaseAdapter adapter = new BaseAdapter() { - @Override public int getCount() { return colors.length; @@ -113,6 +112,7 @@ public class AddPhysiqueActivity extends BaseActivity { @Override public View getView(final int position, View child, ViewGroup parent) { + child = LayoutInflater.from(parent.getContext()).inflate(R.layout.add_item, parent, false); child.findViewById(R.id.image).setBackgroundColor(colors[position]); @@ -143,7 +143,6 @@ public class AddPhysiqueActivity extends BaseActivity { } }); } else { - firstButtons[position].setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -190,6 +189,9 @@ public class AddPhysiqueActivity extends BaseActivity { @Override public void onTurned(int position) { bottomContent.setBackgroundColor(colors[position] - 60); + firstButtons[position].setEnabled(true); + secondButtons[position].setEnabled(true); + thirdButtons[position].setEnabled(true); } }); diff --git a/app/src/main/res/layout/add_item.xml b/app/src/main/res/layout/add_item.xml index 962700c..7073a8e 100644 --- a/app/src/main/res/layout/add_item.xml +++ b/app/src/main/res/layout/add_item.xml @@ -35,6 +35,7 @@ android:id="@+id/choose_first" android:layout_width="150dp" android:layout_height="50dp" + android:enabled="false" android:text="测试" android:textSize="13sp" android:visibility="gone"> @@ -46,6 +47,7 @@ android:layout_width="150dp" android:layout_height="50dp" android:layout_marginTop="20dp" + android:enabled="false" android:text="测试" android:textSize="13sp" android:visibility="gone"> @@ -57,6 +59,7 @@ android:layout_width="150dp" android:layout_height="50dp" android:layout_marginTop="20dp" + android:enabled="false" android:text="测试" android:textSize="13sp" android:visibility="gone"> diff --git a/app/src/main/res/layout/cameras_layout.xml b/app/src/main/res/layout/cameras_layout.xml index 8fd2bc9..13a1e8d 100644 --- a/app/src/main/res/layout/cameras_layout.xml +++ b/app/src/main/res/layout/cameras_layout.xml @@ -16,7 +16,7 @@ + android:layout_weight="14"> + android:layout_weight="2" + android:alpha="0.2" + android:background="#8a515050">