v2.92

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) {

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.**{*;}

qy/src/main/AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.qiyou.mb.android"
 	xmlns:tools="http://schemas.android.com/tools"
-    android:versionCode="46"
+	android:versionCode="46"
-    android:versionName="1.29.2" >
+	android:versionName="1.29.2" >
 
     <uses-sdk
         android:minSdkVersion="8"
@@ -65,18 +65,18 @@
 	    android:value="AIzaSyBAey0WNbuvc2WeEbCOsGEpp2WW0iw77u0"  
 	    />
         <!-- release -->
-	   <!--  <meta-data
+	      <meta-data
 	            android:name="com.baidu.lbsapi.API_KEY"
 	           android:value="rI4GlZIZcFv5fB5qxotyrW9f"
-             />-->
+             />
          
          
         <!-- home -->
 
-              <meta-data
+             <!-- <meta-data
 	            android:name="com.baidu.lbsapi.API_KEY"
 	             android:value="4lcFzBPFbukDG9DulM4qjjaI"
-	             />
+	             />-->
            
 
            

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*/  ;
  

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 {
+
+
+
+
+
+
+
+
+
+
+
+
+}

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);

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){
 			

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;

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<Integer> 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();
 				

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

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);
 
 
 

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.TextView;
-import android.widget.LinearLayout;
+
-import android.widget.ListView;
-import android.widget.TabHost;
-import android.widget.TextView; 
-import com.loopj.android.http.RequestParams;
 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());
+		}
+	}
+
 }

qy/src/main/res/drawable-hdpi/button_color.xml

@@ -2,7 +2,8 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_focused="false" android:state_enabled="true" android:state_pressed="false"
         android:color="@drawable/font_active" />
-    <item android:state_enabled="false" android:color="@drawable/font_inactive" />
+    <!--<item android:state_enabled="false" android:color="@drawable/font_inactive" />-->
+    <item android:state_enabled="false" android:color="@color/lightgrey" />
     <item android:state_pressed="true" android:color="@drawable/font_pressed" /> 
        <!--  <item android:state_pressed="true" android:color="@color/seashell" /> -->
     

qy/src/main/res/drawable-hdpi/custom_btn_beige.xml

@@ -14,7 +14,7 @@
              <solid  android:color="#d3d8c2"/>       
          </shape>
      </item>  
-    <item >
+    <item android:state_enabled="true" >
         <shape android:shape="rectangle"  >
              <corners android:radius="3dip" />
              <stroke android:width="1dip" android:color="#b7b9ac" />
@@ -24,7 +24,7 @@
      <item android:state_enabled="false">
         <shape>
             <gradient android:startColor="#DDDDDD" android:endColor="#EEEEEE"/>
-            <corners android:radius="15dip" />        
+            <corners android:radius="30dip" />
         </shape>
     </item>
 </selector>

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"
 
                     />
 
             </LinearLayout>
 
             <LinearLayout style="@style/ll_line_small_l.v" >
+                <Button
+                    style="@style/more_button"
+                    android:id="@+id/btn_more_score"
+                    android:text="@string/action_score"
+                    android:drawableTop="@drawable/icon_coins"
+
+                    />
 
 
             </LinearLayout>

qy/src/main/res/layout/qcode_fragment.xml

@@ -16,6 +16,8 @@
         />
     <TextView  style ="@style/ll_title_text"
         android:id="@+id/txt_qcode"
+        android:layout_gravity="center_horizontal"
+        android:gravity="center_horizontal"
         />
 
 </FrameLayout>

qy/src/main/res/values/strings.xml

@@ -162,6 +162,7 @@
      <!-- action menu -->
      <string name="action_settings" translatable="false">偏好设置</string>
     <string name="action_scan" translatable="false">扫一扫</string>
+    <string name="action_score" translatable="false">积分兑换</string>
      <string name="action_offline" translatable="false">离线地图</string>
      <string name="action_spend_score" translatable="false">花积分</string>
      <string name="action_get_score" translatable="false">兑积分</string>