From 86feaf1ec2150fb572fb05e529b8bf743531b6cc Mon Sep 17 00:00:00 2001 From: XiuYun CHEN Date: Wed, 5 Jan 2022 09:06:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E4=BB=BD3.7.8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gdxzPatient/activity/BaoGtActivity.java | 3 + .../activity/KepuCollectActivity.java | 3 + .../activity/MyEditPhoneActivity.java | 62 +++++++++---------- .../activity/NewLessonsActivity.java | 4 +- .../activity/NewsCollectActivity.java | 3 + .../activity/NewsSearchActivity.java | 3 + .../gdxzPatient/activity/RegistActivity.java | 52 ++++++++-------- .../activity/RemoveExpertActivity.java | 3 + .../activity/VideoCollectActivity.java | 3 + .../activity/VideoSearch1Activity.java | 20 ++++-- .../activity/WithDrawalsActivity.java | 46 +++++++------- .../activity/WriteTopicActivity.java | 2 + .../ecdemo/common/dialog/ECAlertDialog.java | 12 +++- .../ecdemo/ui/xiaomi/PermissionActivity.java | 2 +- .../res/layout/activity_video_collect.xml | 4 +- .../res/layout/activity_video_search1.xml | 4 +- app/src/main/res/layout/rem_exp_activity.xml | 4 +- app/src/main/res/layout/topic_activity.xml | 1 + 18 files changed, 138 insertions(+), 93 deletions(-) diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/BaoGtActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/BaoGtActivity.java index 05b441b..72564eb 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/BaoGtActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/BaoGtActivity.java @@ -6,6 +6,7 @@ import java.util.List; import java.util.Map; import com.google.gson.Gson; +import com.gyf.immersionbar.ImmersionBar; import com.handmark.pulltorefresh.library.ILoadingLayout; import com.handmark.pulltorefresh.library.PullToRefreshBase; import com.handmark.pulltorefresh.library.PullToRefreshListView; @@ -142,6 +143,8 @@ public class BaoGtActivity extends BaseActivity implements OnClickListener,OnCal protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_video_search1); + View toolbar_top=findViewById(R.id.toolbar_top); + ImmersionBar.with(this).keyboardEnable(true).statusBarDarkFont(true).titleBar(toolbar_top).init(); rl_back = (RelativeLayout)findViewById(R.id.top_back_layout); rl_back.setOnClickListener(this); ll_empty_visit = (LinearLayout)findViewById(R.id.ll_empty_visit); diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/KepuCollectActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/KepuCollectActivity.java index 8da9aab..95033fd 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/KepuCollectActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/KepuCollectActivity.java @@ -15,6 +15,7 @@ import android.widget.RelativeLayout; import android.widget.TextView; import com.google.gson.Gson; +import com.gyf.immersionbar.ImmersionBar; import com.handmark.pulltorefresh.library.ILoadingLayout; import com.handmark.pulltorefresh.library.PullToRefreshBase; import com.handmark.pulltorefresh.library.PullToRefreshListView; @@ -118,6 +119,8 @@ public class KepuCollectActivity extends Activity implements View.OnClickListene protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_video_collect); + View toolbar_top=findViewById(R.id.toolbar_top); + ImmersionBar.with(this).keyboardEnable(true).statusBarDarkFont(true).titleBar(toolbar_top).init(); rl_back = (RelativeLayout) findViewById(R.id.top_back_layout); rl_back.setOnClickListener(this); ll_empty_visit = (LinearLayout) findViewById(R.id.ll_empty_visit); diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/MyEditPhoneActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/MyEditPhoneActivity.java index d8d7245..c7ce968 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/MyEditPhoneActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/MyEditPhoneActivity.java @@ -550,34 +550,34 @@ public class MyEditPhoneActivity extends BaseActivity implements } // LogUtils.v("获取验证码"); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - - if (PermissionsUtil.hasPermission(this, Manifest.permission.READ_SMS)) { - //有访问摄像头的权限,读写内存，网络定位，打电话，读取短信，录音,通讯录 - tv_get_identifying_code.startTimer(); - getSystemTime(); - } else { - PermissionsUtil.requestPermission(this, new PermissionListener() { - @Override - public void permissionGranted(@NonNull String[] permissions) { - //用户授予了访问读取短信的权限 - tv_get_identifying_code.startTimer(); - getSystemTime(); - } - @Override - public void permissionDenied(@NonNull String[] permissions) { - //用户拒绝了访问读取短信的申请 -// finish(); - - } - - }, new String[]{Manifest.permission.READ_SMS}); - } - - }else { +// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { +// +// if (PermissionsUtil.hasPermission(this, Manifest.permission.READ_SMS)) { +// //有访问摄像头的权限,读写内存，网络定位，打电话，读取短信，录音,通讯录 +// tv_get_identifying_code.startTimer(); +// getSystemTime(); +// } else { +// PermissionsUtil.requestPermission(this, new PermissionListener() { +// @Override +// public void permissionGranted(@NonNull String[] permissions) { +// //用户授予了访问读取短信的权限 +// tv_get_identifying_code.startTimer(); +// getSystemTime(); +// } +// @Override +// public void permissionDenied(@NonNull String[] permissions) { +// //用户拒绝了访问读取短信的申请 +//// finish(); +// +// } +// +// }, new String[]{Manifest.permission.READ_SMS}); +// } +// +// }else { tv_get_identifying_code.startTimer(); getSystemTime(); - } +// } // getVerCode(); // new Thread() { @@ -796,11 +796,11 @@ public class MyEditPhoneActivity extends BaseActivity implements public void handleMessage(Message msg) { switch (msg.what) { case MSG_RESIZE: { - if (msg.arg1 == BIGGER) { - rl_logo.setVisibility(View.VISIBLE); - } else { - rl_logo.setVisibility(View.GONE); - } +// if (msg.arg1 == BIGGER) { +// rl_logo.setVisibility(View.VISIBLE); +// } else { +// rl_logo.setVisibility(View.GONE); +// } } break; default: diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/NewLessonsActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/NewLessonsActivity.java index 1e821c1..23d2c7e 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/NewLessonsActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/NewLessonsActivity.java @@ -9,6 +9,7 @@ import org.apache.http.message.BasicNameValuePair; import com.google.gson.Gson; +import com.gyf.immersionbar.ImmersionBar; import com.handmark.pulltorefresh.library.ILoadingLayout; import com.handmark.pulltorefresh.library.PullToRefreshBase; import com.handmark.pulltorefresh.library.PullToRefreshBase.Mode; @@ -199,7 +200,8 @@ public class NewLessonsActivity extends BaseActivity implements OnClickListener, protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_new_lesson); - + View toolbar_top=findViewById(R.id.toolbar_top); + ImmersionBar.with(this).keyboardEnable(true).statusBarDarkFont(true).titleBar(toolbar_top).init(); rl_back = (RelativeLayout) findViewById(R.id.top_back_layout); rl_back.setOnClickListener(this); diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/NewsCollectActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/NewsCollectActivity.java index 0b02fb0..38a95ff 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/NewsCollectActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/NewsCollectActivity.java @@ -15,6 +15,7 @@ import android.widget.RelativeLayout; import android.widget.TextView; import com.google.gson.Gson; +import com.gyf.immersionbar.ImmersionBar; import com.handmark.pulltorefresh.library.ILoadingLayout; import com.handmark.pulltorefresh.library.PullToRefreshBase; import com.handmark.pulltorefresh.library.PullToRefreshListView; @@ -118,6 +119,8 @@ public class NewsCollectActivity extends Activity implements View.OnClickListene protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_video_collect); + View toolbar_top=findViewById(R.id.toolbar_top); + ImmersionBar.with(this).keyboardEnable(true).statusBarDarkFont(true).titleBar(toolbar_top).init(); rl_back = (RelativeLayout) findViewById(R.id.top_back_layout); rl_back.setOnClickListener(this); ll_empty_visit = (LinearLayout) findViewById(R.id.ll_empty_visit); diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/NewsSearchActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/NewsSearchActivity.java index 4dde9be..26e45a1 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/NewsSearchActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/NewsSearchActivity.java @@ -10,6 +10,7 @@ import java.util.Map; import com.google.gson.Gson; +import com.gyf.immersionbar.ImmersionBar; import com.handmark.pulltorefresh.library.ILoadingLayout; import com.handmark.pulltorefresh.library.PullToRefreshBase; import com.handmark.pulltorefresh.library.PullToRefreshBase.Mode; @@ -115,6 +116,8 @@ public class NewsSearchActivity extends BaseActivity implements OnClickListener, protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_video_collect); + View toolbar_top=findViewById(R.id.toolbar_top); + ImmersionBar.with(this).keyboardEnable(true).statusBarDarkFont(true).titleBar(toolbar_top).init(); typeUuid = getIntent().getStringExtra("typeUuid"); rl_back = (RelativeLayout) findViewById(R.id.top_back_layout); rl_back.setOnClickListener(this); diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/RegistActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/RegistActivity.java index 95c9d27..15bf6df 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/RegistActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/RegistActivity.java @@ -522,31 +522,31 @@ public class RegistActivity extends BaseActivity implements OnClickListener, OnC return; } - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - - if (PermissionsUtil.hasPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE)) {//,Manifest.permission.READ_CONTACTS - //有访问摄像头的权限,读写内存，网络定位，打电话，读取短信，录音,通讯录 - initRegist(); - } else { - PermissionsUtil.requestPermission(this, new PermissionListener() { - @Override - public void permissionGranted(@NonNull String[] permissions) { - //用户授予了访问读写的权限 - initRegist(); - } - @Override - public void permissionDenied(@NonNull String[] permissions) { - //用户拒绝了访问读写的申请 -// finish(); - - } - - }, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE});//WRITE_CONTACTS/,Manifest.permission.READ_CONTACTS - } - - }else { +// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { +// +// if (PermissionsUtil.hasPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE)) {//,Manifest.permission.READ_CONTACTS +// //有访问摄像头的权限,读写内存，网络定位，打电话，读取短信，录音,通讯录 +// initRegist(); +// } else { +// PermissionsUtil.requestPermission(this, new PermissionListener() { +// @Override +// public void permissionGranted(@NonNull String[] permissions) { +// //用户授予了访问读写的权限 +// initRegist(); +// } +// @Override +// public void permissionDenied(@NonNull String[] permissions) { +// //用户拒绝了访问读写的申请 +//// finish(); +// +// } +// +// }, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE});//WRITE_CONTACTS/,Manifest.permission.READ_CONTACTS +// } +// +// }else { initRegist(); - } +// } // initRegist(); break; case R.id.img_ver_code: @@ -921,9 +921,9 @@ public class RegistActivity extends BaseActivity implements OnClickListener, OnC switch (msg.what) { case MSG_RESIZE: { if (msg.arg1 == BIGGER) { - rl_logo.setVisibility(View.VISIBLE); +// rl_logo.setVisibility(View.VISIBLE); } else { - rl_logo.setVisibility(View.GONE); +// rl_logo.setVisibility(View.GONE); } } break; diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/RemoveExpertActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/RemoveExpertActivity.java index 838439d..2dbdd84 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/RemoveExpertActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/RemoveExpertActivity.java @@ -9,6 +9,7 @@ import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.google.gson.Gson; +import com.gyf.immersionbar.ImmersionBar; import com.handmark.pulltorefresh.library.ILoadingLayout; import com.handmark.pulltorefresh.library.PullToRefreshBase; import com.handmark.pulltorefresh.library.PullToRefreshBase.Mode; @@ -133,6 +134,8 @@ public class RemoveExpertActivity extends Activity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.rem_exp_activity); + View toolbar_top=findViewById(R.id.toolbar_top); + ImmersionBar.with(this).keyboardEnable(true).statusBarDarkFont(true).titleBar(toolbar_top).init(); lv_visit = (PullToRefreshListView) findViewById(R.id.lv_visit); lv_visit.setMode(Mode.BOTH); title = (TextView) findViewById(R.id.top_title); diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/VideoCollectActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/VideoCollectActivity.java index f47eb68..3bd233f 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/VideoCollectActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/VideoCollectActivity.java @@ -8,6 +8,7 @@ import org.apache.http.message.BasicNameValuePair; import com.google.gson.Gson; +import com.gyf.immersionbar.ImmersionBar; import com.handmark.pulltorefresh.library.ILoadingLayout; import com.handmark.pulltorefresh.library.PullToRefreshBase; import com.handmark.pulltorefresh.library.PullToRefreshBase.Mode; @@ -122,6 +123,8 @@ public class VideoCollectActivity extends Activity implements OnClickListener { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_video_collect); + View toolbar_top=findViewById(R.id.toolbar_top); + ImmersionBar.with(this).keyboardEnable(true).statusBarDarkFont(true).titleBar(toolbar_top).init(); typeUuid = getIntent().getStringExtra("uuid"); rl_back = (RelativeLayout) findViewById(R.id.top_back_layout); rl_back.setOnClickListener(this); diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/VideoSearch1Activity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/VideoSearch1Activity.java index 3a948d9..7f1dc83 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/VideoSearch1Activity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/VideoSearch1Activity.java @@ -7,6 +7,7 @@ import java.util.Map; import com.google.gson.Gson; +import com.gyf.immersionbar.ImmersionBar; import com.handmark.pulltorefresh.library.ILoadingLayout; import com.handmark.pulltorefresh.library.PullToRefreshBase; import com.handmark.pulltorefresh.library.PullToRefreshBase.Mode; @@ -148,18 +149,25 @@ public class VideoSearch1Activity extends BaseActivity implements OnClickListene private String sort = "2"; private void hideInput(Context context) { - if (manager == null) { - manager = ((InputMethodManager) context - .getSystemService(Context.INPUT_METHOD_SERVICE)); + View view = getWindow().peekDecorView(); + if (view != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view.getWindowToken(), 0); } - - manager.hideSoftInputFromWindow(((Activity) context).getCurrentFocus() - .getWindowToken(), InputMethodManager.HIDE_NOT_ALWAYS); +// if (manager == null) { +// manager = ((InputMethodManager) context +// .getSystemService(Context.INPUT_METHOD_SERVICE)); +// } +// +// manager.hideSoftInputFromWindow(((Activity) context).getCurrentFocus() +// .getWindowToken(), InputMethodManager.HIDE_NOT_ALWAYS); } protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_video_search1); + View toolbar_top=findViewById(R.id.toolbar_top); + ImmersionBar.with(this).keyboardEnable(true).statusBarDarkFont(true).titleBar(toolbar_top).init(); // typeUuid = getIntent().getStringExtra("typeUuid"); // LogUtils.e("typeUuid:"+typeUuid); rl_back = (RelativeLayout) findViewById(R.id.top_back_layout); diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/WithDrawalsActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/WithDrawalsActivity.java index b252e59..05b1c09 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/WithDrawalsActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/WithDrawalsActivity.java @@ -716,31 +716,31 @@ public class WithDrawalsActivity extends BaseActivity implements private void getVerCode() { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - - if (PermissionsUtil.hasPermission(WithDrawalsActivity.this, Manifest.permission.READ_SMS)) { - //有访问摄像头的权限,读写内存，网络定位，打电话，读取短信，录音,通讯录 - getSystemTime(); - } else { - PermissionsUtil.requestPermission(WithDrawalsActivity.this, new PermissionListener() { - @Override - public void permissionGranted(@NonNull String[] permissions) { - //用户授予了访问读取短信的权限 - getSystemTime(); - } - @Override - public void permissionDenied(@NonNull String[] permissions) { - //用户拒绝了访问读取短信的申请 +// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { // - - } - - }, new String[]{Manifest.permission.READ_SMS}); - } - - }else { +// if (PermissionsUtil.hasPermission(WithDrawalsActivity.this, Manifest.permission.READ_SMS)) { +// //有访问摄像头的权限,读写内存，网络定位，打电话，读取短信，录音,通讯录 +// getSystemTime(); +// } else { +// PermissionsUtil.requestPermission(WithDrawalsActivity.this, new PermissionListener() { +// @Override +// public void permissionGranted(@NonNull String[] permissions) { +// //用户授予了访问读取短信的权限 +// getSystemTime(); +// } +// @Override +// public void permissionDenied(@NonNull String[] permissions) { +// //用户拒绝了访问读取短信的申请 +//// +// +// } +// +// }, new String[]{Manifest.permission.READ_SMS}); +// } +// +// }else { getSystemTime(); - } +// } } private String timeStr; diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/WriteTopicActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/WriteTopicActivity.java index e253c16..177a55e 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/WriteTopicActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/WriteTopicActivity.java @@ -151,6 +151,8 @@ public class WriteTopicActivity extends BaseActivity implements OnClickListener super.onCreate(savedInstanceState); setContentView(R.layout.topic_activity); + View toolbar_top=findViewById(R.id.toolbar_top); + ImmersionBar.with(this).keyboardEnable(true).statusBarDarkFont(true).titleBar(toolbar_top).init(); back = (RelativeLayout) findViewById(R.id.top_back_layout); back.setOnClickListener(this); initView(); diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/ecdemo/common/dialog/ECAlertDialog.java b/app/src/main/java/cn/shangyu/gdxzPatient/ecdemo/common/dialog/ECAlertDialog.java index 41f6ad1..8746f3b 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/ecdemo/common/dialog/ECAlertDialog.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/ecdemo/common/dialog/ECAlertDialog.java @@ -16,6 +16,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import android.app.Activity; import android.app.Dialog; import android.content.Context; import android.graphics.drawable.Drawable; @@ -29,6 +30,9 @@ import android.widget.EditText; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; + +import com.gyf.immersionbar.ImmersionBar; + import cn.shangyu.gdxzPatient.R; import cn.shangyu.gdxzPatient.ecdemo.common.utils.LogUtil; @@ -79,18 +83,22 @@ public class ECAlertDialog extends Dialog implements View.OnClickListener { // WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE // | WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN); super.setContentView(R.layout.common_dialog_generic); - initView(); + initView(context); } /** * */ - private void initView() { + private void initView(Context context) { WindowManager.LayoutParams layoutParams = getWindow().getAttributes(); layoutParams.width = WindowManager.LayoutParams.MATCH_PARENT; layoutParams.height = WindowManager.LayoutParams.MATCH_PARENT; getWindow().setAttributes(layoutParams); + ImmersionBar.with((Activity) context, this) +// .statusBarDarkFont(true) + .keyboardEnable(true) + .init(); mButtons = new ArrayList