tijao

android/app/src/main/java/com/topsoft/jianyu/App.java

@@ -17,15 +17,17 @@ public class App extends Application {
     @Override
     public void onCreate() {
         super.onCreate();
+        Boolean isDebug=AppUtil.isApkInDebug(getApplicationContext());
         //是否开启友盟debug模式
-        Config.DEBUG = AppUtil.isApkInDebug(getApplicationContext());
+        Config.DEBUG =isDebug ;
         //是否开启极光debug模式
-        JPushInterface.setDebugMode(AppUtil.isApkInDebug(getApplicationContext()));
+        JPushInterface.setDebugMode(isDebug);
     }
 
     //各个平台的配置，建议放在全局Application或者程序入口
     {
-        PlatformConfig.setWeixin("wx0e6a5b18f4cfd10d", "bf12200554cb6edeb2be69d49dc11a3e");
+        PlatformConfig.setWeixin("wx0e6a5b18f4cfd10d", "bf12200554cb6edeb2be69d49dc11a3e");//正式
+        //PlatformConfig.setWeixin("wxd6f3e855ef4258cd", "ed5961aa2fca99d13ccff99130ba2866");//测试
         PlatformConfig.setQQZone("1106703118", "MYFVJZhtygWy5hzh");
     }
 }

android/app/src/main/java/com/topsoft/jianyu/JyObj.java

@@ -14,7 +14,6 @@ import android.webkit.WebView;
 
 import com.topsoft.jianyu.SQLite.DbBase;
 import com.topsoft.jianyu.listener.CustomLoginListerner;
-import com.topsoft.jianyu.listener.CustomRemoveLoginListerner;
 import com.topsoft.jianyu.listener.CustomShareListener;
 import com.topsoft.jianyu.util.AppUtil;
 import com.umeng.socialize.ShareAction;
@@ -95,10 +94,7 @@ public class JyObj {
     //删除用户登录标识
     @JavascriptInterface
     public void removeUserToken(){
-        //清除授权
-        CustomRemoveLoginListerner removeLoginListerner=new CustomRemoveLoginListerner(mContext,webView);
-        UMShareAPI.get(mContext).deleteOauth(mainActivity,SHARE_MEDIA.WEIXIN,removeLoginListerner);
-        //清除共享存储区中的openid
+        //清除共享存储区中的token
         share.edit().clear().commit();
     }
 
@@ -133,7 +129,6 @@ public class JyObj {
     //获取单条消息
     @JavascriptInterface
     public String getMessage(String id){
-        System.out.println(DbBase.getInstance(mContext).findOneMessage(id));
         return DbBase.getInstance(mContext).findOneMessage(id).toString();
     }
 
@@ -173,21 +168,4 @@ public class JyObj {
         }
     }
 
-//==============================================================================================
-
-
-    @JavascriptInterface
-    public void lightStatusBar(String isLight){
-       /* if("1".equals(isLight)){
-            StatusBar.setAndroidNativeLightStatusBar(mainActivity,false);
-        }else{
-            StatusBar.setAndroidNativeLightStatusBar(mainActivity,true);
-        }*/
-    }
-
-
-    @JavascriptInterface
-    public void test(){
-
-    }
 }

android/app/src/main/java/com/topsoft/jianyu/MainActivity.java

