Compare commits

...

5 Commits

Author SHA1 Message Date
Ztiany 730475b021 update viewpaer2 5 years ago
Ztiany 2b3fc3b10f fix permission 5 years ago
Ztiany c33d0bf3c7 fix permission 5 years ago
Ztiany 2b583cff1c add LollipopFixedWebView 5 years ago
Ztiany af215378a8 optimize code 5 years ago
  1. 1
      lib_base/build.gradle
  2. 2
      lib_base/src/main/java/com/android/base/permission/AutoPermissionFragment.java
  3. 5
      lib_base/src/main/java/com/android/base/permission/AutoPermissionRequester.java
  4. 8
      lib_base/src/main/java/com/android/base/utils/common/Strings.kt
  5. 40
      lib_base/src/main/java/com/android/base/widget/compat/LollipopFixedWebView.java
  6. 8
      lib_media_selector/src/main/res/values-zh/strings.xml

@ -67,6 +67,7 @@ dependencies {
api androidLibraries.material
api androidLibraries.percentLayout
api androidLibraries.constraintLayout
api androidLibraries.viewpager2
api androidLibraries.annotation
//AAC

@ -41,7 +41,6 @@ public class AutoPermissionFragment extends Fragment {
@Override
public void onPause() {
super.onPause();
mHandler.removeCallbacks(mRunnable);
mIsActivityReady = false;
}
@ -67,6 +66,7 @@ public class AutoPermissionFragment extends Fragment {
}
void startRequest() {
Timber.d("startRequest() called ");
mHandler.removeCallbacks(mRunnable);
startChecked();
}

@ -68,7 +68,9 @@ public class AutoPermissionRequester {
mOnAllPermissionGrantedListener = null;
mOnPermissionDeniedListener = null;
mPermissionUIProvider = null;
mPermissionCallback.setDestroyed();
if (mPermissionCallback != null) {
mPermissionCallback.setDestroyed();
}
}
};
@ -138,6 +140,7 @@ public class AutoPermissionRequester {
@Override
public void onResume(@NonNull LifecycleOwner owner) {
mActivity.getLifecycle().removeObserver(this);
Timber.d("startRequest 2");
startRequestInternal(supportFragmentManager, fragment);
}
};

@ -19,6 +19,14 @@ private const val CONTAINS_LOWERCASE_LETTERS_REG = "^.*[a-z]+.*$"
private const val CONTAINS_UPPERCASE_LETTERS_REG = "^.*[A-Z]+.*$"
private const val CHINESE_HAN_NATIONALITY_NAME_REG = "^[\\u4E00-\\u9FA5]{2,4}\$"
private const val CHINESE_NAME_REG = "^[\\u4E00-\\u9FA5]+(·[\\u4E00-\\u9FA5]+)*\$"
private const val PASSPORT_REG = "^([a-zA-z]|[0-9]){5,17}\$"
/**
* 验证护照号
*/
fun isPassport(mobile: String?): Boolean {
return !isEmpty(mobile) && Pattern.matches(PASSPORT_REG, mobile)
}
/**
* 验证中国的手机号

@ -0,0 +1,40 @@
package com.android.base.widget.compat;
import android.annotation.TargetApi;
import android.content.Context;
import android.content.res.Configuration;
import android.os.Build;
import android.util.AttributeSet;
import android.webkit.WebView;
/**
* @see <a href='https://stackoverflow.com/questions/41025200/android-view-inflateexception-error-inflating-class-android-webkit-webview'>android-view-inflateexception-error-inflating-class-android-webkit-webview</a>
*/
public class LollipopFixedWebView extends WebView {
public LollipopFixedWebView(Context context) {
super(getFixedContext(context));
}
public LollipopFixedWebView(Context context, AttributeSet attrs) {
super(getFixedContext(context), attrs);
}
public LollipopFixedWebView(Context context, AttributeSet attrs, int defStyleAttr) {
super(getFixedContext(context), attrs, defStyleAttr);
}
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
public LollipopFixedWebView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
super(getFixedContext(context), attrs, defStyleAttr, defStyleRes);
}
public LollipopFixedWebView(Context context, AttributeSet attrs, int defStyleAttr, boolean privateBrowsing) {
super(getFixedContext(context), attrs, defStyleAttr, privateBrowsing);
}
public static Context getFixedContext(Context context) {
return context.createConfigurationContext(new Configuration());
}
}

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="ExtraTranslation">
<string name="ucrop_rotate" tools:ignore="PrivateResource">旋转</string>
<string name="ucrop_scale" tools:ignore="PrivateResource">缩放</string>
<string name="ucrop_crop" tools:ignore="PrivateResource">裁剪</string>
</resources>
Loading…
Cancel
Save