Skip to content

Commit 76407c6

Browse files
committed
fix:fix wrong c++ code
1 parent 3443c69 commit 76407c6

File tree

4 files changed

+21
-7
lines changed

4 files changed

+21
-7
lines changed

app/src/main/cpp/image-lib.cpp

+7-5
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ int *blur_ARGB_8888(int *, int, int, int);
1010
extern "C"
1111
JNIEXPORT void JNICALL
1212
Java_com_xiasuhuei321_gank_1kotlin_ImageProcess_blur(JNIEnv *env, jclass obj,
13-
jintArray arrayIn, jint h,
14-
jint w, jint r) {
13+
jintArray arrayIn, jint w,
14+
jint h, jint r) {
1515
jint *pixels;
1616
pixels = env->GetIntArrayElements(arrayIn, 0);
1717
if (pixels != NULL) {
@@ -68,7 +68,8 @@ int *blur_ARGB_8888(int *pix, int w, int h, int radius) {
6868
rinsum += sir[0];
6969
ginsum += sir[1];
7070
binsum += sir[2];
71-
} else {
71+
}
72+
else {
7273
routsum += sir[0];
7374
goutsum += sir[1];
7475
boutsum += sir[2];
@@ -147,7 +148,8 @@ int *blur_ARGB_8888(int *pix, int w, int h, int radius) {
147148
rinsum += sir[0];
148149
ginsum += sir[1];
149150
binsum += sir[2];
150-
} else {
151+
}
152+
else {
151153
routsum += sir[0];
152154
goutsum += sir[1];
153155
boutsum += sir[2];
@@ -160,7 +162,7 @@ int *blur_ARGB_8888(int *pix, int w, int h, int radius) {
160162
yi = x;
161163
stackpointer = radius;
162164
for (y = 0; y < h; y++) {
163-
// Preserve shapeAlpha channel: ( 0xff000000 & pix[yi] )
165+
// Preserve alpha channel: ( 0xff000000 & pix[yi] )
164166
pix[yi] = (0xff000000 & pix[yi]) | (dv[rsum] << 16) | (dv[gsum] << 8) | dv[bsum];
165167

166168
rsum -= routsum;

app/src/main/java/com/xiasuhuei321/gank_kotlin/MainActivity.kt

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ import android.support.v7.app.AppCompatActivity
55
import android.view.Window
66
import android.view.WindowManager
77
import com.xiasuhuei321.gank_kotlin.extension.shortToast
8+
import com.xiasuhuei321.weather.TestActivity
89
import kotlinx.android.synthetic.main.activity_main.*
10+
import org.jetbrains.anko.startActivity
911

1012
class MainActivity : AppCompatActivity() {
1113
override fun onCreate(savedInstanceState: Bundle?) {
@@ -18,7 +20,7 @@ class MainActivity : AppCompatActivity() {
1820
weatherIv.setOnClickListener {
1921
shortToast("weather icon be clicked")
2022
}
21-
// startActivity(Intent(this, TestActivity::class.java))
23+
startActivity<TestActivity>()
2224
// weatherWv = WeatherView(this)
2325
}
2426

weather/src/main/java/com/xiasuhuei321/weather/TestActivity.java

+9-1
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,22 @@
33
import android.os.Bundle;
44
import android.support.v7.app.AppCompatActivity;
55
import android.util.Log;
6+
import android.view.View;
7+
import android.widget.Toast;
68

79

810
public class TestActivity extends AppCompatActivity {
911

1012
@Override
1113
protected void onCreate(Bundle savedInstanceState) {
1214
super.onCreate(savedInstanceState);
13-
setContentView(R.layout.activity_main);
15+
setContentView(R.layout.activity_ww);
1416
Log.e("Weather_Main", "我启动了");
17+
findViewById(R.id.weatherWv).setOnClickListener(new View.OnClickListener() {
18+
@Override
19+
public void onClick(View v) {
20+
Toast.makeText(TestActivity.this, "hello world weatherWv", Toast.LENGTH_SHORT).show();
21+
}
22+
});
1523
}
1624
}

weather/src/main/res/layout/activity_main.xml weather/src/main/res/layout/activity_ww.xml

+2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
android:layout_width="match_parent"
66
android:layout_height="match_parent"
77
android:gravity="center"
8+
android:background="#ffffff"
89
tools:context="com.xiasuhuei321.weather.TestActivity">
910

1011
<TextView
12+
android:id="@+id/weatherWv"
1113
android:layout_width="wrap_content"
1214
android:layout_height="wrap_content"
1315
android:text="This is Weather Module!"

0 commit comments

Comments
 (0)