Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【光环助手V5.5.0】游戏单 UI 修复(7,8) https://git.shanqu.cc/pm/halo-app-issues/-/issues/1647

Browse Source
This commit is contained in:
jack
2021-12-04 14:21:47 +08:00
parent f92490406e
commit bc23240003
16 changed files with 153 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/com/gh/gamecenter/CropImageActivity.java
View File

@ -5,10 +5,10 @@ import android.content.Intent;
import android.graphics.Bitmap;
import android.graphics.Color;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.MenuItem;
import android.view.View;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.gh.base.ToolBarActivity;
@ -20,10 +20,8 @@ import com.gh.common.view.CropImageCustom;
import java.io.File;
import java.lang.ref.SoftReference;
import androidx.annotation.LayoutRes;
import androidx.annotation.NonNull;
import androidx.core.view.OnApplyWindowInsetsListener;
import androidx.core.view.ViewCompat;
import androidx.core.view.WindowInsetsCompat;
import butterknife.BindView;
@ -47,11 +45,17 @@ public class CropImageActivity extends ToolBarActivity {
@NonNull
public static Intent getIntent(Context context, String picturePath, float cropRatio, boolean isBlackTheme, String entrance) {
return getIntent(context, picturePath, cropRatio, isBlackTheme, -1, entrance);
}
@NonNull
public static Intent getIntent(Context context, String picturePath, float cropRatio, boolean isBlackTheme, @LayoutRes int assistRes, String entrance) {
Intent intent = new Intent(context, CropImageActivity.class);
intent.putExtra(EntranceUtils.KEY_PATH, picturePath);
intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance);
intent.putExtra(EntranceUtils.KEY_IMAGE_CROP_RATIO, cropRatio);
intent.putExtra(EntranceUtils.KEY_BLACK_THEME, isBlackTheme);
intent.putExtra(EntranceUtils.KEY_ASSIST_RES, assistRes);
return intent;
}
@ -77,6 +81,12 @@ public class CropImageActivity extends ToolBarActivity {
float ratio = getIntent().getFloatExtra(EntranceUtils.KEY_IMAGE_CROP_RATIO, 1F);
mCropImageCustom.setCropRatio(ratio);
int assistRes = getIntent().getIntExtra(EntranceUtils.KEY_ASSIST_RES, -1);
if (assistRes > 0) {
View view = LayoutInflater.from(this).inflate(assistRes, null, false);
addAssistView(view);
}
DisplayUtils.setLightStatusBar(this, !mBlackTheme);
DisplayUtils.setStatusBarColor(this, R.color.transparent, !mBlackTheme);
}
@ -100,6 +110,10 @@ public class CropImageActivity extends ToolBarActivity {
return super.onMenuItemClick(item);
}
public void addAssistView(View view) {
mCropImageCustom.addAssistView(view);
}
@Override
protected void onDestroy() {
super.onDestroy();