备份3.7.8

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);

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);

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 (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-
+//
-				if (PermissionsUtil.hasPermission(this, Manifest.permission.READ_SMS)) {
+//				if (PermissionsUtil.hasPermission(this, Manifest.permission.READ_SMS)) {
-					//有访问摄像头的权限,读写内存，网络定位，打电话，读取短信，录音,通讯录
+//					//有访问摄像头的权限,读写内存，网络定位，打电话，读取短信，录音,通讯录
-					tv_get_identifying_code.startTimer();
+//					tv_get_identifying_code.startTimer();
-					getSystemTime();
+//					getSystemTime();
-				} else {
+//				} else {
-					PermissionsUtil.requestPermission(this, new PermissionListener() {
+//					PermissionsUtil.requestPermission(this, new PermissionListener() {
-						@Override
+//						@Override
-						public void permissionGranted(@NonNull String[] permissions) {
+//						public void permissionGranted(@NonNull String[] permissions) {
-							//用户授予了访问读取短信的权限
+//							//用户授予了访问读取短信的权限
-							tv_get_identifying_code.startTimer();
+//							tv_get_identifying_code.startTimer();
-							getSystemTime();
+//							getSystemTime();
-						}
+//						}
-						@Override
+//						@Override
-						public void permissionDenied(@NonNull String[] permissions) {
+//						public void permissionDenied(@NonNull String[] permissions) {
-							//用户拒绝了访问读取短信的申请
+//							//用户拒绝了访问读取短信的申请
-//						finish();
+////						finish();
-
+//
-						}
+//						}
-
+//
-					}, new String[]{Manifest.permission.READ_SMS});
+//					}, new String[]{Manifest.permission.READ_SMS});
-				}
+//				}
-
+//
-			}else {
+//			}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) {
+//				if (msg.arg1 == BIGGER) {
-					rl_logo.setVisibility(View.VISIBLE);
+//					rl_logo.setVisibility(View.VISIBLE);
-				} else {
+//				} else {
-					rl_logo.setVisibility(View.GONE);
+//					rl_logo.setVisibility(View.GONE);
-				}
+//				}
 			}
 				break;
 			default:

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);
 

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);

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);

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 (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
+//				if (PermissionsUtil.hasPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE)) {//,Manifest.permission.READ_CONTACTS
-					//有访问摄像头的权限,读写内存，网络定位，打电话，读取短信，录音,通讯录
+//					//有访问摄像头的权限,读写内存，网络定位，打电话，读取短信，录音,通讯录
-					initRegist();
+//					initRegist();
-				} else {
+//				} else {
-					PermissionsUtil.requestPermission(this, new PermissionListener() {
+//					PermissionsUtil.requestPermission(this, new PermissionListener() {
-						@Override
+//						@Override
-						public void permissionGranted(@NonNull String[] permissions) {
+//						public void permissionGranted(@NonNull String[] permissions) {
-							//用户授予了访问读写的权限
+//							//用户授予了访问读写的权限
-							initRegist();
+//							initRegist();
-						}
+//						}
-						@Override
+//						@Override
-						public void permissionDenied(@NonNull String[] permissions) {
+//						public void permissionDenied(@NonNull String[] permissions) {
-							//用户拒绝了访问读写的申请
+//							//用户拒绝了访问读写的申请
-//						finish();
+////						finish();
-
+//
-						}
+//						}
-
+//
-					}, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE});//WRITE_CONTACTS/,Manifest.permission.READ_CONTACTS
+//					}, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE});//WRITE_CONTACTS/,Manifest.permission.READ_CONTACTS
-				}
+//				}
-
+//
-			}else {
+//			}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;

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);

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);

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) {
+		View view = getWindow().peekDecorView();
-			manager = ((InputMethodManager) context
+		if (view != null) {
-					.getSystemService(Context.INPUT_METHOD_SERVICE));
+			InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+			inputmanger.hideSoftInputFromWindow(view.getWindowToken(), 0);
 		}
-
+//		if (manager == null) {
-		manager.hideSoftInputFromWindow(((Activity) context).getCurrentFocus()
+//			manager = ((InputMethodManager) context
-				.getWindowToken(), InputMethodManager.HIDE_NOT_ALWAYS);
+//					.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);

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 (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 (PermissionsUtil.hasPermission(WithDrawalsActivity.this, Manifest.permission.READ_SMS)) {
-					}
+//				//有访问摄像头的权限,读写内存，网络定位，打电话，读取短信，录音,通讯录
-
+//				getSystemTime();
-				}, new String[]{Manifest.permission.READ_SMS});
+//			} else {
-			}
+//				PermissionsUtil.requestPermission(WithDrawalsActivity.this, new PermissionListener() {
-
+//					@Override
-		}else {
+//					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;

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();

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<Button>();
 		Button leftBtn = (Button) findViewById(R.id.dilaog_button1);
 		leftBtn.setOnClickListener(this);

app/src/main/java/cn/shangyu/gdxzPatient/ecdemo/ui/xiaomi/PermissionActivity.java

@@ -44,7 +44,7 @@ public class PermissionActivity extends Activity {
 
             if (granted) {
                 Log.w("PermissionActivity", "Permissions granted:");
-                BaseApplication.reInitPush(this);
+//                BaseApplication.reInitPush(this);
             }
             finish();
         }

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

@@ -5,7 +5,9 @@
     android:background="@color/white"
     android:orientation="vertical" >
 
-    <include layout="@layout/top" />
+    <include
+        android:id="@+id/toolbar_top"
+        layout="@layout/top" />
 
     <com.handmark.pulltorefresh.library.PullToRefreshListView
         xmlns:ptr="http://schemas.android.com/apk/res-auto"

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

@@ -5,7 +5,9 @@
     android:background="@color/cefefef"
     android:orientation="vertical" >
 
-    <include layout="@layout/top" />
+    <include
+        android:id="@+id/toolbar_top"
+        layout="@layout/top" />
 
     <RelativeLayout
         android:visibility="gone"

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

@@ -5,7 +5,9 @@
     android:background="#ffffff"
     android:orientation="vertical" >
 
-    <include layout="@layout/top" />
+    <include
+        android:id="@+id/toolbar_top"
+        layout="@layout/top" />
 
     <FrameLayout
         android:layout_width="match_parent"

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

@@ -6,6 +6,7 @@
     android:orientation="vertical" >
 
     <include
+        android:id="@+id/toolbar_top"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         layout="@layout/top" />