Skip to content

Commit

Permalink
更新 0.0.1.2X
Browse files Browse the repository at this point in the history
  • Loading branch information
snpmyn committed Jan 14, 2021
1 parent aea9cf1 commit e3d2ee8
Show file tree
Hide file tree
Showing 9 changed files with 23 additions and 59 deletions.
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
|:-:|:-:|
| 示例app | implementation project(path: ':fragmentation') |
| 示例app | implementation project(path: ':eventbusactivityscope') |
| 一方库FragmentationCore | api 'com.github.snpmyn.Util:*utilone*:v0.1.2'(避重)|
| 一方库FragmentationCore | api 'com.github.snpmyn.Util:*utilone*:v0.0.1.2X'(避重)|
| 一方库Fragmentation | api project(path: ':fragmentationcore') |
| 一方库EventbusActivityScope | implementation 'com.github.snpmyn.Util:*utilone*:v0.1.2' |
| 一方库EventbusActivityScope | implementation 'com.github.snpmyn.Util:*utilone*:v0.0.1.2X' |
| 一方库EventbusActivityScope | implementation 'org.greenrobot:eventbus:3.1.1' |
| 二方库Util-示例app | implementation project(path: ':utilone') |
| 二方库Util-示例app | implementation project(path: ':utiltwo') |
Expand Down Expand Up @@ -98,17 +98,17 @@ android {
...
}
compileOptions {
sourceCompatibility rootProject.ext.compileOptions["sourceCompatibility"]
targetCompatibility rootProject.ext.compileOptions["targetCompatibility"]
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
configurations.all {
resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
}
}
dependencies {
implementation 'com.github.snpmyn.SmartFragment:fragmentation:v0.0.1.1X'
implementation 'com.github.snpmyn.SmartFragment:eventbusactivityscope:v0.0.1.1X'
implementation 'com.github.snpmyn.SmartFragment:fragmentation:v0.0.1.2X'
implementation 'com.github.snpmyn.SmartFragment:eventbusactivityscope:v0.0.1.2X'
}
```

Expand Down
4 changes: 2 additions & 2 deletions SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ currently being supported with security updates.

| Version | Supported |
|:-------:|:-----------------:|
| v1.0.2 | :x: |
| v1.0.1 | :white_check_mark: |
| v0.0.1.3X | :x: |
| v0.0.1.2X | :white_check_mark: |

## Reporting a Vulnerability

Expand Down
42 changes: 0 additions & 42 deletions app/src/main/java/base/BaseActivity.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package base;

import android.os.Bundle;

/**
* Created on 2021/1/13
*
Expand All @@ -10,45 +8,5 @@
* 启应用后 {@link com.zsp.smartfragment.MainActivity} 直存至应用杀死时销毁。
*/
public abstract class BaseActivity extends com.zsp.fragmentation.BaseActivity {
/**
* 加载视图
*
* @param savedInstanceState 状态保存
*/
@Override
protected void initContentView(Bundle savedInstanceState) {

}

/**
* 初始控件
*/
@Override
protected void stepUi() {

}

/**
* 初始配置
*/
@Override
protected void initConfiguration() {

}

/**
* 设置监听
*/
@Override
protected void setListener() {

}

/**
* 开始逻辑
*/
@Override
protected void startLogic() {

}
}
4 changes: 1 addition & 3 deletions app/src/main/java/fragmentation/BottomBar.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@
import android.view.animation.Interpolator;
import android.widget.LinearLayout;

import androidx.core.view.ViewCompat;

/**
* @decs: BottomBar
* @author: 郑少鹏
Expand Down Expand Up @@ -147,7 +145,7 @@ public boolean onPreDraw() {
if (animate) {
animate().setInterpolator(mInterpolator).setDuration(TRANSLATE_DURATION_MILLIS).translationY(yTranslation);
} else {
ViewCompat.setTranslationY(this, yTranslation);
setTranslationY(yTranslation);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/fragment_zhihu_detail.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@
android:layout_height="wrap_content"
android:contentDescription="@string/toDo"
app:srcCompat="@drawable/open"
app:tint="@color/background" />
app:tint="@color/white" />
</FrameLayout>
</LinearLayout>
1 change: 1 addition & 0 deletions app/src/main/res/values/colors.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@
<color name="colorPrimaryDark">#00574B</color>
<color name="colorAccent">#D81B60</color>
<color name="colorc9c9c9">#c9c9c9</color>
<color name="white">#fff</color>
</resources>
2 changes: 1 addition & 1 deletion eventbusactivityscope/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ dependencies {

implementation 'androidx.appcompat:appcompat:1.2.0'
/*自带*/
implementation 'com.github.snpmyn.Util:utilone:v0.0.1.1X'
implementation 'com.github.snpmyn.Util:utilone:v0.0.1.2X'
/*util*/
implementation 'org.greenrobot:eventbus:3.1.1'
/*eventbus*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.zsp.fragmentation;

import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
Expand Down Expand Up @@ -76,10 +77,16 @@ public BaseExtraTransaction extraTransaction() {
return supportFragmentDelegate.extraTransaction();
}

/**
* Called when a fragment is first attached to its context.
* {@link #onCreate(Bundle)} will be called after this.
*
* @param context Context
*/
@Override
public void onAttach(@NonNull Activity activity) {
super.onAttach(activity);
supportFragmentDelegate.onAttach(activity);
public void onAttach(@NonNull Context context) {
super.onAttach(context);
supportFragmentDelegate.onAttach((Activity) context);
fragmentationSupportActivity = (SupportActivity) supportFragmentDelegate.getActivity();
}

Expand Down
2 changes: 1 addition & 1 deletion fragmentationcore/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@ dependencies {

implementation 'androidx.appcompat:appcompat:1.2.0'
/*自带*/
api 'com.github.snpmyn.Util:utilone:v0.0.1.1X'
api 'com.github.snpmyn.Util:utilone:v0.0.1.2X'
/*util*/
}

0 comments on commit e3d2ee8

Please sign in to comment.