Skip to content

Commit

Permalink
🎉Release 1.3，保留旧聊天交互卡片页面隐藏（目前为新UI）提升交互体验，修复发送的问题。
Browse files Browse the repository at this point in the history
  • Loading branch information
@Hny0305Lin
Hny0305Lin committed Jul 6, 2024
1 parent 5a98913 commit 69d91b4
Show file tree
Hide file tree
Showing 4 changed files with 110 additions and 7 deletions.
62 changes: 57 additions & 5 deletions app/src/main/java/com/haohanyh/linmengjia/nearlink/nlchat/fun/MainActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
private TextView APPRunResult,MobileUSBResult,UARTResult;
private AppCompatTextView NearLinkUserTitle;
private TextView NearLinkUserText,NearLinkMeText;
private EditText EditChatSend;
private EditText EditChatSend,EditChatSendNewUI;

private Resources resources;
private String[] UartSettingsBaud,UartSettingsData,UartSettingsStop,UartSettingsParity,UartSettingsParityII;
Expand Down Expand Up @@ -204,13 +204,18 @@ private void Init() {
btnNearLinkStatus.setOnClickListener(this);
btnNearLinkSettings = findViewById(id.menu_labels_right_btn_nearlink_settings);
btnNearLinkSettings.setOnClickListener(this);
btnNearLinkUIChanges = findViewById(id.menu_labels_right_btn_nearlink_uichanges);
btnNearLinkUIChanges.setOnClickListener(this);
btnNearlinkUart = findViewById(id.menu_labels_right_btn_nearlink_uart);
btnNearlinkUart.setOnClickListener(this);
btnNearlinkDev = findViewById(id.menu_labels_right_btn_nearlink_dev);
btnNearlinkDev.setOnClickListener(this);
clickCountButton_btnNearLinkStatus = 0;
btnNearLinkStatus.setImageDrawable(getResources().getDrawable(drawable.ic_baseline_done_all_24));
btnNearLinkStatus.setImageResource(drawable.ic_baseline_done_all_24);
clickCountButton_btnNearLinkUIChanges = 0;
btnNearLinkUIChanges.setImageDrawable(getResources().getDrawable(drawable.ic_baseline_nearlink_24));
btnNearLinkUIChanges.setImageResource(drawable.ic_baseline_nearlink_24);
clickCountButton_btnNearLinkUart = 1;
btnNearlinkUart.setImageDrawable(getResources().getDrawable(drawable.ic_baseline_close_24));
btnNearlinkUart.setImageResource(drawable.ic_baseline_close_24);
Expand All @@ -231,7 +236,7 @@ private void Init() {
CTHANKS = findViewById(id.CardAPP);
CTHANKS.setVisibility(View.VISIBLE);
CNearLinkChat = findViewById(id.CardIChat);
CNearLinkChat.setVisibility(View.VISIBLE);
CNearLinkChat.setVisibility(View.GONE);
CNearLinkChatNewUI = findViewById(id.CardIChatNewUI);
CNearLinkChatNewUI.setVisibility(View.VISIBLE);
NearLinkNewUIUserTitle = findViewById(id.userTitleNewUI);
Expand Down Expand Up @@ -259,6 +264,23 @@ public boolean onEditorAction(TextView textView, int actionId, KeyEvent keyEvent
return false;
}
});
EditChatSendNewUI = findViewById(id.editChatSendNewUI);
EditChatSendNewUI.setOnEditorActionListener(new TextView.OnEditorActionListener() {
@Override
public boolean onEditorAction(TextView textView, int actionId, KeyEvent keyEvent) {
if (actionId == EditorInfo.IME_ACTION_DONE ||
(keyEvent != null && keyEvent.getKeyCode() == KeyEvent.KEYCODE_ENTER && keyEvent.getAction() == KeyEvent.ACTION_DOWN)) {
String text = textView.getText().toString().trim();
if (!text.isEmpty()) {
NearLinkChatSendData(textView);
return true;
} else {
SnackBarToastForDebug(context,"您发送的消息为空!","推荐编辑好再发送",0,Snackbar.LENGTH_SHORT);
}
}
return false;
}
});

