Skip to content
This repository has been archived by the owner on Jul 28, 2020. It is now read-only.

Commit

Permalink
add xian city bus info
Browse files Browse the repository at this point in the history
  • Loading branch information
@kidozh
kidozh committed Sep 28, 2018
1 parent 587cf62 commit 58e27c9
Show file tree
Hide file tree
Showing 77 changed files with 5,024 additions and 197 deletions.
Binary file modified .idea/caches/build_file_checksums.ser
View file
Binary file not shown.
30 changes: 18 additions & 12 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ apply plugin: 'kotlin-android'


android {
compileSdkVersion 27
compileSdkVersion 28
defaultConfig {
applicationId "com.kidozh.npuhelper"
minSdkVersion 23
targetSdkVersion 27
targetSdkVersion 28
versionCode 2
versionName "0.2.0.180904_alpha"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
Expand All @@ -34,20 +34,19 @@ android {
}
}


dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation 'com.android.support:appcompat-v7:27.1.1'
implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
implementation 'com.android.support:support-v4:27.1.1'
implementation 'com.android.support:design:27.1.1'
implementation 'com.android.support:support-v4:28.0.0'
implementation 'com.android.support:design:28.0.0'
implementation 'com.google.firebase:firebase-core:16.0.3'
//implementation 'com.google.firebase:firebase-messaging:17.3.0'
implementation 'com.android.support:recyclerview-v7:27.1.1'
implementation 'com.android.support:recyclerview-v7:28.0.0'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
implementation 'com.android.support:cardview-v7:27.1.1'
implementation 'com.android.support:cardview-v7:28.0.0'
implementation 'com.loopj.android:android-async-http:1.4.9'
implementation 'com.github.GrenderG:Toasty:1.3.0'
def lifecycle_version = "1.1.1"
Expand All @@ -63,23 +62,23 @@ dependencies {
implementation "android.arch.persistence.room:guava:$room_version"
// Test helpers
testImplementation "android.arch.persistence.room:testing:$room_version"
implementation 'com.android.support:mediarouter-v7:27.1.1'
implementation 'com.android.support:mediarouter-v7:28.0.0'

def butter_knife_version = "9.0.0-SNAPSHOT"
implementation "com.jakewharton:butterknife:$butter_knife_version"
annotationProcessor "com.jakewharton:butterknife-compiler:$butter_knife_version"

// android plot
implementation 'com.github.PhilJay:MPAndroidChart:v3.0.3'
//implementation 'com.github.PhilJay:MPAndroidChart:v3.0.3'

//annotationProcessor "com.neenbedankt.android-apt:1.8"

implementation 'com.squareup.okhttp3:okhttp:3.9.0'
implementation 'com.squareup.okhttp3:okhttp:3.10.0'
implementation 'ru.noties:markwon:1.1.0'
implementation 'ru.noties:markwon-image-loader:1.1.0' // optional
implementation 'ru.noties:markwon-syntax:1.1.0' // optional
implementation 'ru.noties:markwon-view:1.1.0' // optional
def commonmark = "0.10.0";
def commonmark = "0.10.0"
implementation "com.atlassian.commonmark:commonmark:$commonmark"
implementation "com.atlassian.commonmark:commonmark-ext-autolink:$commonmark"
implementation "com.atlassian.commonmark:commonmark-ext-gfm-strikethrough:$commonmark"
Expand All @@ -95,8 +94,15 @@ dependencies {
implementation 'com.amap.api:map2d:latest.integration'
implementation 'com.amap.api:3dmap:latest.integration'
implementation 'com.amap.api:search:latest.integration'

implementation 'com.haibin:calendarview:3.4.4'

implementation 'com.github.bumptech.glide:glide:4.8.0'
annotationProcessor 'com.github.bumptech.glide:compiler:4.8.0'
}



apply plugin: 'com.google.gms.google-services'
repositories {
mavenCentral()
Expand Down
12 changes: 11 additions & 1 deletion app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,17 @@
android:name=".campusBuildingLoc.campusBuildingDetailActivity"
android:label="@string/title_activity_campus_building_detail"
android:theme="@style/AppTheme.NoActionBar" />
<activity android:name=".campusAddressBook.campusAddressBookMainActivity"></activity>
<activity android:name=".campusAddressBook.campusAddressBookMainActivity" />
<activity
android:name=".schoolCalendar.schoolCalendarMainActivity"
android:theme="@style/AppTheme.NoActionBar" />
<activity
android:name=".xianCityBus.cityBusPortalActivity"
android:label="@string/title_activity_city_bus_portal"
android:theme="@style/AppTheme.NoActionBar" />
<activity android:name=".xianCityBus.cityLocationSelectActivity"
android:theme="@style/AppTheme.NoActionBar"
/>
</application>

</manifest>
22 changes: 15 additions & 7 deletions app/src/main/java/com/kidozh/npuhelper/MainActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
import com.kidozh.npuhelper.schoolBusUtils.schoolBusUtils;
import com.kidozh.npuhelper.preference.SettingsActivity;
import com.kidozh.npuhelper.schoolBusUtils.schoolBusListActivity;
import com.kidozh.npuhelper.schoolCalendar.schoolCalendarMainActivity;
import com.kidozh.npuhelper.weatherUtils.WeatherDetailActivity;
import com.kidozh.npuhelper.weatherUtils.caiyunWeatherDatabase;
import com.kidozh.npuhelper.weatherUtils.caiyunWeatherEntry;
Expand All @@ -72,6 +73,7 @@
import com.kidozh.npuhelper.weatherUtils.caiyunWeatherViewModelFactory;
import com.kidozh.npuhelper.weatherUtils.addCaiyunWeatherViewModel;
import com.kidozh.npuhelper.campusBuildingLoc.campusBuildingPortalActivity;
import com.kidozh.npuhelper.xianCityBus.cityBusPortalActivity;
import com.loopj.android.http.AsyncHttpClient;
import com.loopj.android.http.SyncHttpClient;
import com.loopj.android.http.TextHttpResponseHandler;
Expand Down Expand Up @@ -120,8 +122,9 @@ public class MainActivity extends AppCompatActivity implements LoaderManager.Loa
@BindView(R.id.left_time) TextView mShuttleLeftTime;
@BindView(R.id.left_time1) TextView mShuttleLeftTime1;

private double locLatitude = 34.244065;
private double locLongitude = 108.915874;

private double locLatitude = 34.24626;
private double locLongitude = 108.91148;

private DrawerLayout mDrawerLayout;
private ActionBarDrawerToggle mDrawerToggle;
Expand Down Expand Up @@ -155,12 +158,12 @@ protected void onCreate(Bundle savedInstanceState) {
Log.d(TAG,"GET LOCATION PERMIT "+locationManager);

if(ActivityCompat.shouldShowRequestPermissionRationale(this,Manifest.permission.ACCESS_COARSE_LOCATION)){
Toasty.info(this,getString(R.string.caiyun_support_notice),Toast.LENGTH_SHORT,true).show();
ActivityCompat.requestPermissions(this,new String[]{Manifest.permission.ACCESS_COARSE_LOCATION,Manifest.permission.ACCESS_FINE_LOCATION},8);
// 应用之前请求过此权限但用户拒绝了请求，此方法将返回 true
Toasty.info(this,getString(R.string.location_denied_notice),Toast.LENGTH_LONG,true).show();
}
else {
ActivityCompat.requestPermissions(this,new String[]{Manifest.permission.ACCESS_COARSE_LOCATION,Manifest.permission.ACCESS_FINE_LOCATION},8);
Toasty.info(this,getString(R.string.location_denied_notice),Toast.LENGTH_LONG,true).show();



}
Expand Down Expand Up @@ -469,7 +472,7 @@ public void renderGeoLocation(){


}
catch (IOException e){
catch (Exception e){
mLocationName.setText(getString(R.string.geo_parse_failed));
Toasty.error(this, getString(R.string.connection_error_notice), Toast.LENGTH_SHORT, true).show();
// e.printStackTrace();
Expand Down Expand Up @@ -692,6 +695,8 @@ public boolean onNavigationItemSelected(MenuItem item) {

if (id == R.id.nav_ipv6_free_tv) {
// Handle the camera action
Intent intent = new Intent(this,schoolCalendarMainActivity.class);
startActivity(intent);
return false;
} else if (id == R.id.nav_position_label) {
Intent intent = new Intent(this,campusBuildingPortalActivity.class);
Expand All @@ -707,7 +712,10 @@ public boolean onNavigationItemSelected(MenuItem item) {
Intent intent = new Intent(this,SettingsActivity.class);
startActivity(intent);
return false;
} else if (id == R.id.nav_share) {
} else if (id == R.id.nav_bus_services) {
Intent intent = new Intent(this,cityBusPortalActivity.class);
startActivity(intent);
return true;

} else if (id == R.id.nav_send) {

Expand Down
97 changes: 87 additions & 10 deletions app/src/main/java/com/kidozh/npuhelper/campusBuildingLoc/campusBuildingDetailActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,14 @@
import android.content.Intent;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.drawable.Animatable;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.design.widget.AppBarLayout;
import android.support.design.widget.FloatingActionButton;
import android.support.design.widget.Snackbar;
Expand All @@ -26,6 +29,11 @@
import android.widget.ProgressBar;
import android.widget.TextView;

import com.bumptech.glide.Glide;
import com.bumptech.glide.request.target.SimpleTarget;
import com.bumptech.glide.request.target.SizeReadyCallback;
import com.bumptech.glide.request.target.Target;
import com.bumptech.glide.request.transition.Transition;
import com.kidozh.npuhelper.R;
import com.kidozh.npuhelper.markdownUtils.htmlHelper;

Expand Down Expand Up @@ -107,16 +115,85 @@ public void onClick(View view) {

// bitmap label
if(!mDetailCampusBuildingPicFilePath.equals("")){
File picFile = new File(mDetailCampusBuildingPicFilePath);
Log.d(TAG,"Get Pic path: "+mDetailCampusBuildingPicFilePath);
if(picFile.exists()){
Bitmap bitmap = BitmapFactory.decodeFile(picFile.getAbsolutePath());
Drawable drawable = new BitmapDrawable(getResources(),bitmap);
mCampusBuildingDetailAppbar.setBackground(drawable);
}
else {
mCampusBuildingDetailAppbar.setBackgroundColor(getColor(R.color.colorAccent));
}
// taDrawable drawable = mCampusBuildingDetailAppbar.getBackground();
Log.d(TAG,"Resource URL " + mDetailCampusBuildingPicFilePath);
Target<Bitmap> bitmapTarget = new Target<Bitmap>() {
@Override
public void onLoadStarted(@Nullable Drawable placeholder) {
mCampusBuildingDetailAppbar.setBackgroundColor(mContext.getColor(R.color.colorEmerland));
}

@Override
public void onLoadFailed(@Nullable Drawable errorDrawable) {
mCampusBuildingDetailAppbar.setBackgroundColor(mContext.getColor(R.color.colorConcreteTransparent));
}

@Override
public void onResourceReady(@NonNull Bitmap resource, @Nullable Transition<? super Bitmap> transition) {
Log.d(TAG,"Resource Get To Map Appbar");
Drawable drawable = new BitmapDrawable(getResources(),resource);
mCampusBuildingDetailAppbar.setBackground(drawable);
}

@Override
public void onLoadCleared(@Nullable Drawable placeholder) {

}

@Override
public void getSize(@NonNull SizeReadyCallback cb) {
mCampusBuildingDetailAppbar.post(new Runnable() {
@Override
public void run() {
int picHeight = mCampusBuildingDetailAppbar.getMeasuredHeight();
int picWidth = mCampusBuildingDetailAppbar.getMeasuredWidth();
Log.d(TAG,"pic size :"+picHeight+" "+picWidth);
cb.onSizeReady(picWidth,picHeight);
}
});


}

@Override
public void removeCallback(@NonNull SizeReadyCallback cb) {

}

@Override
public void setRequest(@Nullable com.bumptech.glide.request.Request request) {

}

@Nullable
@Override
public com.bumptech.glide.request.Request getRequest() {
return null;
}


@Override
public void onStart() {

}

@Override
public void onStop() {

}

@Override
public void onDestroy() {

}
};
Glide.with(mContext.getApplicationContext())
.asBitmap()

.load(mDetailCampusBuildingPicFilePath)


.into(bitmapTarget);

}
else {
Expand Down
Loading

0 comments on commit 58e27c9

Please sign in to comment.