root
/
pda
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

intercepter change source 问题

This commit is contained in:
mwang 2019-05-13 00:18:07 +08:00
parent 3a26f670c4
commit 92a672b964
18 changed files with 279 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
zhuike/build.gradle
View File

@ -12,7 +12,10 @@ android {
versionName "1.0"
// testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
// vectorDrawables.useSupportLibrary = true
vectorDrawables.useSupportLibrary = true
renderscriptTargetApi 24 //blurkit
@ -20,7 +23,7 @@ android {
multiDexEnabled true //突破65535
manifestPlaceholders = [UMENG_CHANNEL_CALUE:"umeng"] //默认为uMeng
flavorDimensions "default"
// flavorDimensions "default" //debug时注销
}
buildTypes {
@ -46,41 +49,34 @@ android {
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
applicationVariants.all{ variant ->
/* applicationVariants.all{ variant ->
variant.outputs.all{ output ->
def outFile = output.outputFile
if (outFile != null && outFile.name.endsWith(".apk")){
def fileName = "${variant.productFlavors[0].name}" + ".apk"
def fileName = "${variant.productFlavors[0].name}" + "${releaseTime()}" + ".apk"
outputFileName = fileName;
// output.outputFile = new File(outFile.parent, fileName);
}
}
}
}*/
}
}
//渠道
productFlavors {
/* productFlavors {
// googleplay {}
huawei { applicationId "com.novelbook.android.huawei"
versionName "version-a-1.0"}
xiaomi { applicationId "com.novelbook.android.xiaomi"
versionName "version-a-1.0"}
/* wandoujia {}
baidu {}
yingyongbao {}
android360 {}
uc {}
umeng {}
meizu{}
*/
//批量配置
productFlavors.all { flavor ->
flavor.manifestPlaceholders = [UMENG_CHANNEL_VALUE: name]
}
}
*/
android {
lintOptions {
@ -99,14 +95,11 @@ android {
}
}
def releaseTime() {
return new Date().format("yyyy-MM-dd", TimeZone.getTimeZone("UTC"))
}
dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation 'com.android.support:appcompat-v7:28.0.0'

4
zhuike/src/main/AndroidManifest.xml
View File

@ -20,7 +20,7 @@
android:supportsRtl="true"
android:theme="@style/ToolBarTheme"
android:usesCleartextTraffic="true">
<activity android:name=".view.Activitycache"></activity>
<activity
android:name=".Activity_cate_books"
android:label="@string/title_activity_cate_books"
@ -83,7 +83,7 @@
<!-- UMENG -->
<meta-data android:value="5cd6238a570df375c3000cc9" android:name="UMENG_APPKEY"/>
<meta-data android:name="UMENG_CHANNEL" android:value="${UMENG_CHANNEL_VALUE}"/>
<!--<meta-data android:name="UMENG_CHANNEL" android:value="${UMENG_CHANNEL_VALUE}"/>-->
</application>

2
zhuike/src/main/java/com/novelbook/android/Activity_base.java
View File

@ -24,6 +24,7 @@ import android.widget.Toast;
import com.google.gson.Gson;
import com.novelbook.android.db.Novel;
import com.novelbook.android.netsubscribe.MovieSubscribe;
import com.novelbook.android.netutils.NetUtil;
import com.novelbook.android.netutils.OnSuccessAndFaultListener;
import com.novelbook.android.netutils.OnSuccessAndFaultSub;
import com.novelbook.android.upgrade.UpdateManager;
@ -213,6 +214,7 @@ public abstract class Activity_base extends AppCompatActivity {
mProgressDialog.setCanceledOnTouchOutside(false);
mProgressDialog.setMessage(message);
}
if(NetUtil.isNetworkConnected())
mProgressDialog.show();
}

1
zhuike/src/main/java/com/novelbook/android/Fragments/BasicFragment.java
View File

@ -256,6 +256,7 @@ public abstract class BasicFragment extends Fragment {
if(getActivity()==null){
return;
}
if(NetUtil.isNetworkConnected())
if(mSwipeRefresh ==null || !mSwipeRefresh.isRefreshing()) {
((Activity_base) getActivity()).showProgressDialog(flag,msg);
}

3
zhuike/src/main/java/com/novelbook/android/Fragments/CatalogFragment.java
View File

@ -153,7 +153,8 @@ public class CatalogFragment extends BasicFragment implements MarkActivity.Sortc
new Thread() {
@Override
public void run() {
ArrayList<Chapter> list =(ArrayList<Chapter>) LitePal.where("novelId=? and domain =? " ,pageFactory.getNovle().getId()+"",pageFactory.getSite().getDomain()).find(Chapter.class);
// ArrayList<Chapter> list =(ArrayList<Chapter>) LitePal.where("novelId=? and domain =? " ,pageFactory.getNovle().getId()+"",pageFactory.getSite().getDomain()).find(Chapter.class);
ArrayList<Chapter> list =(ArrayList<Chapter>) LitePal.where("novelId=? and domain =? " ,pageFactory.getNovle().getId()+"",pageFactory.getNovle().getDomain()).find(Chapter.class);
File file;
for(Chapter cp : list){
if(!TextUtils.isEmpty(cp.getChapterPath())) {

2
zhuike/src/main/java/com/novelbook/android/Fragments/Fragment_paihang.java
View File

@ -501,7 +501,7 @@ final String TAG = Fragment_paihang.class.getSimpleName();
void getSearchTabTtitle(){
BookSubscribe.getSearchTitles(new OnSuccessAndFaultSub(new OnSuccessAndFaultListener() {
BookSubscribe.getSearchTitles(Constants.SEX,new OnSuccessAndFaultSub(new OnSuccessAndFaultListener() {
@Override
public void onSuccess(String result) {

14
zhuike/src/main/java/com/novelbook/android/Main2Activity.java
View File

@ -56,6 +56,9 @@ public class Main2Activity extends Activity_base
BottomNavigationView botoomNavigation;
@BindView(R.id.rgSex)
RadioGroup rgSex;
// @BindView(R.id.tvUser)
// TextView tvUser;
private Config config;
@Override
public int getLayoutRes() {
@ -95,6 +98,7 @@ public class Main2Activity extends Activity_base
@Override
protected void setTitle() {
setTitle("");
}
@Override
@ -102,7 +106,7 @@ public class Main2Activity extends Activity_base
creatToolbar();
setupNavi();
showHome();
// tvUser.setText(this.getPackageName());
}
String currentActiveFragment;
@ -211,6 +215,9 @@ public class Main2Activity extends Activity_base
void setupNavi() {
//drawer
navigationView = (NavigationView) findViewById(R.id.nav_view);
navigationView.setNavigationItemSelectedListener(this);
DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
@ -219,6 +226,8 @@ public class Main2Activity extends Activity_base
drawer.addDrawerListener(toggle);
toggle.syncState();
// TextView tvuser= (TextView) navigationView. findViewById(R.id.tvUser);
// tvuser.setText(this.getPackageName());
// mTextMessage = (TextView) findViewById(R.id.message);
botoomNavigation = (BottomNavigationView) findViewById(R.id.navigation);
botoomNavigation.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener);
@ -458,7 +467,8 @@ private int bottomSelectedIndex;
super.onResume();
// swithToolbarItems( );
// setTitle("title on resume");
// checkUpdate(true);
// getHostPolicy();
}
@Override

4
zhuike/src/main/java/com/novelbook/android/netapi/HttpApi.java
View File

@ -36,7 +36,7 @@ public interface HttpApi {
Call<ResponseBody> downloadFile(@Url String fileUrl);
//http://xiaoshuofenxiang.com/api/g/
@GET("g")
@GET("g/")
Observable<ResponseBody> getMasterDomain();
//http://xiaoshuofenxiang.com/api/n/f2619820112625133c14dcb170f5e092.json
@GET("n/{id}")
@ -83,7 +83,7 @@ public interface HttpApi {
Observable<ResponseBody> getSeachNolvelist(@Path("keyword")String keyWord,@Path("pageno")int pageNo,@Query("sex") int Sex);
// 搜索分类 http://xiaoshuofenxiang.com/api/page/topdata
@GET("page/topdata")
Observable<ResponseBody> getSearchTitles();
Observable<ResponseBody> getSearchTitles(@Query("sex") int Sex);
//返回指定id列表的小说列表api/novels/1,2
@GET("novels/{nvs}")
Observable<ResponseBody> getNovelsByIds(@Path("nvs")String nvs );

8
zhuike/src/main/java/com/novelbook/android/netapi/RandomHost.java
View File

@ -9,7 +9,7 @@ import org.json.JSONObject;
public class RandomHost {
private static final int MAX = 10;
private static final int MAX = 5;
private static final Random random = new Random();
//private static final Map<String, int[]> indexsMap = new HashMap<String, int[]>();
@ -28,7 +28,7 @@ public class RandomHost {
if (maxFixIndex > 0) {
randomFill(indexs, 0, 0, maxFixIndex - 1);
}
for (int i = maxFixIndex; i < 10; i++) {
for (int i = maxFixIndex; i < MAX; i++) {
indexs[i] = i;
}
//randomFill(indexs, maxFixIndex, maxFixIndex, MAX - 1);
@ -56,8 +56,10 @@ public class RandomHost {
private int currentIndex = 0;
public String next() {
if (currentIndex >= indexs.length )
if (indexs == null || indexs.length == 0) return "";
if (currentIndex >= indexs.length) {
return "";
}
else {
try {
return UrlFactory.getUrl(hosts, uri, indexs[currentIndex++]);

4
zhuike/src/main/java/com/novelbook/android/netsubscribe/BookSubscribe.java
View File

@ -75,8 +75,8 @@ public class BookSubscribe {
Observable<ResponseBody> observable = HttpMethods.getInstance(String.format("/api/search/%s/%s",keyWord ,pageNo)).getHttpApi().getSeachNolvelist(keyWord,pageNo,sex);
HttpMethods.getInstance().toSubscribe(observable, subscriber);
}
public static void getSearchTitles(DisposableObserver<ResponseBody> subscriber){
Observable<ResponseBody> observable = HttpMethods.getInstance("/api/page/topdata").getHttpApi().getSearchTitles();
public static void getSearchTitles(int sex,DisposableObserver<ResponseBody> subscriber){
Observable<ResponseBody> observable = HttpMethods.getInstance("/api/page/topdata").getHttpApi().getSearchTitles(sex);
HttpMethods.getInstance().toSubscribe(observable, subscriber);
}
public static void getHotKeyWords(DisposableObserver<ResponseBody> subscriber){

34
zhuike/src/main/java/com/novelbook/android/netutils/HttpMethods.java
View File

@ -13,6 +13,7 @@ import com.novelbook.android.utils.FileUtils;
import org.json.JSONException;
import org.json.JSONObject;
import java.io.File;
import java.io.IOException;
@ -45,6 +46,7 @@ import retrofit2.converter.gson.GsonConverterFactory;
import static com.novelbook.android.netapi.URLConstant.getRootUrl;
import static com.novelbook.android.netapi.URLConstant.newRootUrl;
import static com.novelbook.android.netutils.NetUtil.getHost;
public class HttpMethods {
public String TAG = "HttpMethods";
@ -85,10 +87,29 @@ public class HttpMethods {
}
//获取单例
public static HttpMethods getInstance(String keyUrl) {
SingletonHolder.INSTANCE.changeBaseUrl(NetUtil.getUrl(keyUrl));
// SingletonHolder.INSTANCE.changeBaseUrl(NetUtil.getUrl(keyUrl));
try {
SingletonHolder.INSTANCE.ChangeNoForward(keyUrl);
} catch (JSONException e) {
e.printStackTrace();
}
return SingletonHolder.INSTANCE;
}
public void ChangeNoForward(String keyUrl) throws JSONException {
// SingletonHolder.INSTANCE.changeBaseUrl(NetUtil.getUrl(keyUrl));
// RandomHost rh = new RandomHost( getHost() ,keyUrl);
// okHttpBuilder.addInterceptor(new RetryInterceptor(rh));
okHttpBuilder.addInterceptor(new RetryInterceptor());
okHttpBuilder.followRedirects(false);
okHttpBuilder.retryOnConnectionFailure(false);
retrofit = new Retrofit.Builder()
.client(okHttpBuilder.build())
.addConverterFactory(GsonConverterFactory.create())
.addCallAdapterFactory(RxJava2CallAdapterFactory.create())
.baseUrl(getRootUrl())
.build();
httpApi = retrofit.create(HttpApi.class);
}
//获取单例
public static HttpMethods getInstance() {
return SingletonHolder.INSTANCE;
@ -111,7 +132,7 @@ public class HttpMethods {
return retrofit;
}
public void changeBaseUrl(String baseUrl) {
/*public void changeBaseUrl(String baseUrl) {
okHttpBuilder.addInterceptor(new RetryInterceptor());
//okHttpBuilder.retryOnConnectionFailure(false);
retrofit = new Retrofit.Builder()
@ -121,7 +142,7 @@ public class HttpMethods {
.baseUrl(baseUrl)
.build();
httpApi = retrofit.create(HttpApi.class);
}
}*/
/* public void changeBaseUrl() {
changeBaseUrl(newBaseUrl());
}*/
@ -198,10 +219,10 @@ public class HttpMethods {
});
loggingInterceptor.setLevel(HttpLoggingInterceptor.Level.BODY);
loggingInterceptor.setLevel(HttpLoggingInterceptor.Level.HEADERS);
//设置 Debug Log 模式
okHttpBuilder.addInterceptor(loggingInterceptor);
// okHttpBuilder.addInterceptor(new RetryInterceptor());
//设置编码
// EncodingInterceptor encodingInterceptor = new EncodingInterceptor("gbk");
// okHttpBuilder.addInterceptor(encodingInterceptor);
@ -214,6 +235,7 @@ public class HttpMethods {
okHttpBuilder.connectTimeout(DEFAULT_CONNECT_TIMEOUT, TimeUnit.SECONDS);
okHttpBuilder.readTimeout(DEFAULT_WRITE_TIMEOUT, TimeUnit.SECONDS);
okHttpBuilder.writeTimeout(DEFAULT_READ_TIMEOUT, TimeUnit.SECONDS);
//错误重连
okHttpBuilder.retryOnConnectionFailure(true);

98
zhuike/src/main/java/com/novelbook/android/netutils/RetryInterceptor.java
View File

@ -4,6 +4,7 @@ import android.text.TextUtils;
import android.util.Log;
import com.novelbook.android.netapi.RandomHost;
import com.novelbook.android.utils.REUtil;
import org.json.JSONException;
@ -15,45 +16,87 @@ import okhttp3.Response;
public class RetryInterceptor implements Interceptor {
private static final String TAG=RetryInterceptor.class.getSimpleName();
int RetryCount = 13;
RandomHost rh ;
int RetryCount = 10;
public RetryInterceptor(){
}
RandomHost rh = null;
public RetryInterceptor(RandomHost rh) {
this.rh=rh;
}
@Override
public Response intercept(Chain chain) throws IOException {
Request request = chain.request();
// try the request
Response response = doRequest(chain, request);
if(response!=null &&( response.isSuccessful() || response.code() ==200)){
return response;
}
int tryCount = 0;
String oldUrl = request.url().toString();
String prefix = REUtil.match("(?i)http[s]?://[^/]+", oldUrl);
if (prefix == null) return doRequest(chain, request);
String path = oldUrl.substring(prefix.length());
/* if(oldUrl.indexOf("xiaoshuofenxiang.com") == -1 || !path.startsWith("/api/") || NetUtil.getHost()==null){
rh = null;
return doRequest(chain, request);
}*/
String key = oldUrl.substring(oldUrl.lastIndexOf(".com/")+5,oldUrl.length());
if(rh==null)
{
Response response = null;
while (true) {
try {
rh = new RandomHost(NetUtil.getHost(), key);
if(rh==null) {
rh = new RandomHost(NetUtil.getHost(), path);
Log.d(TAG, "HttpMethods intercept: api path is "+path);
Log.d(TAG, "HttpMethods intercept: create new RandomHost--------------------------");
}
} catch (JSONException e) {
Log.e(TAG, "intercept: ", e);
// TODO rh == null
}
String newPrefix = rh.next();
if ("".equals(newPrefix)) break;
String newUrl = newPrefix + path;
Log.d(TAG, "HttpMethods intercept: trying url is " + newUrl);
Request newRequest = null;
try {
newRequest = request.newBuilder().url(newUrl).build();
} catch (Exception e) {
Log.e(TAG, "HttpMethods intercept: " + newUrl);
Log.e(TAG, "HttpMethods intercept: ", e);
continue;
}
if (response != null) { try {response.close();} catch (IllegalStateException e) {} }
response = doRequest(chain, newRequest);
Log.d(TAG, String.format("HttpMethods intercept: response is null? %s", response == null));
if (response != null) {
Log.d(TAG, String.format("HttpMethods intercept: response .code? %s", response.code()));
}
if (response != null && response.isSuccessful()) {
rh = null;
Log.d(TAG, String.format("HttpMethods intercept: set rh null,return response"));
return response;
}
}
/* int tryCount=0;
String url =oldUrl;
while ( (response==null ||!response.isSuccessful()) && tryCount <= RetryCount) {
// if(tryCount>3)
{ //三次不成功后换其他url
url = switchServer(key);
url = switchServer(path);
if (url.equals(oldUrl)) {
url = switchServer(key);
url = switchServer(path);
}
if(TextUtils.isEmpty(url)){
return null;
}
}
@ -63,6 +106,7 @@ public class RetryInterceptor implements Interceptor {
} catch (Exception e) {
Log.e(TAG, "HttpMethods intercept: "+url);
Log.e(TAG, "HttpMethods intercept: ", e);
return null;
}
@ -73,12 +117,14 @@ public class RetryInterceptor implements Interceptor {
tryCount++;
// retry the request
response = doRequest(chain, newRequest);
}
}*/
Log.d(TAG, String.format("HttpMethods intercept: set rh null,return response"));
rh = null;
if (response == null) {
throw new IOException();
}
return response;
}
private Response doRequest(Chain chain, Request request) {
@ -86,6 +132,7 @@ public class RetryInterceptor implements Interceptor {
try {
response = chain.proceed(request);
} catch (Exception e) {
// Log.e(TAG, "doRequest: error 1 ",e );
}
return response;
}
@ -97,9 +144,9 @@ public class RetryInterceptor implements Interceptor {
return newUrl;
}
if(!newUrl.endsWith("/")){
/* if(!newUrl.endsWith("/")){
newUrl+="/";
}
}*/
return newUrl +key;
}
@ -108,17 +155,4 @@ public class RetryInterceptor implements Interceptor {
}

44
zhuike/src/main/java/com/novelbook/android/upgrade/ParseXmlService.java
View File

@ -34,6 +34,8 @@ public class ParseXmlService
{
//遍历子节点
Node childNode = childNodes.item(j);
if (childNode.getNodeType() == Node.ELEMENT_NODE){
Element childElement = (Element) childNode;
hashMap.put(childElement.getNodeName(),childElement.getFirstChild().getNodeValue());
@ -64,4 +66,46 @@ public class ParseXmlService
}
return hashMap;
}
public HashMap<String, HashMap<String,String>> parseMultiXml(InputStream inStream) throws Exception
{
HashMap<String, HashMap<String,String>> hashMap = new HashMap<String, HashMap<String,String>>();
// 实例化一个文档构建器工厂
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
// 通过文档构建器工厂获取一个文档构建器
DocumentBuilder builder = factory.newDocumentBuilder();
// 通过文档通过文档构建器构建一个文档实例
Document document = builder.parse(inStream);
//获取XML文件根节点
Element root = document.getDocumentElement();
//获得所有子节点
NodeList childNodes = root.getChildNodes();
for (int j = 0; j < childNodes.getLength(); j++)
{
//遍历子节点
Node childNode = childNodes.item(j);
if (childNode.getNodeType() == Node.ELEMENT_NODE){
Element childElement = (Element) childNode;
hashMap.put(childElement.getNodeName(),parseChildXml(childNode.getChildNodes()));
}
}
return hashMap;
}
public HashMap<String, String> parseChildXml(NodeList childNodes ) throws Exception {
HashMap<String, String> hashMap = new HashMap<String, String>();
for (int j = 0; j < childNodes.getLength(); j++) {
//遍历子节点
Node childNode = childNodes.item(j);
if (childNode.getNodeType() == Node.ELEMENT_NODE) {
Element childElement = (Element) childNode;
hashMap.put(childElement.getNodeName(), childElement.getFirstChild().getNodeValue());
}
}
return hashMap;
}
}

54
zhuike/src/main/java/com/novelbook/android/upgrade/UpdateManager.java
View File

@ -37,6 +37,7 @@ import com.novelbook.android.netsubscribe.BookSubscribe;
import com.novelbook.android.netutils.HttpMethods;
import com.novelbook.android.netutils.OnSuccessAndFaultListener;
import com.novelbook.android.netutils.OnSuccessAndFaultSub;
import com.novelbook.android.utils.CommonUtil;
import com.novelbook.android.utils.Constants;
import com.novelbook.android.utils.GsonUtil;
@ -57,6 +58,7 @@ public class UpdateManager {
private static final int DOWNLOAD_FINISH = 2;
private static final int showDialog =3;
HashMap<String, String> mHashMap;
HashMap<String, HashMap<String,String>> multiHashMap;
private String mSavePath;
private int progress;
private boolean cancelUpdate = false;
@ -146,7 +148,8 @@ public class UpdateManager {
// String s = body.string();
// Log.d(TAG, "onSuccess: response is " + s);
if (bytes != null) {
processTxtOnSuccess(bytes);
// processTxtOnSuccess(bytes);
processMultiTxtOnSuccess(bytes);
}
// body.close();
}catch (Exception e){
@ -164,7 +167,43 @@ public class UpdateManager {
}
void processMultiTxtOnSuccess(byte[] paramArrayOfByte) {
boolean isUpdate=false;
int versionCode = getVersionCode(mContext);
InputStream inputStream = null;
inputStream =new ByteArrayInputStream(paramArrayOfByte);
ParseXmlService service = new ParseXmlService();
try
{
if(inputStream!=null)
multiHashMap = service.parseMultiXml(inputStream);
} catch (Exception e)
{
e.printStackTrace();
}
if (null != multiHashMap) {
String packgename = mContext.getPackageName();
mHashMap = multiHashMap.get(packgename);
if (mHashMap != null) {
int serviceCode = Integer.valueOf(mHashMap.get("version"));
// need update or not
isUpdate = serviceCode > versionCode;
}
}
if (isUpdate)
{
mHandler.sendEmptyMessage(showDialog);
} else
{
if(!isSilence)
Toast.makeText(mContext, R.string.soft_update_no, Toast.LENGTH_LONG).show();
}
}
void processTxtOnSuccess(byte[] paramArrayOfByte) {
boolean isUpdate=false;
@ -216,8 +255,15 @@ public class UpdateManager {
try
{
// 閼惧嘲褰囨潪顖欐閻楀牊婀伴崣鍑ょ礉鐎电懓绨睞ndroidManifest.xml娑撳獘ndroid:versionCode
versionCode = context.getPackageManager().getPackageInfo("com.novelbook.android", 0).versionCode;
} catch (NameNotFoundException e)
versionCode =(int)CommonUtil.getVersionCodeLong(context);// context.getPackageManager().getPackageInfo("com.novelbook.android", 0).versionCode;
/*int versionCode2 = CommonUtil.getVersionCode(context);
long versioncode3 = CommonUtil.getVersionCodeLong(context);
String versionname = CommonUtil.getVersion(context);
String v = CommonUtil.getVersionName(context);
String packnm = context.getPackageName();
String p ="A";*/
} catch ( Exception e)
{
Log.e(TAG, "getVersionCode: ",e);
@ -288,7 +334,7 @@ public class UpdateManager {
builder.setTitle(R.string.soft_update_title);
String upgradeDetails=mHashMap.get("details");
builder.setMessage( mContext.getString(R.string.soft_update_info) +upgradeDetails );
builder.setMessage( mContext.getPackageName() + "　"+ mContext.getString(R.string.soft_update_info) +upgradeDetails );
builder.setPositiveButton(R.string.soft_update_updatebtn, new OnClickListener()
{
@Override

14
zhuike/src/main/java/com/novelbook/android/utils/CommonUtil.java
View File

@ -330,7 +330,19 @@ public class CommonUtil {
return 0;
}
}
public static long getVersionCodeLong(Context context) {
try {
PackageManager manager = context.getPackageManager();
PackageInfo info = manager.getPackageInfo(context.getPackageName(), 0);
return info.getLongVersionCode();
} catch (Exception e) {
e.printStackTrace();
return 0;
}catch (NoSuchMethodError e){
e.printStackTrace();
return 0;
}
}
/**
* 获取当前手机系统语言。
*

4
zhuike/src/main/java/com/novelbook/android/utils/Config.java
View File

@ -187,7 +187,9 @@ public class Config {
sp.edit().putString(KEY_BASE_URY,baseUrl).commit();
}
public String getBaseUrl(){
return sp.getString(KEY_BASE_URY,"");
String defaultHost ="{\"master\":[\"http:\\/\\/xiaoshuofenxiang.com\"],\"page\":[\"http:\\/\\/p.xiaoshuofenxiang.com\"],\"report\":[\"http:\\/\\/r.xiaoshuofenxiang.com\"],\"search\":[\"http:\\/\\/s.xiaoshuofenxiang.com\"],\"novel\":[\"http:\\/\\/n.xiaoshuofenxiang.com\"],\"novelsbydot\":[\"http:\\/\\/nbd.xiaoshuofenxiang.com\"],\"user\":[\"http:\\/\\/u.xiaoshuofenxiang.com\"]}";
return sp.getString(KEY_BASE_URY,defaultHost);
}

1
zhuike/src/main/res/layout/nav_header_main2.xml
View File

@ -21,6 +21,7 @@
app:srcCompat="@mipmap/ic_launcher_round" />
<TextView
android:id="@+id/tvUser"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="@dimen/nav_header_vertical_spacing"

82
zhuike/zhuike.iml
View File

@ -8,11 +8,11 @@
</facet>
<facet type="android" name="Android">
<configuration>
<option name="SELECTED_BUILD_VARIANT" value="huaweiDebug" />
<option name="ASSEMBLE_TASK_NAME" value="assembleHuaweiDebug" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileHuaweiDebugSources" />
<option name="SELECTED_BUILD_VARIANT" value="debug" />
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
<afterSyncTasks>
<task>generateHuaweiDebugSources</task>
<task>generateDebugSources</task>
</afterSyncTasks>
<option name="ALLOW_USER_CONFIGURATION" value="false" />
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
@ -23,65 +23,23 @@
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/build/intermediates/javac/huaweiDebug/compileHuaweiDebugJavaWithJavac/classes" />
<output-test url="file://$MODULE_DIR$/build/intermediates/javac/huaweiDebugUnitTest/compileHuaweiDebugUnitTestJavaWithJavac/classes" />
<output url="file://$MODULE_DIR$/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes" />
<output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/huawei/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/huaweiDebug/compileHuaweiDebugAidl/out" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/huawei/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/huaweiDebug/compileHuaweiDebugRenderscript/out" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/huawei/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/huawei/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/huaweiDebug/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/huaweiDebug/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/huaweiDebug/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/huaweiDebug/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/huaweiDebug/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/huaweiDebug/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/huaweiDebug/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/huawei/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/huaweiDebugAndroidTest/compileHuaweiDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/huawei/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/huaweiDebugAndroidTest/compileHuaweiDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/huawei/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/huawei/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestHuaweiDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestHuaweiDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestHuaweiDebug/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestHuaweiDebug/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestHuaweiDebug/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestHuaweiDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestHuaweiDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/huawei/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testHuaweiDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testHuaweiDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testHuaweiDebug/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testHuaweiDebug/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testHuaweiDebug/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testHuaweiDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testHuaweiDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/huawei/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/huawei/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/huawei/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/huawei/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/huawei/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/huawei/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/huawei/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestHuawei/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestHuawei/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestHuawei/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestHuawei/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestHuawei/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestHuawei/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestHuawei/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testHuawei/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testHuawei/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testHuawei/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testHuawei/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testHuawei/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testHuawei/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testHuawei/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@ -138,6 +96,7 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-apk" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_app_manifest" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_app_info_output_file" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_main_apk_resources" />
@ -167,7 +126,6 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
<excludeFolder url="file://$MODULE_DIR$/build/test-results" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 28 Platform" jdkType="Android SDK" />