diff --git a/app/release/app-release.apk b/app/release/app-release.apk new file mode 100644 index 0000000..34c09c7 Binary files /dev/null and b/app/release/app-release.apk differ diff --git a/app/release/baselineProfiles/0/app-release.dm b/app/release/baselineProfiles/0/app-release.dm new file mode 100644 index 0000000..ba795e4 Binary files /dev/null and b/app/release/baselineProfiles/0/app-release.dm differ diff --git a/app/release/baselineProfiles/1/app-release.dm b/app/release/baselineProfiles/1/app-release.dm new file mode 100644 index 0000000..0ac5eab Binary files /dev/null and b/app/release/baselineProfiles/1/app-release.dm differ diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json new file mode 100644 index 0000000..46a9d56 --- /dev/null +++ b/app/release/output-metadata.json @@ -0,0 +1,37 @@ +{ + "version": 3, + "artifactType": { + "type": "APK", + "kind": "Directory" + }, + "applicationId": "com.cariad.cea.aircondition", + "variantName": "release", + "elements": [ + { + "type": "SINGLE", + "filters": [], + "attributes": [], + "versionCode": 1, + "versionName": "1.0", + "outputFile": "app-release.apk" + } + ], + "elementType": "File", + "baselineProfiles": [ + { + "minApi": 28, + "maxApi": 30, + "baselineProfiles": [ + "baselineProfiles/1/app-release.dm" + ] + }, + { + "minApi": 31, + "maxApi": 2147483647, + "baselineProfiles": [ + "baselineProfiles/0/app-release.dm" + ] + } + ], + "minSdkVersionForDexing": 29 +} \ No newline at end of file diff --git a/app/src/main/java/com/cariad/cea/aircondition/views/BaseSimulationWindView.java b/app/src/main/java/com/cariad/cea/aircondition/views/BaseSimulationWindView.java index 6c2a0a9..63d520f 100644 --- a/app/src/main/java/com/cariad/cea/aircondition/views/BaseSimulationWindView.java +++ b/app/src/main/java/com/cariad/cea/aircondition/views/BaseSimulationWindView.java @@ -19,6 +19,7 @@ public class BaseSimulationWindView extends GifImageView { protected Paint paint; // 绘制标准线的画笔 protected float touchDownX, touchDownY, touchXDistance, touchYDistance; protected float[] srcScale = new float[2]; + protected float maxDegree = 0; public BaseSimulationWindView(Context context) { super(context); init(context); @@ -43,6 +44,7 @@ public class BaseSimulationWindView extends GifImageView { protected void onLayout(boolean changed, int left, int top, int right, int bottom) { super.onLayout(changed, left, top, right, bottom); srcScale = preSrcScale(); + maxDegree = (float) Math.atan2((float) getWidth()/3, getHeight()); } protected void init(Context context) { diff --git a/app/src/main/java/com/cariad/cea/aircondition/views/SimulationWindBottomView.java b/app/src/main/java/com/cariad/cea/aircondition/views/SimulationWindBottomView.java index 2a7f048..3f46ae5 100644 --- a/app/src/main/java/com/cariad/cea/aircondition/views/SimulationWindBottomView.java +++ b/app/src/main/java/com/cariad/cea/aircondition/views/SimulationWindBottomView.java @@ -94,10 +94,16 @@ public class SimulationWindBottomView extends BaseSimulationWindView { canvas.drawBitmap(bufferBitmap, 0, 0, paint); Matrix matrix = new Matrix(); // 根据当前点位，计算View的旋转角度和缩放比例，旋转角度根据X轴的偏移量获取，缩放比例按照Y的偏移量获取 - float degree = (float) Math.atan2((currentTouchPositionX-(getWidth()/2)), currentTouchPositionY); - matrix.setSkew(degree, 0f, getWidth()/2, 0); + float degree = (float) Math.atan2((currentTouchPositionX-((double) getWidth() /2)), currentTouchPositionY); + if (degree>0&& degree > maxDegree) { + degree = maxDegree; + } + if (degree<0 && degree < -maxDegree) { + degree = -maxDegree; + } + matrix.setSkew(degree, 0f, (float) getWidth() /2, 0); float scale = currentTouchPositionY / getHeight(); - matrix.preScale(1, scale, getWidth()/2, 0); + matrix.preScale(1, scale, (float) getWidth() /2, 0); // 最开始对图片进行缩放处理，适配当前ImageView控件 matrix.preScale(srcScale[0], srcScale[1]); setImageMatrix(matrix); diff --git a/app/src/main/java/com/cariad/cea/aircondition/views/SimulationWindTopView.java b/app/src/main/java/com/cariad/cea/aircondition/views/SimulationWindTopView.java index 631b0d3..3cc6cd7 100644 --- a/app/src/main/java/com/cariad/cea/aircondition/views/SimulationWindTopView.java +++ b/app/src/main/java/com/cariad/cea/aircondition/views/SimulationWindTopView.java @@ -95,6 +95,12 @@ public class SimulationWindTopView extends BaseSimulationWindView { Matrix matrix = new Matrix(); // // 根据当前点位，计算View的旋转角度和缩放比例，旋转角度根据X轴的偏移量获取，缩放比例按照Y的偏移量获取 float degree = (float) Math.atan2((currentTouchPositionX-(getWidth()/2)), getHeight()-currentTouchPositionY); + if (degree>0&& degree > maxDegree) { + degree = maxDegree; + } + if (degree<0 && degree < -maxDegree) { + degree = -maxDegree; + } if (getHeight()-currentTouchPositionY<=0) { // 如果当前触控点在底部区域，则不需要变形处理 degree = 0f; } diff --git a/app/src/main/res/drawable/cycle_00001.png b/app/src/main/res/drawable/cycle_00001.png new file mode 100644 index 0000000..48a1df3 Binary files /dev/null and b/app/src/main/res/drawable/cycle_00001.png differ diff --git a/app/src/main/res/drawable/cycle_00002.png b/app/src/main/res/drawable/cycle_00002.png new file mode 100644 index 0000000..b412f93 Binary files /dev/null and b/app/src/main/res/drawable/cycle_00002.png differ diff --git a/app/src/main/res/drawable/cycle_00003.png b/app/src/main/res/drawable/cycle_00003.png new file mode 100644 index 0000000..8128b8d Binary files /dev/null and b/app/src/main/res/drawable/cycle_00003.png differ diff --git a/app/src/main/res/drawable/cycle_00004.png b/app/src/main/res/drawable/cycle_00004.png new file mode 100644 index 0000000..d9d4c4f Binary files /dev/null and b/app/src/main/res/drawable/cycle_00004.png differ diff --git a/app/src/main/res/drawable/cycle_00005.png b/app/src/main/res/drawable/cycle_00005.png new file mode 100644 index 0000000..315b031 Binary files /dev/null and b/app/src/main/res/drawable/cycle_00005.png differ diff --git a/app/src/main/res/drawable/cycle_00006.png b/app/src/main/res/drawable/cycle_00006.png new file mode 100644 index 0000000..781a3b7 Binary files /dev/null and b/app/src/main/res/drawable/cycle_00006.png differ diff --git a/app/src/main/res/drawable/cycle_00007.png b/app/src/main/res/drawable/cycle_00007.png new file mode 100644 index 0000000..6d5026f Binary files /dev/null and b/app/src/main/res/drawable/cycle_00007.png differ diff --git a/app/src/main/res/drawable/cycle_00008.png b/app/src/main/res/drawable/cycle_00008.png new file mode 100644 index 0000000..f6bdcbe Binary files /dev/null and b/app/src/main/res/drawable/cycle_00008.png differ diff --git a/app/src/main/res/drawable/cycle_00009.png b/app/src/main/res/drawable/cycle_00009.png new file mode 100644 index 0000000..8886af2 Binary files /dev/null and b/app/src/main/res/drawable/cycle_00009.png differ diff --git a/app/src/main/res/drawable/cycle_00010.png b/app/src/main/res/drawable/cycle_00010.png new file mode 100644 index 0000000..130654d Binary files /dev/null and b/app/src/main/res/drawable/cycle_00010.png differ diff --git a/app/src/main/res/drawable/cycle_00011.png b/app/src/main/res/drawable/cycle_00011.png new file mode 100644 index 0000000..1357161 Binary files /dev/null and b/app/src/main/res/drawable/cycle_00011.png differ diff --git a/app/src/main/res/drawable/cycle_00012.png b/app/src/main/res/drawable/cycle_00012.png new file mode 100644 index 0000000..d35b961 Binary files /dev/null and b/app/src/main/res/drawable/cycle_00012.png differ diff --git a/app/src/main/res/drawable/cycle_00013.png b/app/src/main/res/drawable/cycle_00013.png new file mode 100644 index 0000000..a530ce1 Binary files /dev/null and b/app/src/main/res/drawable/cycle_00013.png differ diff --git a/app/src/main/res/drawable/cycle_00014.png b/app/src/main/res/drawable/cycle_00014.png new file mode 100644 index 0000000..f6f5a5c Binary files /dev/null and b/app/src/main/res/drawable/cycle_00014.png differ diff --git a/app/src/main/res/drawable/cycle_00015.png b/app/src/main/res/drawable/cycle_00015.png new file mode 100644 index 0000000..8edc8c5 Binary files /dev/null and b/app/src/main/res/drawable/cycle_00015.png differ diff --git a/app/src/main/res/drawable/cycle_00016.png b/app/src/main/res/drawable/cycle_00016.png new file mode 100644 index 0000000..073741f Binary files /dev/null and b/app/src/main/res/drawable/cycle_00016.png differ diff --git a/app/src/main/res/drawable/cycle_00017.png b/app/src/main/res/drawable/cycle_00017.png new file mode 100644 index 0000000..36c4399 Binary files /dev/null and b/app/src/main/res/drawable/cycle_00017.png differ diff --git a/app/src/main/res/drawable/cycle_00018.png b/app/src/main/res/drawable/cycle_00018.png new file mode 100644 index 0000000..fb7ab98 Binary files /dev/null and b/app/src/main/res/drawable/cycle_00018.png differ diff --git a/app/src/main/res/drawable/cycle_00019.png b/app/src/main/res/drawable/cycle_00019.png new file mode 100644 index 0000000..665acef Binary files /dev/null and b/app/src/main/res/drawable/cycle_00019.png differ diff --git a/app/src/main/res/drawable/cycle_00020.png b/app/src/main/res/drawable/cycle_00020.png new file mode 100644 index 0000000..b9e673f Binary files /dev/null and b/app/src/main/res/drawable/cycle_00020.png differ diff --git a/app/src/main/res/drawable/cycle_00021.png b/app/src/main/res/drawable/cycle_00021.png new file mode 100644 index 0000000..e5d10c3 Binary files /dev/null and b/app/src/main/res/drawable/cycle_00021.png differ diff --git a/app/src/main/res/drawable/cycle_00022.png b/app/src/main/res/drawable/cycle_00022.png new file mode 100644 index 0000000..bd95972 Binary files /dev/null and b/app/src/main/res/drawable/cycle_00022.png differ diff --git a/app/src/main/res/drawable/cycle_00023.png b/app/src/main/res/drawable/cycle_00023.png new file mode 100644 index 0000000..a9921bb Binary files /dev/null and b/app/src/main/res/drawable/cycle_00023.png differ diff --git a/app/src/main/res/drawable/cycle_00024.png b/app/src/main/res/drawable/cycle_00024.png new file mode 100644 index 0000000..7db49f0 Binary files /dev/null and b/app/src/main/res/drawable/cycle_00024.png differ diff --git a/app/src/main/res/drawable/cycle_00025.png b/app/src/main/res/drawable/cycle_00025.png new file mode 100644 index 0000000..b23ab5c Binary files /dev/null and b/app/src/main/res/drawable/cycle_00025.png differ diff --git a/app/src/main/res/drawable/cycle_00026.png b/app/src/main/res/drawable/cycle_00026.png new file mode 100644 index 0000000..f476a5e Binary files /dev/null and b/app/src/main/res/drawable/cycle_00026.png differ diff --git a/app/src/main/res/drawable/cycle_00027.png b/app/src/main/res/drawable/cycle_00027.png new file mode 100644 index 0000000..90a2f7b Binary files /dev/null and b/app/src/main/res/drawable/cycle_00027.png differ diff --git a/app/src/main/res/drawable/cycle_00028.png b/app/src/main/res/drawable/cycle_00028.png new file mode 100644 index 0000000..b1932a6 Binary files /dev/null and b/app/src/main/res/drawable/cycle_00028.png differ diff --git a/app/src/main/res/drawable/cycle_00029.png b/app/src/main/res/drawable/cycle_00029.png new file mode 100644 index 0000000..3fc04b5 Binary files /dev/null and b/app/src/main/res/drawable/cycle_00029.png differ diff --git a/app/src/main/res/drawable/cycle_00030.png b/app/src/main/res/drawable/cycle_00030.png new file mode 100644 index 0000000..7cc8b30 Binary files /dev/null and b/app/src/main/res/drawable/cycle_00030.png differ diff --git a/app/src/main/res/drawable/cycle_00031.png b/app/src/main/res/drawable/cycle_00031.png new file mode 100644 index 0000000..d7cc9a8 Binary files /dev/null and b/app/src/main/res/drawable/cycle_00031.png differ diff --git a/app/src/main/res/drawable/cycle_00032.png b/app/src/main/res/drawable/cycle_00032.png new file mode 100644 index 0000000..523876a Binary files /dev/null and b/app/src/main/res/drawable/cycle_00032.png differ diff --git a/app/src/main/res/drawable/cycle_00033.png b/app/src/main/res/drawable/cycle_00033.png new file mode 100644 index 0000000..bc6753f Binary files /dev/null and b/app/src/main/res/drawable/cycle_00033.png differ diff --git a/app/src/main/res/drawable/cycle_00034.png b/app/src/main/res/drawable/cycle_00034.png new file mode 100644 index 0000000..f82248b Binary files /dev/null and b/app/src/main/res/drawable/cycle_00034.png differ diff --git a/app/src/main/res/drawable/cycle_00035.png b/app/src/main/res/drawable/cycle_00035.png new file mode 100644 index 0000000..7006ef5 Binary files /dev/null and b/app/src/main/res/drawable/cycle_00035.png differ diff --git a/app/src/main/res/drawable/cycle_00036.png b/app/src/main/res/drawable/cycle_00036.png new file mode 100644 index 0000000..dd4c480 Binary files /dev/null and b/app/src/main/res/drawable/cycle_00036.png differ diff --git a/app/src/main/res/drawable/cycle_00037.png b/app/src/main/res/drawable/cycle_00037.png new file mode 100644 index 0000000..236b369 Binary files /dev/null and b/app/src/main/res/drawable/cycle_00037.png differ diff --git a/app/src/main/res/drawable/cycle_00038.png b/app/src/main/res/drawable/cycle_00038.png new file mode 100644 index 0000000..e0c1a9e Binary files /dev/null and b/app/src/main/res/drawable/cycle_00038.png differ diff --git a/app/src/main/res/drawable/cycle_00039.png b/app/src/main/res/drawable/cycle_00039.png new file mode 100644 index 0000000..5c028bd Binary files /dev/null and b/app/src/main/res/drawable/cycle_00039.png differ diff --git a/app/src/main/res/drawable/cycle_00040.png b/app/src/main/res/drawable/cycle_00040.png new file mode 100644 index 0000000..028f5e1 Binary files /dev/null and b/app/src/main/res/drawable/cycle_00040.png differ diff --git a/app/src/main/res/drawable/cycle_animation_list.xml b/app/src/main/res/drawable/cycle_animation_list.xml new file mode 100644 index 0000000..c1ae150 --- /dev/null +++ b/app/src/main/res/drawable/cycle_animation_list.xml @@ -0,0 +1,94 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/layout_simulation_wind.xml b/app/src/main/res/layout/layout_simulation_wind.xml index 8e403b8..426f4ff 100644 --- a/app/src/main/res/layout/layout_simulation_wind.xml +++ b/app/src/main/res/layout/layout_simulation_wind.xml @@ -16,7 +16,7 @@ app:layout_constraintRight_toRightOf="parent" app:layout_constraintWidth_percent="0.5" android:scaleType="matrix" - android:src="@drawable/ac_animation_list"/> + android:src="@drawable/cycle_animation_list"/> + android:src="@drawable/cycle_animation_list"/> \ No newline at end of file diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml new file mode 100644 index 0000000..dbd57bf --- /dev/null +++ b/app/src/main/res/values/dimens.xml @@ -0,0 +1,4 @@ + + + 12dp + \ No newline at end of file