Skip to content
This repository was archived by the owner on Aug 28, 2024. It is now read-only.

Lab version #113

Open
wants to merge 57 commits into
base: master
Choose a base branch
from
Open

Lab version #113

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
6861dc7
pytorch mobile based app
likeand Jan 9, 2021
50ccea3
Update 项目.md
likeand Jan 9, 2021
d9a252d
增加了数据包选择界面和功能
likeand Jan 9, 2021
c3e1a8e
read embeddings from local file
likeand Jan 9, 2021
de03dfc
j1
jiangxiaobaiup Jan 9, 2021
a619844
Merge branch 'master' of https://github.com/FaceRecogApp/android-demo…
jiangxiaobaiup Jan 9, 2021
148e727
sidebar+setup
dh15037672010 Jan 9, 2021
5c9a72a
j2
jiangxiaobaiup Jan 9, 2021
dddeb30
Merge branch 'master' of https://github.com/FaceRecogApp/android-demo…
dh15037672010 Jan 9, 2021
0fdd3fc
Merge branch 'master' of https://github.com/FaceRecogApp/android-demo…
dh15037672010 Jan 9, 2021
4fbdc09
Update FaceDetectionActivity.java
likeand Jan 9, 2021
b42798c
可离线读取本地embeddings并识别
likeand Jan 9, 2021
f5e96e7
setup
dh15037672010 Jan 9, 2021
7f676ba
jiang
jiangxiaobaiup Jan 10, 2021
83605f8
qwer
dh15037672010 Jan 10, 2021
40df659
修改控件
dh15037672010 Jan 11, 2021
ebb84e1
控件传值
dh15037672010 Jan 11, 2021
0eaba31
使用util的全局websocket uri
likeand Jan 11, 2021
40a5161
使用本地json文件实现rtmp websocket 保存
likeand Jan 11, 2021
3a23ca8
jwj
jiangxiaobaiup Jan 11, 2021
e7d2f8e
Update 项目.md
likeand Jan 12, 2021
aae3cb2
汉化
jiangxiaobaiup Jan 12, 2021
8c16d8f
Update strings.xml
jiangxiaobaiup Jan 12, 2021
2768def
修正
likeand Jan 12, 2021
dfa9af6
Update RemoteFaceDetectActivity.java
likeand Jan 12, 2021
8abebe7
登录和设置
likeand Jan 12, 2021
7eaaac8
glass support
likeand Jan 30, 2021
dafd753
增加了本地视频浏览和上传
likeand Feb 1, 2021
d1d96df
准备添加眼镜推流功能，保存一下
likeand Mar 2, 2021
9a0f8f1
密码登录
dh15037672010 Mar 4, 2021
93e1a8c
添加了新增船员信息的功能
likeand Mar 4, 2021
2b08c88
bottomnavigation
dh15037672010 Mar 5, 2021
25124ca
Merge branch 'master' of https://github.com/FaceRecogApp/android-demo…
likeand Mar 7, 2021
262711c
新增和删除船员信息
likeand Mar 7, 2021
cdcf6c9
添加了glassremote的界面
likeand Mar 7, 2021
cf9fb90
UI
dh15037672010 Mar 7, 2021
9fd08a7
UI
dh15037672010 Mar 7, 2021
57282e2
v1926
likeand Mar 7, 2021
c11bb33
整合完成
likeand Mar 7, 2021
c172b7a
可用整合版
likeand Mar 7, 2021
2a4f4b3
更改了图标
likeand Mar 7, 2021
e1482e8
UI
dh15037672010 Mar 7, 2021
746fc51
UI
dh15037672010 Mar 8, 2021
9cdce77
界面调整和Base64依赖改变
likeand Mar 8, 2021
266816a
增加文件部分功能
likeand Mar 8, 2021
989678e
crew列表更新
likeand Mar 8, 2021
dcb261a
修改了列表和功能页面
likeand Mar 9, 2021
cdd7e25
文件预览功能
likeand Mar 9, 2021
f48178d
列表功能增加
likeand Mar 9, 2021
327add7
更新了本地识别部分的实现方法，可以录像了
likeand Mar 11, 2021
c8f0c54
增加船员和眼镜的远程识别
likeand Mar 11, 2021
2545c4b
网络功能修正
likeand Mar 11, 2021
05d5f44
网络地址现在从设置中获取
likeand Mar 12, 2021
4aa7cde
画图时的bug和增加船员bug
likeand Mar 15, 2021
de56071
网络功能 api接口完成
likeand Mar 17, 2021
874cac1
数据包下载和查看
likeand Mar 17, 2021
7388da8
保存版本
likeand Mar 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
sidebar+setup
  • Loading branch information
@dh15037672010
dh15037672010 committed Jan 9, 2021
commit 148e727dbf3047ae7fdd5819c729e5a79abf567a
6 changes: 6 additions & 0 deletions PyTorchDemoApp/app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name=".SideBarActivity"
android:screenOrientation="portrait"/>
<activity
android:name=".SetupMenuActivity"
android:screenOrientation="portrait"/>
<activity android:name=".MainActivity" />
<activity android:name=".vision.VisionListActivity" />
<activity android:name=".nlp.NLPListActivity" />
Expand Down
196 changes: 55 additions & 141 deletions PyTorchDemoApp/app/src/main/java/org/pytorch/demo/DatagramSelectAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,167 +41,81 @@ public ViewPagerViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int vie
return new ViewPagerViewHolder(view);
}
ListView listView;
ListView listView1;

