starry
/
nqpen-sdk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[feature]书写点位截图

This commit is contained in:
黎旭 2024-01-26 13:44:01 +08:00
parent 9f027f6391
commit 96ce8b5eb1
7 changed files with 84 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -7,8 +7,8 @@ android {
compileSdkVersion 29
defaultConfig {
applicationId "com.eningqu.aipendemo.custom"
versionCode 22
versionName "NQPen-DEMO-1.3"
versionCode 220
versionName "2.2.0"
minSdkVersion 29
//noinspection ExpiredTargetSdkVersion
targetSdkVersion 29

BIN
app/release/release/app-release.apk
View File

Binary file not shown.

50
app/src/main/AndroidManifest.xml
View File

@ -66,39 +66,65 @@
<!-- 栈内复用 -->
<activity
android:name="com.eningqu.aipen.ui.login.LoginActivity"
android:exported="false"
android:launchMode="singleTask" />
<activity android:name=".activity.SDKMainActivity" />
<activity android:name=".activity.SDKMainActivity"
android:exported="false"
/>
<!-- 搜索设备列表 -->
<activity
android:name=".activity.DeviceListActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
android:launchMode="singleTask"
android:exported="false"
android:theme="@style/Theme.Design.Light"
android:windowSoftInputMode="stateHidden" />
<activity android:name="com.eningqu.aipen.ui.home.book.WriteActivity" />
<activity android:name="com.eningqu.aipen.ui.mine.ChatActivity" />
<activity android:name="com.eningqu.aipen.ui.home.book.WriteActivity"
android:exported="false"
/>
<activity android:name="com.eningqu.aipen.ui.mine.ChatActivity"
android:exported="false"
/>
<!-- 主界面栈内复用 -->
<activity
android:name="com.eningqu.aipen.ui.MainActivity"
android:launchMode="singleTask" />
<activity android:name="com.eningqu.aipen.ui.base.TestActivity" />
<activity android:name="com.eningqu.aipen.ui.home.book.FormActivity" />
android:launchMode="singleTask"
android:exported="false"
/>
<activity android:name="com.eningqu.aipen.ui.base.TestActivity"
android:exported="false"
/>
<activity android:name="com.eningqu.aipen.ui.home.book.FormActivity"
android:exported="false"
/>
<activity
android:name="com.eningqu.aipen.ui.medical.MedicalNodeActivity"
android:launchMode="singleTask" />
<activity android:name="com.eningqu.aipen.ui.medical.MedicalDetailActivity" />
<activity android:name="com.eningqu.aipen.ui.mine.PersonalActivity" />
<activity android:name="com.eningqu.aipen.ui.medical.PreviewPicActivity" />
android:launchMode="singleTask"
android:exported="false"
/>
<activity android:name="com.eningqu.aipen.ui.medical.MedicalDetailActivity"
android:exported="false"
/>
<activity android:name="com.eningqu.aipen.ui.mine.PersonalActivity"
android:exported="false"
/>
<activity android:name="com.eningqu.aipen.ui.medical.PreviewPicActivity"
android:exported="false"
/>
<!-- 允许屏幕翻转-->
<activity
android:name="com.eningqu.aipen.ui.vedio.VideoDetailActivity"
android:configChanges="orientation"
android:exported="false" />
<activity android:name="com.eningqu.aipen.ui.vedio.NoteActivity" />
<activity android:name="com.eningqu.aipen.ui.vedio.NoteActivity"
android:exported="false"
/>
<!-- 蓝牙服务 -->
<service
android:name="com.eningqu.aipen.sdk.comm.bluetooth.ble.BleService"
android:enabled="true" />
android:enabled="true"
android:exported="false"
/>
<provider
android:name="androidx.core.content.FileProvider"

2
app/src/main/java/com/eningqu/aipen/demo/view/CanvasDrawView.java
View File

@ -120,7 +120,7 @@ public class CanvasDrawView extends SurfaceView implements SurfaceHolder.Callbac
mPenColor = ContextCompat.getColor(mContext, R.color.color_000000);
//设置默认的背景
mBmpBg= BitmapFactory.decodeResource(getResources(),R.drawable.bg_east);
mBmpBg= BitmapFactory.decodeResource(getResources(),R.drawable.bg_west);
createPaint();//创建画笔
mPath.reset();

41
app/src/main/java/com/eningqu/aipen/ui/home/book/WriteActivity.java
View File

@ -30,6 +30,7 @@ import androidx.core.content.ContextCompat;
import com.blankj.utilcode.util.LogUtils;
import com.blankj.utilcode.util.ScreenUtils;
import com.blankj.utilcode.util.ToastUtils;
import com.bumptech.glide.Glide;
import com.eningqu.aipen.demo.PenCtrlSdkManager;
import com.eningqu.aipen.demo.R;
import com.eningqu.aipen.demo.common.Const;
@ -69,6 +70,8 @@ public class WriteActivity extends BaseActivity<ActivityWriteBinding> {
private CanvasFrame mCurCanvasFrame;//自定义画布
private CanvasDrawView mCurDrawView;
private Bitmap bitmap=null;
/**
* 笔画粗细
*/
@ -535,12 +538,21 @@ public class WriteActivity extends BaseActivity<ActivityWriteBinding> {
mHandler.postDelayed(new Runnable() {
@Override
public void run() {
Bitmap bitmap = screenshot(mCurDrawView);
float ratioX = ((float) mCurDrawView.getWidth() / (float) Constants.A4_WIDTH);
float ratioY = ((float) mCurDrawView.getHeight() / (float) Constants.A4_HEIGHT);
if(bitmap==null){
bitmap=screenshot(mCurDrawView);
}
Bitmap result = Bitmap.createBitmap(bitmap,
(int) (Constants.WestPage.NEW_PAGE_START_X * ratioX),
(int) (Constants.WestPage.NEW_PAGE_START_Y * ratioY),
(int) (Constants.WestPage.NEW_PAGE_WIDTH * ratioX),
(int) (Constants.WestPage.NEW_PAGE_HEIGHT * ratioY));
Bundle bundle = new Bundle();
bundle.putParcelable("image", bitmap);
bundle.putParcelable("image", result);
bundle.putInt("blId", blId);
FormActivity.startAction(getContext(), bundle);
mCurDrawView.setBackImage(BitmapFactory.decodeResource(getResources(), R.drawable.bg_east));
mCurDrawView.setBackImage(BitmapFactory.decodeResource(getResources(), R.drawable.bg_west));
}
}, 2000);
}
@ -559,6 +571,25 @@ public class WriteActivity extends BaseActivity<ActivityWriteBinding> {
public void acPage(View view) {
float ratioX = ((float) mCurDrawView.getWidth() / (float) Constants.A4_WIDTH);
float ratioY = ((float) mCurDrawView.getHeight() / (float) Constants.A4_HEIGHT);
if(bitmap==null){
bitmap=screenshot(mCurDrawView);
}
LogUtils.i(
(int) (Constants.WestPage.NEW_PAGE_START_X * ratioX) + "\n" +
(int) (Constants.WestPage.NEW_PAGE_START_Y * ratioY) + "\n" +
(int) (Constants.WestPage.NEW_PAGE_WIDTH * ratioX) + "\n" +
(int) (Constants.WestPage.NEW_PAGE_HEIGHT * ratioY)
);
Bitmap result = Bitmap.createBitmap(bitmap,
(int) (Constants.WestPage.NEW_PAGE_START_X * ratioX),
(int) (Constants.WestPage.NEW_PAGE_START_Y * ratioY),
(int) (Constants.WestPage.NEW_PAGE_WIDTH * ratioX),
(int) (Constants.WestPage.NEW_PAGE_HEIGHT * ratioY));
// Bitmap result=Bitmap.createBitmap(bitmap);
mBinding.ivBg.setVisibility(View.VISIBLE);
Glide.with(getContext()).load(result).into(mBinding.ivBg);
}
}
@ -605,9 +636,9 @@ public class WriteActivity extends BaseActivity<ActivityWriteBinding> {
@Override
public void onPixelCopyFinished(int copyResult) {
if (PixelCopy.SUCCESS == copyResult) {
Log.i("gyx", "SUCCESS ");
Log.i("lixu", "SUCCESS ");
} else {
Log.i("gyx", "FAILED");
Log.i("lixu", "FAILED");
// onErrorCallback()
}
}

8
app/src/main/res/layout/activity_write.xml
View File

@ -167,8 +167,12 @@
<ImageView
android:id="@+id/ivBg"
android:layout_width="match_parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_width="wrap_content"
android:visibility="gone"
android:layout_height="match_parent"/>
android:background="@color/gray"
android:layout_height="@dimen/dp_500"/>
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>

2
app/src/main/res/values/strings.xml
View File

@ -15,7 +15,7 @@
-->
<resources>
<string name="app_name">NQPen-DEMO</string>
<string name="app_name">智能病历夹</string>
<string name="navigation_drawer_open">Open navigation drawer</string>
<string name="navigation_drawer_close">Close navigation drawer</string>
<string name="device">Device:</string>