p13590867
/
p94fxhifk
1
0
Fork 3
Code Issues Pull Requests Releases Wiki Activity

增加源，可编译了

Browse Source
master
Logical 4 years ago
parent 014959494b
commit 35d1f2adb8
6 changed files with 36 additions and 41 deletions
Show Stats Download Patch File Download Diff File

20
src/AndroidApp/.idea/workspace.xml
Unescape View File

@ -2,21 +2,9 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="dfd94b2a-6d7a-49b9-9f27-735b64fff405" name="Default" comment=""> <list default="true" id="dfd94b2a-6d7a-49b9-9f27-735b64fff405" name="Default" comment="">
<change afterPath="$PROJECT_DIR$/Tbot/.idea/caches/build_file_checksums.ser" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Tbot/.idea/codeStyles/Project.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Tbot/.idea/dbnavigator.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Tbot/.idea/encodings.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Tbot/.idea/jarRepositories.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Tbot/.idea/vcs.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Tbot/.idea/gradle.xml" beforeDir="false" afterPath="$PROJECT_DIR$/Tbot/.idea/gradle.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Tbot/.idea/caches/build_file_checksums.ser" beforeDir="false" afterPath="$PROJECT_DIR$/Tbot/.idea/caches/build_file_checksums.ser" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Tbot/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/Tbot/.idea/misc.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/../Robot/emotion_detector/src/emotion.py" beforeDir="false" afterPath="$PROJECT_DIR$/../Robot/emotion_detector/src/emotion.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Tbot/.idea/modules.xml" beforeDir="false" afterPath="$PROJECT_DIR$/Tbot/.idea/modules.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Tbot/app/src/main/java/me/wshuo/tbot/AudioCall.java" beforeDir="false" afterPath="$PROJECT_DIR$/Tbot/app/src/main/java/me/wshuo/tbot/AudioCall.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Tbot/app/src/main/java/me/wshuo/tbot/Falldown.java" beforeDir="false" afterPath="$PROJECT_DIR$/Tbot/app/src/main/java/me/wshuo/tbot/Falldown.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Tbot/app/src/main/java/me/wshuo/tbot/IPConnect.java" beforeDir="false" afterPath="$PROJECT_DIR$/Tbot/app/src/main/java/me/wshuo/tbot/IPConnect.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Tbot/app/src/main/java/me/wshuo/tbot/Settings.java" beforeDir="false" afterPath="$PROJECT_DIR$/Tbot/app/src/main/java/me/wshuo/tbot/Settings.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Tbot/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/Tbot/build.gradle" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -92,9 +80,9 @@
<servers /> <servers />
</component> </component>
<component name="WindowStateProjectService"> <component name="WindowStateProjectService">
<state x="700" y="302" key="FileChooserDialogImpl" timestamp="1612340452944"> <state x="700" y="302" key="FileChooserDialogImpl" timestamp="1617503949717">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state x="700" y="302" key="FileChooserDialogImpl/0.0.1920.1040@0.0.1920.1040" timestamp="1612340452944" /> <state x="700" y="302" key="FileChooserDialogImpl/0.0.1920.1040@0.0.1920.1040" timestamp="1617503949717" />
</component> </component>
</project> </project>

BIN
src/AndroidApp/Tbot/.idea/caches/build_file_checksums.ser
View File

Binary file not shown.

3
src/AndroidApp/android_remocons/build.gradle
Unescape View File

@ -29,6 +29,9 @@ buildscript {
} }
repositories { repositories {
google() google()
mavenCentral()
maven{ url'http://maven.aliyun.com/nexus/content/groups/public/' }
maven{ url'http://maven.aliyun.com/nexus/content/repositories/jcenter'}
} }
} }

6
src/AndroidApp/android_remocons/rocon_remocon/src/main/java/com/github/rosjava/android_remocons/rocon_remocon/MasterChooser.java
Unescape View File

@ -190,7 +190,8 @@ public class MasterChooser extends Activity {
} }
}).create(); }).create();
d.show(); d.show();
} else if ( concert.getConnectionStatus().equals(RoconDescription.UNAVAILABLE) ) { }
else if ( concert.getConnectionStatus().equals(RoconDescription.UNAVAILABLE) ) {
AlertDialog d = new AlertDialog.Builder(MasterChooser.this) AlertDialog d = new AlertDialog.Builder(MasterChooser.this)
.setTitle("Master Unavailable!") .setTitle("Master Unavailable!")
.setCancelable(false) .setCancelable(false)
@ -202,7 +203,8 @@ public class MasterChooser extends Activity {
} }
}).create(); }).create();
d.show(); d.show();
} else { }
else {
Intent resultIntent = new Intent(); Intent resultIntent = new Intent();
resultIntent.putExtra(RoconDescription.UNIQUE_KEY, concert); resultIntent.putExtra(RoconDescription.UNIQUE_KEY, concert);
setResult(RESULT_OK, resultIntent); setResult(RESULT_OK, resultIntent);

8
src/Robot/emotion_detector/src/emotion.py
Unescape View File

@ -45,18 +45,20 @@ class TakePhoto:
# Initialize # Initialize
rospy.init_node('take_photo', anonymous=False) rospy.init_node('take_photo', anonymous=False)
camera = TakePhoto() #构造出TakePhoto类的一个对象， # 构造出TakePhoto类的一个对象，
camera = TakePhoto()
# Take a photo # Take a photo
# Use '_image_title' parameter from command line # Use '_image_title' parameter from command line
# Default value is 'photo.jpg' # Default value is 'photo.jpg'
# 照片的名字默认为'photo.jpg' # 照片的名字默认为'photo.jpg'
img_title = rospy.get_param('~image_title', 'photo.jpg') img_title = rospy.get_param('~image_title', 'photo.jpg')
if camera.take_picture(img_title): #调用camera的成员函数take_picture， # 调用camera的成员函数take_picture，
if camera.take_picture(img_title):
# 如果拍照成功，打印日志"Saved image photo.jpg" # 如果拍照成功，打印日志"Saved image photo.jpg"
rospy.loginfo("Saved image " + img_title) rospy.loginfo("Saved image " + img_title)
else: else:
# 如果拍照失败，打印日志"No images received" # 如果拍照失败，打印日志"No images received"
rospy.loginfo("No images received") rospy.loginfo("No images received")

Write Preview
Loading…
Cancel
Save