@Override
public void onBindViewHolder(@NonNull ViewPagerViewHolder holder, int position) {

if(position == 0){
TextView textView = holder.itemView.findViewById(R.id.textView);
textView.setText(String.format("***********************set to %d", position));

System.out.println("in onbindviewholder position is "+position);
listView = holder.itemView.findViewById(R.id.listview);
Button button = holder.itemView.findViewById(R.id.button);

button.setOnClickListener(new View.OnClickListener() {
@SuppressLint("StaticFieldLeak")
@Override
public void onClick(View v) {
String login_id = "1";
new AsyncTask<String, Integer, String>(){


@Override
protected String doInBackground(String... arg0){
String res = Util.GetAvailableDatagrams("id");
return res;
}

protected void onPostExecute(String result){
if (result != null){
Toast.makeText(parent.getContext(), "刷新完成",Toast.LENGTH_SHORT).show();
updateListView0(result);
}else{
Toast.makeText(parent.getContext(), "刷新失败，检查网络",Toast.LENGTH_SHORT).show();
}
TextView textView = holder.itemView.findViewById(R.id.textView);
textView.setText(String.format("set to %d", position));

listView = holder.itemView.findViewById(R.id.listview);
Button button = holder.itemView.findViewById(R.id.button);

button.setOnClickListener(new View.OnClickListener() {
@SuppressLint("StaticFieldLeak")
@Override
public void onClick(View v) {
String login_id = "1";
new AsyncTask<String, Integer, String>(){


@Override
protected String doInBackground(String... arg0){
String res = Util.GetAvailableDatagrams("id");
return res;
}

protected void onPostExecute(String result){
if (result != null){
Toast.makeText(parent.getContext(), "刷新完成",Toast.LENGTH_SHORT).show();
updateListView(result);
}else{
Toast.makeText(parent.getContext(), "刷新失败，检查网络",Toast.LENGTH_SHORT).show();
}
}

// @Override
// protected onProgressUpdate(Integer... progress){
// setProgressPercent(progress[0]);
// }
}.execute("1");
}
}.execute("1");
}
);

listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override
@SuppressLint("StaticFieldLeak")
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
System.out.println("position "+position);
String name = ((HashMap<String, String>)(listView.getItemAtPosition(position))).get("name");
System.out.println(name);
}
);

listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override
@SuppressLint("StaticFieldLeak")
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
System.out.println("position "+position);
String name = ((HashMap<String, String>)(listView.getItemAtPosition(position))).get("name");
System.out.println(name);
// Environment.getDataDirectory()
new AsyncTask<String, Integer, String>(){
new AsyncTask<String, Integer, String>(){



@Override
protected String doInBackground(String... arg0){
String res = Util.DownloadDatagramByName(arg0[0]);
return res;
}
@Override
protected String doInBackground(String... arg0){
String res = Util.DownloadDatagramByName(arg0[0]);
return res;
}

protected void onPostExecute(String result){
if (result != null){
Toast.makeText(parent.getContext(), "下载完成",Toast.LENGTH_SHORT).show();
System.out.println(result);
protected void onPostExecute(String result){
if (result != null){
Toast.makeText(parent.getContext(), "下载完成",Toast.LENGTH_SHORT).show();
System.out.println(result);
// updateListView(result);
}else{
Toast.makeText(parent.getContext(), "下载失败，检查网络",Toast.LENGTH_SHORT).show();
}
}else{
Toast.makeText(parent.getContext(), "下载失败，检查网络",Toast.LENGTH_SHORT).show();
}
}.execute(name);
}
});
}
else{
TextView textView = holder.itemView.findViewById(R.id.textView);
textView.setText(String.format("*****************set to %d", position));

System.out.println("in onbindviewholder position is "+position);
listView1 = holder.itemView.findViewById(R.id.listview);
Button button = holder.itemView.findViewById(R.id.button);

button.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
String login_id = "1";
String[] filenames = Util.GetLocalDatagrams();
updateListView1(filenames);
}
}
);

// listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
// @Override
// @SuppressLint("StaticFieldLeak")
// public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
// System.out.println("position "+position);
// String name = ((HashMap<String, String>)(listView.getItemAtPosition(position))).get("name");
// System.out.println(name);
//// Environment.getDataDirectory()
// new AsyncTask<String, Integer, String>(){
//
//
//
// @Override
// protected String doInBackground(String... arg0){
// String res = Util.DownloadDatagramByName(arg0[0]);
// return res;
// }
//
// protected void onPostExecute(String result){
// if (result != null){
// Toast.makeText(parent.getContext(), "下载完成",Toast.LENGTH_SHORT).show();
// System.out.println(result);
//// updateListView(result);
// }else{
// Toast.makeText(parent.getContext(), "下载失败，检查网络",Toast.LENGTH_SHORT).show();
// }
// }
// }.execute(name);
// }
// });
}



}


public void updateListView1(String[] filenames){
if (filenames.length == 0){
return;
}
System.out.println("in updata listview first filename string is "+filenames[0]);
ArrayList<Map<String,String>> list = new ArrayList<>();


for (int i = 0; i < filenames.length; i++){
Map<String, String> map= new HashMap<>();
map.put("name", filenames[i]);
// map.put("mission", jsonArraym.getString(i));
// map.put("site", jsonArrays.getString(i));
list.add(map);
}


SimpleAdapter adapter = new SimpleAdapter(
parent.getContext(),
list,
R.layout.datagram_list_item,
new String[]{"name"},
new int[]{R.id.text1});
}
}.execute(name);
}
});

listView1.setAdapter(adapter);
}



public void updateListView0(String jsonString){
public void updateListView(String jsonString){
System.out.println("in updata listview json string is "+jsonString);
ArrayList<Map<String,String>> list = new ArrayList<>();
try{
Expand Down
Loading