From 84d404dac304f2cb3d22993d6460c8b3d867c158 Mon Sep 17 00:00:00 2001 From: wangmi Date: Sun, 12 Feb 2017 20:30:28 +0800 Subject: [PATCH] v2.92 --- qy/build.gradle | 2 +- qy/proguard.cfg | 4 +- qy/src/main/AndroidManifest.xml | 12 ++--- .../com/qiyou/mb/android/QiYouConstant.java | 2 +- .../mb/android/beans/basic/Vender_bean.java | 20 ++++++++ .../com/qiyou/mb/android/ui/MainActivity.java | 6 ++- .../android/ui/fragments/ActivityDetail.java | 46 +++++++++--------- .../mb/android/ui/fragments/GroupDetail.java | 19 +++++++- .../ui/fragments/Querybase_fragment.java | 16 ++++-- .../android/ui/fragments/Scan_fragment.java | 28 +++++++++-- .../ui/fragments/TrackStatics_fragment.java | 7 ++- .../mb/android/ui/fragments/UserDetails.java | 40 +++++++++------ .../main/res/drawable-hdpi/button_color.xml | 3 +- .../res/drawable-hdpi/custom_btn_beige.xml | 4 +- qy/src/main/res/drawable-hdpi/icon_coins.png | Bin 0 -> 6244 bytes qy/src/main/res/drawable-hdpi/icon_scan.png | Bin 0 -> 3085 bytes qy/src/main/res/drawable-hdpi/icon_wall1.png | Bin 0 -> 1823 bytes qy/src/main/res/layout/more_functions.xml | 9 +++- qy/src/main/res/layout/qcode_fragment.xml | 2 + qy/src/main/res/values/strings.xml | 1 + 20 files changed, 160 insertions(+), 61 deletions(-) create mode 100644 qy/src/main/java/com/qiyou/mb/android/beans/basic/Vender_bean.java create mode 100644 qy/src/main/res/drawable-hdpi/icon_coins.png create mode 100644 qy/src/main/res/drawable-hdpi/icon_scan.png create mode 100644 qy/src/main/res/drawable-hdpi/icon_wall1.png diff --git a/qy/build.gradle b/qy/build.gradle index 343a5fe..02118a9 100644 --- a/qy/build.gradle +++ b/qy/build.gradle @@ -52,7 +52,7 @@ dependencies { compile 'com.google.code.gson:gson:2.8.0' compile project(':PushSDK') compile 'me.dm7.barcodescanner:zxing:1.9' - compile files('libs/core-3.2.0.jar') +// compile files('libs/core-3.2.0.jar') compile files('libs/javase-2.3-SNAPSHOT.jar') } //tasks.withType(JavaCompile) { diff --git a/qy/proguard.cfg b/qy/proguard.cfg index 36c2e42..47bfc60 100644 --- a/qy/proguard.cfg +++ b/qy/proguard.cfg @@ -128,7 +128,9 @@ -keep class com.google.** { *; } -keep class android.support.v4.** -dontwarn android.support.v4.** - +#zxing scan +-keep class me.dm7.barcodescanner.** { *; } +-dontwarn com.google.zxing.** # ------ 保护百度地址jar包 -------- -keep class com.baidu.** { *; } -keep class vi.com.gdi.bgl.android.**{*;} diff --git a/qy/src/main/AndroidManifest.xml b/qy/src/main/AndroidManifest.xml index 8a6b59b..37ff7f6 100644 --- a/qy/src/main/AndroidManifest.xml +++ b/qy/src/main/AndroidManifest.xml @@ -2,8 +2,8 @@ + android:versionCode="46" + android:versionName="1.29.2" > - + /> - + />--> diff --git a/qy/src/main/java/com/qiyou/mb/android/QiYouConstant.java b/qy/src/main/java/com/qiyou/mb/android/QiYouConstant.java index 530aef6..d7a2746 100644 --- a/qy/src/main/java/com/qiyou/mb/android/QiYouConstant.java +++ b/qy/src/main/java/com/qiyou/mb/android/QiYouConstant.java @@ -15,7 +15,7 @@ public final static String BASE_MD_URL = BASE_URL;//+"upload/"; public final static String BASE_STATIC_URL = BASE_URL +"staticmap/"; public final static String TENCENT_APP_ID = "1104563148"; // TODO Turn off when deploying. -public static boolean DEVELOPER_MODE = true; +public static boolean DEVELOPER_MODE = false; public static boolean PLAYBACK_CAN_RECORD = false /*DEVELOPER_MODE*/ ; diff --git a/qy/src/main/java/com/qiyou/mb/android/beans/basic/Vender_bean.java b/qy/src/main/java/com/qiyou/mb/android/beans/basic/Vender_bean.java new file mode 100644 index 0000000..0b877cc --- /dev/null +++ b/qy/src/main/java/com/qiyou/mb/android/beans/basic/Vender_bean.java @@ -0,0 +1,20 @@ +package com.qiyou.mb.android.beans.basic; + +/** + * Created by wangmi on 17/1/7. + */ + +public class Vender_bean extends Group_bean { + + + + + + + + + + + + +} diff --git a/qy/src/main/java/com/qiyou/mb/android/ui/MainActivity.java b/qy/src/main/java/com/qiyou/mb/android/ui/MainActivity.java index 8b018b1..ee7b592 100644 --- a/qy/src/main/java/com/qiyou/mb/android/ui/MainActivity.java +++ b/qy/src/main/java/com/qiyou/mb/android/ui/MainActivity.java @@ -246,7 +246,7 @@ public class MainActivity extends Activity_qiyouBase{ com.umeng.socialize.utils.Log.LOG = QiYouConstant.DEVELOPER_MODE; String key ="550aa4e4fd98c5a25c000284" ; //old "4eaee02c527015373b000003" if (!QiYouConstant.DEVELOPER_MODE){ - UMAnalyticsConfig config = new UMAnalyticsConfig(this,key , "i7lv"); + UMAnalyticsConfig config = new UMAnalyticsConfig(this,key , "flyme"); MobclickAgent. startWithConfigure(config); MobclickAgent.openActivityDurationTrack(false); } @@ -1224,7 +1224,9 @@ public void showNoteDetail(Note note,NoteMessage noteMsg) { && !app.currentActiveFragment.equalsIgnoreCase(UserDetails.getFTag()) && !app.currentActiveFragment.equalsIgnoreCase(UserHome.getFTag()) && !app.currentActiveFragment.equalsIgnoreCase(tabList) - && !app.currentActiveFragment.equalsIgnoreCase(Route_fragment.getFTag())) + && !app.currentActiveFragment.equalsIgnoreCase(Route_fragment.getFTag()) + && !app.currentActiveFragment.equalsIgnoreCase(QCode_fragment.getFTag())) + { updateTabVisibility(true); diff --git a/qy/src/main/java/com/qiyou/mb/android/ui/fragments/ActivityDetail.java b/qy/src/main/java/com/qiyou/mb/android/ui/fragments/ActivityDetail.java index 363bcd0..1c33b21 100644 --- a/qy/src/main/java/com/qiyou/mb/android/ui/fragments/ActivityDetail.java +++ b/qy/src/main/java/com/qiyou/mb/android/ui/fragments/ActivityDetail.java @@ -299,7 +299,7 @@ public class ActivityDetail extends WebList_fragment /*TrackingBasic_fragment*/ btn_qcode =(Button)vContainer.findViewById(R.id.act_btn_qcode); btn_qcode.setOnClickListener(ButtonOnClickListener); - + btn_qcode.setVisibility(QiYouConstant.DEVELOPER_MODE?View.VISIBLE: View.GONE); txtStartGeoPicker = (TextView) vContainer.findViewById(R.id.act_txt_startGeo_picker); txtStartGeoPicker.setOnClickListener(ButtonOnClickListener); @@ -418,26 +418,7 @@ public class ActivityDetail extends WebList_fragment /*TrackingBasic_fragment*/ } }; - @Override - void generateQcode(){ - if (currentAct.getSvrNumber() > 0){ - - - JSONObject json = new JSONObject(); - try { - json.put(QiYouConstant.EXTRA_KEY_SVRID, String.valueOf(currentAct.getSvrNumber())); - json.put("ownerId", String.valueOf( currentAct.getUserId())); - json.put("svrName", currentAct.getName()); - json.put(QiYouConstant.EXTRA_KEY_RESTMETHOD,RestMethods.ACT_P_ADD_MEMBER); - json.put(QiYouConstant.EXTRA_KEY_QCODEDESC, currentAct.getName()); - } catch (JSONException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - activity.showQcode(json.toString()); - } - } @Override void pickGeoPlace(int textViewId){ // activity.addressTextId=textViewId; @@ -1247,7 +1228,9 @@ public class ActivityDetail extends WebList_fragment /*TrackingBasic_fragment*/ if(Boolean.valueOf(jsonObject.getString(QiYouConstant.SIMPLE_KEY))){ //success this.showNotes(msg/*"退出成功"*/); - btn_actJoin.setText(R.string.act_join); + if(btn_actJoin!=null) { + btn_actJoin.setText(R.string.act_join); + } // lastMemberQueryPara=""; // doUserQuery(); @@ -1484,7 +1467,26 @@ public class ActivityDetail extends WebList_fragment /*TrackingBasic_fragment*/ validInputs(); } - + @Override + void generateQcode(){ + if (currentAct.getSvrNumber() > 0){ + + + + JSONObject json = new JSONObject(); + try { + json.put(QiYouConstant.EXTRA_KEY_SVRID, String.valueOf(currentAct.getSvrNumber())); + json.put("ownerId", String.valueOf( currentAct.getUserId())); + json.put("svrName", currentAct.getName()); + json.put(QiYouConstant.EXTRA_KEY_RESTMETHOD,RestMethods.ACT_P_ADD_MEMBER); + json.put(QiYouConstant.EXTRA_KEY_QCODEDESC, currentAct.getName()); + } catch (JSONException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + activity.showQcode(json.toString()); + } + } @Override void shareEndUrl(int viewId){ diff --git a/qy/src/main/java/com/qiyou/mb/android/ui/fragments/GroupDetail.java b/qy/src/main/java/com/qiyou/mb/android/ui/fragments/GroupDetail.java index adf2d89..81d151c 100644 --- a/qy/src/main/java/com/qiyou/mb/android/ui/fragments/GroupDetail.java +++ b/qy/src/main/java/com/qiyou/mb/android/ui/fragments/GroupDetail.java @@ -568,7 +568,24 @@ public class GroupDetail extends ActivityDetail { } } - + @Override + void generateQcode(){ + if (currentGroup.getId() > 0){ + + JSONObject json = new JSONObject(); + try { + json.put(QiYouConstant.EXTRA_KEY_SVRID, String.valueOf(currentGroup.getId())); + json.put("ownerId", String.valueOf( currentGroup.getUserId())); + json.put("svrName", currentGroup.getName()); + json.put(QiYouConstant.EXTRA_KEY_RESTMETHOD,RestMethods.GRP_P_ADD_MEMBER); + json.put(QiYouConstant.EXTRA_KEY_QCODEDESC, currentGroup.getName()); + } catch (JSONException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + activity.showQcode(json.toString()); + } + } @Override public void onResume() { // activity.app.currentGroupiveFragment =TAG; diff --git a/qy/src/main/java/com/qiyou/mb/android/ui/fragments/Querybase_fragment.java b/qy/src/main/java/com/qiyou/mb/android/ui/fragments/Querybase_fragment.java index 3fe43f9..feec8a7 100644 --- a/qy/src/main/java/com/qiyou/mb/android/ui/fragments/Querybase_fragment.java +++ b/qy/src/main/java/com/qiyou/mb/android/ui/fragments/Querybase_fragment.java @@ -356,9 +356,9 @@ public abstract class Querybase_fragment extends QiyouFragment implements SwipeR // // QLog.getLogger().d(dTAG, " added ids is? "+activity.app.mStatistics.getCategoryList().get(cate) ); } } + - } - + }else if(cateQueryType==1){ String lastCate=""; for(String cate: activity.app.getQueryCategoryList()){ @@ -394,8 +394,12 @@ public abstract class Querybase_fragment extends QiyouFragment implements SwipeR lastCate=cate; } + + } + + getTrackIds().clear(); for(Integer i:ids){ if(!getTrackIds().contains(i))getTrackIds().add(i); @@ -1998,9 +2002,13 @@ public abstract class Querybase_fragment extends QiyouFragment implements SwipeR // final Track tr = new Track(); final ArrayList showingGpxIds =activity.app.getGpxShowingTracks(); - if(isByCatesQuery || isRouteQuery /*||isInactiveQuery*/){//by cates + if(isByCatesQuery /*|| isRouteQuery ||isInactiveQuery*/){//by cates + buildIds() ; whereClause = whereCates; - }else/* if(isNormalQuery)*/{ + }else if( isRouteQuery){ + whereClause = whereCates; + } else + /* if(isNormalQuery)*/{ endDate=System.currentTimeMillis(); diff --git a/qy/src/main/java/com/qiyou/mb/android/ui/fragments/Scan_fragment.java b/qy/src/main/java/com/qiyou/mb/android/ui/fragments/Scan_fragment.java index a0f6631..91f0a35 100644 --- a/qy/src/main/java/com/qiyou/mb/android/ui/fragments/Scan_fragment.java +++ b/qy/src/main/java/com/qiyou/mb/android/ui/fragments/Scan_fragment.java @@ -52,8 +52,22 @@ public class Scan_fragment extends WebList_fragment implements ZXingScannerView. public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); - mScannerView.setResultHandler(this); // Register ourselves as a handler for scan results. - mScannerView.startCamera(); // Start camera on resume + + + + + if(activity.app.user.getUserbean().getId() <= 0){ + showNotes("请登录"); + activity.showLogin(); + }else{ + mScannerView.setResultHandler(this); // Register ourselves as a handler for scan results. + mScannerView.startCamera(); // Start camera on resume + } + + + + + } @@ -67,7 +81,7 @@ public class Scan_fragment extends WebList_fragment implements ZXingScannerView. Log.v(TAG, rawResult.getBarcodeFormat().toString()); // Prints the scan format (qrcode, pdf417 etc.) String result = rawResult.getText(); - + mScannerView.stopCamera(); String rest = ""; int svrId = 0; JSONObject jo = new JSONObject(); @@ -96,17 +110,23 @@ public class Scan_fragment extends WebList_fragment implements ZXingScannerView. doMemberOperation(svrId,svrName,ownerId,activity.app.user.getUserbean().getId(),activity.app.user.getUserbean().getUserName(),rest); + showNotes("欢迎加入" + svrName); if (rest.equalsIgnoreCase(RestMethods.ACT_P_ADD_MEMBER) ) { requestActFromWeb(svrId); }else if (rest.equalsIgnoreCase(RestMethods.GRP_P_ADD_MEMBER) ) { requestGroupFromWeb(svrId); } + }else{ + mScannerView.setResultHandler(this); + mScannerView.startCamera(); + } - mScannerView.stopCamera(); + +// mScannerView.startCamera(); } @Override diff --git a/qy/src/main/java/com/qiyou/mb/android/ui/fragments/TrackStatics_fragment.java b/qy/src/main/java/com/qiyou/mb/android/ui/fragments/TrackStatics_fragment.java index 0954eb4..8cfecc2 100644 --- a/qy/src/main/java/com/qiyou/mb/android/ui/fragments/TrackStatics_fragment.java +++ b/qy/src/main/java/com/qiyou/mb/android/ui/fragments/TrackStatics_fragment.java @@ -83,7 +83,7 @@ public class TrackStatics_fragment extends TrackMap_fragment implements Ilocatio private TextView mftNoteText; private TextView mdetailNoteText; private ImageView imgBtnEditUser; - private Button btnMoreHistory,btnMoreConfigure,btnMoreOffline,btnScan; + private Button btnMoreHistory,btnMoreConfigure,btnMoreOffline,btnScan,btnMoreScore; // private GraphicsOverlay gpFootPointsOverlay = null; @@ -1286,9 +1286,14 @@ public class TrackStatics_fragment extends TrackMap_fragment implements Ilocatio btnMoreOffline =(Button)vContainer.findViewById(R.id.btn_more_offlinemap); btnMoreOffline.setOnClickListener(ButtonOnClickListener); + int visible = QiYouConstant.DEVELOPER_MODE ? View.VISIBLE : View.GONE; btnScan =(Button)vContainer.findViewById(R.id.btn_more_scan); btnScan.setOnClickListener(ButtonOnClickListener); + btnScan.setVisibility(visible); + btnMoreScore =(Button)vContainer.findViewById(R.id.btn_more_score); + btnMoreScore.setOnClickListener(ButtonOnClickListener); + btnMoreScore.setVisibility(visible); diff --git a/qy/src/main/java/com/qiyou/mb/android/ui/fragments/UserDetails.java b/qy/src/main/java/com/qiyou/mb/android/ui/fragments/UserDetails.java index 5295178..2e3177f 100644 --- a/qy/src/main/java/com/qiyou/mb/android/ui/fragments/UserDetails.java +++ b/qy/src/main/java/com/qiyou/mb/android/ui/fragments/UserDetails.java @@ -1,10 +1,5 @@ package com.qiyou.mb.android.ui.fragments; -import java.io.FileNotFoundException; - -import org.json.JSONException; -import org.json.JSONObject; - import android.content.Intent; import android.graphics.Bitmap; import android.graphics.Color; @@ -15,17 +10,11 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Button; import android.widget.EditText; -import android.widget.ImageView; -import android.widget.LinearLayout; -import android.widget.ListView; -import android.widget.TabHost; -import android.widget.TextView; -import com.loopj.android.http.RequestParams; +import android.widget.TextView; + import com.qiyou.mb.android.QiYouConstant; import com.qiyou.mb.android.R; -import com.qiyou.mb.android.beans.Track; import com.qiyou.mb.android.beans.basic.GEO_bean; -import com.qiyou.mb.android.beans.basic.Group_bean; import com.qiyou.mb.android.beans.basic.Media; import com.qiyou.mb.android.beans.basic.User_bean; import com.qiyou.mb.android.beans.basic.Waypoint; @@ -37,7 +26,11 @@ import com.qiyou.mb.android.utils.image.QroundimageView; import com.qiyou.mb.android.utils.log.QLog; import com.qiyou.mb.android.utils.server.RestMethods; import com.umeng.analytics.MobclickAgent; -import com.umeng.socialize.utils.Log; + +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.FileNotFoundException; public class UserDetails extends GroupDetail /*TrackingBasic_fragment*/ { /* @Override @@ -494,4 +487,23 @@ public class UserDetails extends GroupDetail /*TrackingBasic_fragment*/ { } + @Override + void generateQcode(){ + if (user.getId() > 0){ + + JSONObject json = new JSONObject(); + try { + json.put(QiYouConstant.EXTRA_KEY_SVRID, String.valueOf(user.getId())); + json.put("ownerId", String.valueOf( user.getId())); + json.put("svrName", user.getUserName()); + json.put(QiYouConstant.EXTRA_KEY_RESTMETHOD,RestMethods.USER_G_FIND_BY_ID); + json.put(QiYouConstant.EXTRA_KEY_QCODEDESC, user.getUserName()); + } catch (JSONException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + activity.showQcode(json.toString()); + } + } + } diff --git a/qy/src/main/res/drawable-hdpi/button_color.xml b/qy/src/main/res/drawable-hdpi/button_color.xml index 1d06933..14d132d 100755 --- a/qy/src/main/res/drawable-hdpi/button_color.xml +++ b/qy/src/main/res/drawable-hdpi/button_color.xml @@ -2,7 +2,8 @@ - + + diff --git a/qy/src/main/res/drawable-hdpi/custom_btn_beige.xml b/qy/src/main/res/drawable-hdpi/custom_btn_beige.xml index 7409d26..01a54fe 100755 --- a/qy/src/main/res/drawable-hdpi/custom_btn_beige.xml +++ b/qy/src/main/res/drawable-hdpi/custom_btn_beige.xml @@ -14,7 +14,7 @@ - + @@ -24,7 +24,7 @@ - + \ No newline at end of file diff --git a/qy/src/main/res/drawable-hdpi/icon_coins.png b/qy/src/main/res/drawable-hdpi/icon_coins.png new file mode 100644 index 0000000000000000000000000000000000000000..96818cd24de8a570e68027fef817a6086e48b9b3 GIT binary patch literal 6244 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 literal 0 HcmV?d00001 diff --git a/qy/src/main/res/layout/more_functions.xml b/qy/src/main/res/layout/more_functions.xml index 337af54..c292fc5 100644 --- a/qy/src/main/res/layout/more_functions.xml +++ b/qy/src/main/res/layout/more_functions.xml @@ -84,13 +84,20 @@ android:padding="0dp" style="@style/more_button" android:id="@+id/btn_more_scan" android:text="@string/action_scan" - android:drawableTop="@drawable/icon_score" + android:drawableTop="@drawable/icon_scan" /> +