CheckBoxUartWarn = findViewById(id.cbUartWarn);
NearLinkUartWarnToast = CheckBoxUartWarn.isChecked();
Expand Down Expand Up @@ -555,12 +577,22 @@ private String CH34xProcessingForReadData(String string) {

public void NearLinkChatSendData(View view) {
HhandlerI.sendEmptyMessage(10);
byte[] to_send = StringUtils.needProcess().toByteArray(String.valueOf(EditChatSend.getText())); //以字符串方式发送
//这里写的是用户是否使用新UI和旧UI。
byte[] to_send;
String messageSend;
if (!EditChatSend.getText().toString().isEmpty()) {
messageSend = EditChatSend.getText().toString();
to_send = StringUtils.needProcess().toByteArray(EditChatSend.getText().toString());
} else {
messageSend = EditChatSendNewUI.getText().toString();
to_send = StringUtils.needProcess().toByteArray(EditChatSendNewUI.getText().toString());
}
//byte[] to_send = StringUtils.needProcess().toByteArray(String.valueOf(EditChatSend.getText())); //以字符串方式发送
int retval = MainAPP.CH34X.writeData(to_send, to_send.length);//写数据，第一个参数为需要发送的字节数组，第二个参数为需要发送的字节长度，返回实际发送的字节长度
if (retval < 0) {
SnackBarToastForDebug(context,"向对方发送数据失败!","推荐重新配置",3,Snackbar.LENGTH_SHORT);
} else {
String TextOfClient = CH34xProcessingForSendData(EditChatSend.getText().toString());
String TextOfClient = CH34xProcessingForSendData(messageSend);
runOnUiThread(() -> {
//如果需要存储到数据库中
if (ChatUtils.isSqlitemanager()) {
Expand All @@ -582,7 +614,7 @@ public void NearLinkChatSendData(View view) {
clientUpdater.updateTextView();
MainAPP.Vibrate(this);
} else {
NearLinkMeText.append(TextOfClient);
NearLinkMeText.append(messageSend);
if (NearLinkMeText.length() > 2048) {
String str = NearLinkMeText.getText().toString().substring(NearLinkMeText.getText().length() - 1024, NearLinkMeText.getText().length());
NearLinkMeText.setText("");
Expand All @@ -592,6 +624,7 @@ public void NearLinkChatSendData(View view) {
}
//发送完消息清空待发送文本
EditChatSend.setText("");
EditChatSendNewUI.setText("");
});
}
}
Expand Down Expand Up @@ -664,6 +697,25 @@ public void onClick(View view) {
btnNearLinkStatus.setImageResource(drawable.ic_baseline_done_all_24);
clickCountButton_btnNearLinkStatus = 0;
}
} else if (view.getId() == id.menu_labels_right_btn_nearlink_uichanges) {
MainAPP.Vibrate(this);
if (clickCountButton_btnNearLinkUIChanges % 2 == 0) {
CNearLinkChat.setVisibility(View.VISIBLE);
CNearLinkChatNewUI.setVisibility(View.GONE);
EditChatSendNewUI.setText("");

btnNearLinkUIChanges.setImageDrawable(getResources().getDrawable(drawable.ic_baseline_done_all_24));
btnNearLinkUIChanges.setImageResource(drawable.ic_baseline_done_all_24);
clickCountButton_btnNearLinkUIChanges = clickCountButton_btnNearLinkUIChanges + 1;
} else {
CNearLinkChat.setVisibility(View.GONE);
CNearLinkChatNewUI.setVisibility(View.VISIBLE);
EditChatSend.setText("");

btnNearLinkUIChanges.setImageDrawable(getResources().getDrawable(drawable.ic_baseline_nearlink_24));
btnNearLinkUIChanges.setImageResource(drawable.ic_baseline_nearlink_24);
clickCountButton_btnNearLinkUIChanges = 0;
}
} else if (view.getId() == id.menu_labels_right_btn_nearlink_settings) {
MainAPP.Vibrate(this);
if (clickCountButton_btnNearLinkSettings % 2 == 0) {
Expand Down
19 changes: 19 additions & 0 deletions app/src/main/res/drawable/ic_baseline_nearlink_24.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:height="24dp" android:tint="#3AE7D6"
android:viewportHeight="106"
android:viewportWidth="91"
android:width="24dp" >
<path
android:fillColor="#00C08B"
android:pathData="M69.3,101.3 C96,75.3,96.6,32.6,70.6,5.9 C70.2,5.5,69.8,5,69.3,4.6 L64.6,0
L34.3,29.6 C22,41.6,21.1,61.1,32.3,74.2 L41.9,64.8 C35.9,57,36.7,45.9,43.8,39
L64.2,19 C80.1,38.9,80.1,67.2,64.2,87 L58.7,81.6 L49.3,91 L64.6,106 L69.3,101.3
Z" />
<path
android:fillColor="#00C08B"
android:pathData="M56.7,76.4 C69,64.4,69.9,44.9,58.7,31.9 L49.1,41.3
C55.1,49.1,54.2,60.2,47.1,67.1 L26.7,87 C10.7,67.1,10.7,38.8,26.7,19 L32.4,24.6
L41.9,15.2 L26.5,0 L21.7,4.7 C8.5,17.6,1.3,34.7,1.3,53 S8.6,88.4,21.7,101.3
L26.5,106 L56.7,76.4 Z" />
</vector>
34 changes: 33 additions & 1 deletion app/src/main/res/layout/activity_main.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@
android:layout_marginTop="35dp"
android:layout_marginRight="15dp"
android:layout_marginBottom="15dp"
android:visibility="visible"
android:visibility="gone"
app:cardCornerRadius="4dp"
app:cardElevation="18dp">

Expand Down Expand Up @@ -269,6 +269,38 @@
android:layout_height="380dp"
android:padding="8dp" />

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">

<EditText
android:id="@+id/editChatSendNewUI"
android:layout_width="wrap_content"
android:layout_height="100dp"
android:layout_marginStart="10dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="5dp"
android:layout_marginBottom="10dp"
android:layout_weight="8"
android:textColor="@color/blue_biaozhun_logowai"
android:singleLine="true"
tools:ignore="HardcodedText" />

<com.google.android.material.button.MaterialButton
android:layout_width="wrap_content"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_margin="5dp"
android:fontFamily="sans-serif-medium"
android:onClick="NearLinkChatSendData"
android:text="@string/nearlinkChatSend"
android:textColor="#FFFFFFFF"
app:backgroundTint="@color/Pink_is_fancy"
app:cornerRadius="10dp" />

</LinearLayout>

</LinearLayout>

</androidx.cardview.widget.CardView>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<resources>
<string name="app_name">NLChat</string>
<string name="app_package">com.haohanyh.linmengjia.nearlink.nlchat.fun</string>
<string name="app_version">1.3.60.2024.0706</string>
<string name="app_version">1.3.69.2024.0706</string>

<string name="appwarn">NLChat，浩瀚银河宗旨为用爱和魔法创造Android APP。</string>
<string name="thanks3q">友情感谢</string>
Expand Down

0 comments on commit 69d91b4

Please sign in to comment.