@@ -72,7 +72,7 @@ public class MainActivity extends AppCompatActivity {
         //初始化配置
         initconfigure();
 
-        findViewById(R.id.test).setOnClickListener(new View.OnClickListener() {
+        /*findViewById(R.id.test).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 DBHelper dbHelper = new DBHelper(ctx,"jy_db",null,1);
@@ -93,7 +93,7 @@ public class MainActivity extends AppCompatActivity {
                 System.out.println("查询完成"+cursor.getCount()+"条");
                 db.close();
             }
-        });
+        });*/
 
     }
 

android/app/src/main/java/com/topsoft/jianyu/MyReceiver.java

@@ -37,7 +37,7 @@ public class MyReceiver extends BroadcastReceiver {
 				Bundle bundle = intent.getExtras();
 				String title,content,openid,type,descript,extend,url,pushTime;
 				String list_str=bundle.getString(EXTRA_EXTRA);
-				printBundle(bundle);
+				//printBundle(bundle);
 				if(!"".equals(list_str)&&list_str!=null){
 					JSONObject obj=new JSONObject(list_str);
 					JSONObject litObj=new JSONObject(obj.getString("info"));
@@ -63,20 +63,22 @@ public class MyReceiver extends BroadcastReceiver {
 
 		} else if (JPushInterface.ACTION_NOTIFICATION_OPENED.equals(intent.getAction())) {
 			Bundle bundle=intent.getExtras();
-			printBundle(bundle);
+			//printBundle(bundle);
 			try{
 				JSONObject obj=new JSONObject(bundle.getString(EXTRA_EXTRA));
 				JSONObject litObj=new JSONObject(obj.getString("info"));
-				String url=litObj.getString("url");
+				String url=litObj.has("url")?litObj.getString("url"):"";
+				String pushTime=litObj.has("pushTime")?litObj.getString("pushTime"):"";
 				String type=obj.getString("type");
-				String pushTime=litObj.getString("pushTime");
 
+				//修改信息为已读信息
+				DbBase.getInstance(context).updateMessageState(pushTime);
 				Intent i = new Intent(context, MainActivity.class);
-				if(DbBase.getInstance(context).updateMessageState(pushTime)){
-					//根据推送事件获取信息id
-					Integer integer=DbBase.getInstance(context).getIDbypushTime(pushTime);
-					//更改url
-					if("".equals(type)) url=url+integer;
+
+				//更改url 根据推送事件获取信息id
+				Integer integer=DbBase.getInstance(context).getIDbypushTime(pushTime);
+				if(integer>0){
+					if("".equals(type)&&!"".equals(url)) url=url+integer;
 				}
 
 				i.putExtra("url",url);

android/app/src/main/java/com/topsoft/jianyu/SQLite/DbBase.java

@@ -81,13 +81,6 @@ public class DbBase {
         DBHelper dbHelper = new DBHelper(context,DB_NAME,null,1);
         SQLiteDatabase db =dbHelper.getReadableDatabase();
         try{
-            //参数1：表名
-            //参数2：要想显示的列
-            //参数3：where子句
-            //参数4：where子句对应的条件值
-            //参数5：分组方式
-            //参数6：having条件
-            //参数7：排序方式
             Cursor cursor = db.query(MASSAHE_TABLE_NAME, new String[]{"id","title","content","link","category","openid","readed","comeintime","descript","extend"}, "id=?", new String[]{id}, null, null, null);
             while(cursor.moveToNext()){
                 msg.put("id",cursor.getInt(cursor.getColumnIndex("id"))+"");
@@ -153,6 +146,9 @@ public class DbBase {
     }
     //根据消息的推送时间改变为已读信息
     public boolean updateMessageState(String pushTime) {
+        if("".equals(pushTime)){
+            return false;
+        }
         boolean result = true;
         DBHelper dbHelper = new DBHelper(context,DB_NAME,null,1);
         SQLiteDatabase db =dbHelper.getWritableDatabase();
@@ -189,7 +185,11 @@ public class DbBase {
     }
     //根据推送时间获取信息id
     public Integer getIDbypushTime(String pushTime){
-        Integer id=0;
+        Integer id=-1;
+        if("".equals(pushTime)){
+            return id;
+        }
+
         DBHelper dbHelper = new DBHelper(context,DB_NAME,null,1);
         SQLiteDatabase db =dbHelper.getReadableDatabase();
         try{
@@ -282,7 +282,6 @@ public class DbBase {
 
     //按通知接收时间倒排，取前100条（或者做分页处理）。
     public JSONArray getMessageList(String openid){
-        //List<Map<String,String>> list=new ArrayList<Map<String,String>>();
         JSONArray list=new JSONArray();
         JSONObject msg=null;
         DBHelper dbHelper = new DBHelper(context,"jy_db",null,1);
@@ -322,7 +321,7 @@ public class DbBase {
                 e.printStackTrace();
             }
         }
-        return null;
+        return list;
     }
 
     //获取未读消息数量
@@ -363,8 +362,7 @@ public class DbBase {
             db.beginTransaction();
             ContentValues cv = new ContentValues();
             cv.put("readed", 1);
-            String[] whereArgs=null;
-            String whereClause;
+
             if("".equals(openid)){
                 num=db.update(MASSAHE_TABLE_NAME, cv, "openid=?", new String[]{""});
             }else{

android/app/src/main/java/com/topsoft/jianyu/util/AppUtil.java

@@ -23,7 +23,8 @@ import java.lang.reflect.Method;
 public class AppUtil {
 
     public static String JPUSH_CLIENT_RGSID;//记录极光推送客户端id
-    public static String AppUrl="http://webwcj.qmx.top";
+    //public static String AppUrl="http://webwcj.qmx.top";
+    public static String AppUrl="http://w2blmjy.qmx.top";
     /**
      * 判断当前应用是否是debug状态
      */

android/app/src/main/res/layout/activity_main.xml

@@ -15,10 +15,10 @@
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         android:orientation="vertical"></LinearLayout>
-    <Button
+<!--    <Button
         android:id="@+id/test"
         android:layout_width="100dp"
         android:layout_height="40dp"
         android:text="测试按钮"
-        />
+        />-->
 </android.support.constraint.ConstraintLayout>