diff --git a/app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/base/MainActivity.java b/app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/base/MainActivity.java index c1acacc..37b518b 100755 --- a/app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/base/MainActivity.java +++ b/app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/base/MainActivity.java @@ -73,11 +73,13 @@ import java.io.File; import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import java.util.concurrent.TimeUnit; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; import butterknife.Unbinder; +import io.reactivex.Observable; import io.reactivex.Observer; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.Disposable; @@ -174,6 +176,7 @@ public class MainActivity extends BaseActivity { registerMessageCount(); } + /** * 注册socket广播 */ @@ -354,7 +357,7 @@ public class MainActivity extends BaseActivity { intent = new Intent(this, RandomMissionActivity.class); break; case "工作轨迹": - intent= new Intent(this, LocusMapActivity.class); + intent = new Intent(this, LocusMapActivity.class); break; } if (intent != null) { diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/base/BaseActivity.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/base/BaseActivity.java index a46ae80..890a626 100755 --- a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/base/BaseActivity.java +++ b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/base/BaseActivity.java @@ -7,6 +7,9 @@ import android.content.Context; import android.content.Intent; import android.content.res.Configuration; import android.content.res.Resources; +import android.graphics.ColorMatrix; +import android.graphics.ColorMatrixColorFilter; +import android.graphics.Paint; import android.graphics.Rect; import android.os.Bundle; import android.support.annotation.Nullable; @@ -42,6 +45,7 @@ import com.sucstepsoft.cm_utils.core.widget.views.MyTextWatcher; import com.sucstepsoft.cm_utils.utils.LogUtils; import com.sucstepsoft.cm_utils.utils.ToastUtils; import com.sucstepsoft.cm_utils.utils.UserInfoSPUtils; +import com.sucstepsoft.cm_utils.utils.UserLgUtils; import java.lang.reflect.Type; import java.util.ArrayList; @@ -89,6 +93,10 @@ public abstract class BaseActivity extends AppCompatActivity { super.onCreate(savedInstanceState); // getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN); setContentView(R.layout.base_activity); + boolean isLament = UserLgUtils.getIsLament(); + if(isLament){ + setViewLament(); + } //默认隐藏键盘 // getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN); //锁定竖屏 @@ -140,6 +148,13 @@ public abstract class BaseActivity extends AppCompatActivity { // }; // editText.setFilters(new InputFilter[]{filter}); } + public void setViewLament(){ + Paint paint = new Paint(); + ColorMatrix cm = new ColorMatrix(); + cm.setSaturation(0); + paint.setColorFilter(new ColorMatrixColorFilter(cm)); + getWindow().getDecorView().setLayerType(View.LAYER_TYPE_HARDWARE, paint); + } /** * 限制只能输入英文字符和数字 diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/utils/UserLgUtils.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/utils/UserLgUtils.java index 80e6aea..065f550 100755 --- a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/utils/UserLgUtils.java +++ b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/utils/UserLgUtils.java @@ -153,4 +153,10 @@ public class UserLgUtils { return SPUtils.getInstance(SP_USER_INFO).getString("personType"); } + public static boolean getIsLament() { + return SPUtils.getInstance(SP_USER_INFO).getBoolean("lament",false); + } + public static void setLament(boolean isLament){ + SPUtils.getInstance(SP_USER_INFO).put("lament",isLament); + } }